--- bsd.port.mk.old	Thu Apr  3 21:34:23 2003
+++ bsd.port.mk	Thu Apr  3 21:55:51 2003
@@ -92,2 +92,7 @@
 #				  choices of ${MASTER_SITES} defined in bsd.sites.mk.
+# DEBIAN_POOL	- Specify that MASTER_SITE_SUBDIR should be formed by
+#				  the Debian storage rules
+#				  (/pool/main/<letter>/<name>/). Only guarateed
+#				  to work if MASTER_SITES is set to
+#				  ${MASTER_SITE_DEBIAN}
 # PATCHFILES	- Name(s) of additional files that contain distribution
@@ -1689,2 +1694,8 @@
 .endfor
+
+# Form ${MASTER_SITE_SUBDIR} if not defined if deal with Debian packets storage
+# and ${DEBIAN_POOL} is defined
+.if defined(DEBIAN_POOL) && !defined(MASTER_SITE_SUBDIR)
+MASTER_SITE_SUBDIR= 	pool/main/${DISTNAME:C/${DISTNAME:C/.//}//}/${PORTNAME}
+.endif