Date: Wed, 19 Aug 1998 16:53:12 -0700 (PDT) From: asami@FreeBSD.ORG (Satoshi Asami) To: ac199@hwcn.org, obrien@NUXI.com, ac199@hwcn.org, ports@FreeBSD.ORG Subject: Re: cvs commit: ports/lang/glibstdc++28 Makefile Message-ID: <199808192353.QAA03197@silvia.hip.berkeley.edu> In-Reply-To: <199808192342.QAA03140@silvia.hip.berkeley.edu> (asami@FreeBSD.ORG)
next in thread | previous in thread | raw e-mail | index | archive | help
* My stupidity. Fixed, thanks.
Forgot to attach the new version. I put NO_PKG_REGISTER back (didn't
know it's so popular!) and changed some messages slighly so I can more
easily find what's causing "make index" (the "describe" target here)
to fail.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.227.2.46
diff -u -r1.227.2.46 bsd.port.mk
--- bsd.port.mk 1998/08/15 17:37:46 1.227.2.46
+++ bsd.port.mk 1998/08/19 23:20:36
@@ -1121,7 +1121,7 @@
.if !target(do-package)
do-package:
- @if [ -e ${PLIST} ]; then \
+ @if [ -e ${TMPPLIST} ]; then \
${ECHO_MSG} "===> Building package for ${PKGNAME}"; \
if [ -d ${PACKAGES} ]; then \
if [ ! -d ${PKGREPOSITORY} ]; then \
@@ -1229,19 +1229,16 @@
fi
.endif
.endif
-.if (make(real-install) || make(real-package)) && exists(${PLIST})
- @>${TMPPLIST}
-.for man in ${__MANPAGES}
- @${ECHO} ${man} >> ${TMPPLIST}
-.endfor
- @${SED} ${_sedsubplist} ${PLIST} >> ${TMPPLIST}
-.endif
@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/pre-/}
@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
${SCRIPTDIR}/${.TARGET:S/^real-/pre-/}; \
fi
@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/do-/}
+# put here so ports can change the contents of ${TMPPLIST} if necessary
+.if make(real-install)
+ @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} generate-plist
+.endif
@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/post-/}
@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/post-/} ]; then \
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
@@ -1536,7 +1533,7 @@
if [ -d $$dir ]; then \
(cd $$dir ; ${MAKE} package-name package-depends); \
else \
- ${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \
+ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
fi; \
done
.endif
@@ -1706,7 +1703,11 @@
.if !target(depends-list)
depends-list:
@for dir in `${ECHO} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \
- (cd $$dir; ${MAKE} package-name depends-list); \
+ if [ -d $$dir ]; then \
+ (cd $$dir ; ${MAKE} package-name depends-list); \
+ else \
+ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
+ fi; \
done
.endif
@@ -1788,13 +1789,25 @@
.endif
.endif
+# Generate packing list. Also tests to make sure all required package
+# files exist.
+
+.if !target(generate-plist)
+generate-plist:
+ @if [ ! -f ${PLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then ${ECHO} "** Missing package files for ${PKGNAME}."; exit 1; fi
+ @>${TMPPLIST}
+.for man in ${__MANPAGES}
+ @${ECHO} ${man} >> ${TMPPLIST}
+.endfor
+ @${SED} ${_sedsubplist} ${PLIST} >> ${TMPPLIST}
+.endif
+
# Fake installation of package so that user can pkg_delete it later.
# Also, make sure that an installed port is recognized correctly in
# accordance to the @pkgdep directive in the packing lists
.if !target(fake-pkg)
fake-pkg:
- @if [ ! -f ${TMPPLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then ${ECHO} "** Missing package files for ${PKGNAME} - installation not recorded."; exit 1; fi
@if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
.if defined(FORCE_PKG_REGISTER)
@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199808192353.QAA03197>