[Midnightbsd-cvs] mports: mports/Mk: Removed the skip for packlists from bsd.perl.mk.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Dec 7 16:13:46 EST 2007


Log Message:
-----------
Removed the skip for packlists from bsd.perl.mk.  It didn't work anyways.
Make sure that man3's for perl modules don't end up in gen-plist.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.78 -> r1.79)
        bsd.perl.mk (r1.7 -> r1.8)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.78
retrieving revision 1.79
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.78 -r1.79
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -5475,7 +5475,7 @@
 		new=`${MTREE_CMD} -Uf ${MTREE_FILE} | ${SED} -e 's/\s*extra$$//' | ${EGREP} -v "^man/|^share/nls/POSIX|^share/nls/en_US.US-ASCII"`; \
 		for file in $$new; do \
 			if [ ! -L $$file ] && [ -d $$file ]; then \
-				tree=`${FIND} -d $$file -type f -or -type d -or -type l`; \
+				tree=`${FIND} -d $$file -type f -or -type d -or -type l | ${EGREP} -v "man/man[123456789]`; \
 				for f in $$tree; do \
 					if [ -d $$f ]; then \
 						directories="$$directories $$f"; \
@@ -5506,7 +5506,7 @@
 		new=`${MTREE_CMD} -Uf ${MTREE_LINUX_FILE} | ${SED} -e 's/\s*extra$$//'`; \
 		for file in $$new; do \
 			if [ -d $$file ]; then \
-				tree=`${FIND} -d $$file -type f -or -type d`; \
+				tree=`${FIND} -d $$file -type f -or -type d | ${EGREP} -v "man/man[123456789]"`; \
 				for f in $$tree; do \
 					if [ -d $$f ]; then \
 						directories="$$directories $$f"; \
Index: bsd.perl.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.perl.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Mk/bsd.perl.mk -L Mk/bsd.perl.mk -u -r1.7 -r1.8
--- Mk/bsd.perl.mk
+++ Mk/bsd.perl.mk
@@ -140,11 +140,6 @@
 
 Perl_Post_Include=	bsd.perl.mk
 
-# There is a bug in perl's MakeMaker which causes the packlist to contain
-# the DESTDIR.  This bug is harmless, so we'll ignore it.  See rt.cpan.org
-# bug 3003 for details.
-SKIP_FAKE_CHECK+=	${SITE_PERL:S%^${PREFIX}/%%}/${PERL_ARCH}/auto/${PORTNAME:S%-%/%g}/.packlist
-
 PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
 				PERL_VER=${PERL_VER} \
 				PERL_ARCH=${PERL_ARCH} \


More information about the Midnightbsd-cvs mailing list