11 files changed, 28 insertions, 28 deletions

diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 2203b3a925ef..9f4709f61225 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 July 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
-# $Id: Makefile,v 1.3 1996/03/10 09:09:51 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/15 23:30:53 obrien Exp $
 #
 
 DISTNAME=	chipmunk-5.10
@@ -21,6 +21,6 @@ USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
 
 post-extract:
-	${CP} ${DISTDIR}/Makefile ${WRKSRC}/Makefile
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index b4efb749122b..2bc610c62de2 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/09 12:59:07 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/11 10:13:07 max Exp $
 #
 
 DISTNAME=	xdvi-17
@@ -54,9 +54,9 @@ pre-fetch:
 
 pre-patch:
 	@(cd ${WRKDIR} ; \
-	  ${GZCAT} ${DISTDIR}/950923.02.Z | uudecode ; \
-	  ${GZCAT} ${DISTDIR}/951109.04.Z | uudecode ; \
-	  uudecode ${DISTDIR}/xdvi18-okagawa-patch ; \
+	  ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/950923.02.Z | uudecode ; \
+	  ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/951109.04.Z | uudecode ; \
+	  uudecode ${DISTDIR}/${DIST_SUBDIR}/xdvi18-okagawa-patch ; \
 	  gzip -d xdvi18.vflib.patch.gz ; \
 	  ${PATCH} < ${FILESDIR}/xdvi18.vflib.patch.of.patch >/dev/null 2>&1; \
 	  gzip -d xdvi-17+ptex.fixed.patch.gz ; \
@@ -65,7 +65,7 @@ pre-patch:
 	  cd tmp; \
 	  ${PATCH} -f < ../xdvi18.vflib.patch >/dev/null 2>&1; \
 	  cd .. ; \
-	  ${GZCAT} ${DISTDIR}/xdvi-17miyu.patch-beta6.gz | patch -d . >/dev/null 2>&1; \
+	  ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xdvi-17miyu.patch-beta6.gz | patch -d . >/dev/null 2>&1; \
 	  ${GZCAT} xdvi-pl17+markpage+toc+printdvi+paper.patch.gz | patch -d . >/dev/null 2>&1 ; \
 	  ${PATCH} -d . < xdvi-17+ptex.fixed.patch >/dev/null 2>&1; \
 	  ${CP} tmp/dnpzeit.c tmp/zeit.c . ; \
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 41994a46e958..c1e4e4495313 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -7,7 +7,7 @@
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.4 1996/07/14 07:28:54 ache Exp $
+# $Id: Makefile,v 1.5 1996/11/11 05:49:12 obrien Exp $
 #
 
 DISTNAME=       astrolog-5.20
@@ -27,7 +27,7 @@ EPHEM=          lrz5_24 chi_24 cpjv_24
 post-extract:
 	cd ${WRKSRC}/..; \
 		for i in ${EPHEM}; do \
-			zcat ${DISTDIR}/$$i.gz > \
+			zcat ${DISTDIR}/${DIST_SUBDIR}/$$i.gz > \
 				`echo $$i | tr '[:lower:]' '[:upper:]'`; \
 		done
 
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 08eac9081572..7b608d2e16fd 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Feb 1995
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.11 1996/06/26 22:33:17 gpalmer Exp $
+# $Id: Makefile,v 1.12 1996/11/11 05:49:49 obrien Exp $
 #
 
 DISTNAME=	mmv
@@ -22,8 +22,8 @@ NO_WRKSUBDIR=	yes
 # targets shamelessly hacked from the bsd.ports.mk file
 
 do-fetch:
-	@if [ ! -d ${DISTDIR} ]; then mkdir -p ${DISTDIR}; fi
-	@(cd ${DISTDIR}; \
+	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
+	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 	 for file in ${SITE_DISTFILES}; do \
 		if [ ! -f `basename $$file` ]; then \
 			echo ">> `basename $$file` doesn't seem to exist on this system."; \
@@ -36,7 +36,7 @@ do-fetch:
 			done; \
 			if [ ! -f `basename $$file` ]; then \
 				echo ">> Couldn't fetch it - please try to retreive this";\
-				echo ">> port manually into ${DISTDIR} and try again."; \
+				echo ">> port manually into ${DISTDIR}/${DIST_SUBDIR} and try again."; \
 				exit 1; \
 			fi; \
 	    fi \
@@ -48,7 +48,7 @@ pre-extract:
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}/tmp
-	@(cd ${DISTDIR} ; for file in ${DISTFILES}; do \
+	@(cd ${DISTDIR}/${DIST_SUBDIR} ; for file in ${DISTFILES}; do \
 		${CP} $$file ${WRKDIR}/tmp; \
 	 done ; \
 	 cd ${WRKDIR}/tmp; \
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index d44a9a41b438..8a21a09241c4 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Mar 1996
 # Whom:			Hideaki Ohmon <ohmon@tom.sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.4 1996/11/09 11:29:43 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/17 08:45:02 obrien Exp $
 #
 
 DISTNAME=	pkfonts
@@ -45,7 +45,7 @@ pre-fetch:
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/fonts
-	tar -C ${PREFIX}/lib/fonts -xzf ${DISTDIR}/${DISTFILES}
+	tar -C ${PREFIX}/lib/fonts -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 	@${CP} ${PKGDIR}/${RESOLUTION}.list ${PKGDIR}/PLIST 
 
 pre-clean:
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 76a31a32c37b..ad29be1691bc 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -164,9 +164,9 @@ if [ $answ = YES ]; then
 
     if [ -f $WH ] ; then
 	echo "==> $WH found in source distribution."
-    elif [ -f $DISTDIR/Wraphelp.c ] ; then
+    elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$DISTDIR/Wraphelp.c
+	cpwh=$DISTDIR/xc/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c