cvs commit: ports/devel/mk-configure Makefile distinfo pkg-plist

Anonymous swell.k at gmail.com
Sun Jul 18 22:43:27 UTC 2010


QAT at FreeBSD.org writes:

> === Checking filesystem state
> list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
> 31773748        4 drwxr-xr-x    2 root             wheel                 512 Jul 18 21:42 usr/local/share/doc/mk-configure
> 31773782       32 -rw-r--r--    1 root             wheel               16086 Jul 18 21:42 usr/local/share/doc/mk-configure/README
> 31773783       48 -rw-r--r--    1 root             wheel               23005 Jul 18 21:42 usr/local/share/doc/mk-configure/NEWS
> 31773784        8 -rw-r--r--    1 root             wheel                3864 Jul 18 21:42 usr/local/share/doc/mk-configure/TODO
> 31773785       12 -rw-r--r--    1 root             wheel                5731 Jul 18 21:42 usr/local/share/doc/mk-configure/COPYRIGHT
> 31773786       28 -rw-r--r--    1 root             wheel               12609 Jul 18 21:42 usr/local/share/doc/mk-configure/FAQ
> 31773787      184 -rw-r--r--    1 root             wheel               92615 Jul 18 21:42 usr/local/share/doc/mk-configure/presentation.pdf
> ================================================================
> build of /usr/ports/devel/mk-configure ended at Sun Jul 18 21:42:11 UTC 2010

I shouldn't have assumed that NOPORTDOCS undefines PORTDOCS.

%%
Index: devel/mk-configure/Makefile
===================================================================
RCS file: /a/.cvsup/ports/devel/mk-configure/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/mk-configure/Makefile	18 Jul 2010 21:28:34 -0000	1.6
+++ devel/mk-configure/Makefile	18 Jul 2010 22:37:26 -0000
@@ -19,7 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 MAKE_JOBS_UNSAFE=	yes
 
 BMAKE?=		${LOCALBASE}/bin/bmake
-MAKE_ENV+=	EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}"
 INSTALL_TARGET=	installdirs install
 
 PORTDOCS=	README NEWS TODO COPYRIGHT FAQ presentation.pdf
@@ -30,6 +29,14 @@ MAN1=		mkc_check_funclib.1 mkc_check_hea
 		mkcmake.1
 MAN7=		mk-configure.7
 
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
+MAKE_ENV+=	EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}"
+.else
+MAKE_ENV+=	EXTRAFILES=""
+.endif
+
 do-build:
 	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${BUILD_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
@@ -41,4 +48,4 @@ do-install:
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
%%


More information about the cvs-all mailing list