[Midnightbsd-cvs] mports: bsd.mport.mk: don't check USE_GCPIO until after the pre-includes

[ctriv at midnightbsd.org]

Log Message:
-----------
don't check USE_GCPIO until after the pre-includes are included.  This fixes
the problem with USE_LINUX_RPM not implying USE_GCPIO.
Use the perl version of checkfake if perl is installed.  The perl version is
an order of magnitude faster than the shell version.
A few minor cleanups to makeplist.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.67 -> r1.68)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.67
retrieving revision 1.68
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.67 -r1.68
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1088,11 +1088,8 @@
 CHROOT?=	/usr/sbin/chroot
 COMM?=		/usr/bin/comm
 CP?=		/bin/cp
-.if defined(USE_GCPIO)
-CPIO?=		${LOCALBASE}/bin/gcpio
-.else
+GCPIO?=		${LOCALBASE}/bin/gcpio
 CPIO?=		/usr/bin/cpio
-.endif
 CUT?=		/usr/bin/cut
 DC?=		/usr/bin/dc
 DIALOG?=	/usr/bin/dialog
@@ -1527,6 +1524,14 @@
 # We only support xorg.
 X_WINDOW_SYSTEM ?= xorg
 
+
+#
+# One of the includes may have changed CPIO
+#
+.if defined(USE_GCPIO)
+CPIO=	${GCPIO}
+.endif
+
 ################
 #
 # Fake Setup 
@@ -5508,7 +5513,7 @@
 	@${ECHO_MSG} "===>   Generating packing list"
 	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
 	@${MKDIR} `${DIRNAME} ${GENPLIST}`
-	@echo '@comment $$MidnightBSD$$' > ${GENPLIST}
+	@${ECHO_CMD} '@comment $$MidnightBSD$$' > ${GENPLIST}
 
 .	if !defined(NO_MTREE)
 		@cd ${FAKE_DESTDIR}${PREFIX}; directories=""; files=""; \
@@ -5528,10 +5533,10 @@
 			fi; \
 		done; \
 		for file in $$files; do \
-			echo $$file >> ${GENPLIST}; \
+			${ECHO_CMD} $$file >> ${GENPLIST}; \
 		done; \
 		for dir in $$directories; do \
-			echo "@dirrm $$dir" >> ${GENPLIST}; \
+			${ECHO_CMD} "@dirrm $$dir" >> ${GENPLIST}; \
 		done;
 .	else 
 		@cd ${FAKE_DESTDIR}${PREFIX}; \
@@ -5559,10 +5564,10 @@
 			fi; \
 		done; \
 		for file in $$files; do \
-			echo $$file >> ${GENPLIST}; \
+			${ECHO_CMD} $$file >> ${GENPLIST}; \
 		done; \
 		for dir in $$directories; do \
-			echo "@dirrmtry " >> ${GENPLIST}; \
+			${ECHO_CMD} "@dirrm " >> ${GENPLIST}; \
 		done;
 		@${ECHO_CMD} '@cwd ${PREFIX}' >> ${GENPLIST}
 .	endif
@@ -5572,9 +5577,15 @@
 #
 # check to see how things went with a fake.
 #
+.if exists(${LOCALBASE}/bin/perl)
+_CHKFAKE=chkfake.pl
+.else
+_CHKFAKE=chkfake
+.endif
+
 .if !target(check-fake)
 check-fake: 
-	@${PORTSDIR}/Tools/scripts/chkfake ${TMPPLIST} ${FAKE_DESTDIR} ${PREFIX}
+	@${PORTSDIR}/Tools/scripts/${_CHKFAKE} ${TMPPLIST} ${FAKE_DESTDIR} ${PREFIX}
 .endif