Attachment 120172 Details for Bug 162924 – bpm.diff

[patch] bpm.diff

bpm.diff (text/plain), 4.98 KB, created by Matthew Seaman on 2011-11-28 15:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2011-11-28 15:20:08 UTC

Size: 4.98 KB

patch

obsolete

>Index: bsd.port.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.699
>diff -u -u -r1.699 bsd.port.mk
>--- bsd.port.mk	9 Nov 2011 08:53:12 -0000	1.699
>+++ bsd.port.mk	28 Nov 2011 13:08:25 -0000
>@@ -2406,6 +2406,8 @@
> PKGREQ?=		${PKGDIR}/pkg-req
> PKGMESSAGE?=	${PKGDIR}/pkg-message
> 
>+PKGNOTICES?=	${WRKDIR}/pkg-notices
>+SECURITY_REPORT=	${WRKDIR}/security-report
> TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
> TMPGUCMD?=	${WRKDIR}/.PLIST.gucmd
> 
>@@ -4246,7 +4248,10 @@
> 			${ECHO_MSG} "      status of this software, see the following webpage: "; \
> 			${ECHO_MSG} "$${www_site}"; \
> 		fi; \
>-	fi
>+	fi > ${SECURITY_REPORT} ; \
>+	if [ -s ${SECURITY_REPORT} ] ; then \
>+		${CAT} ${SECURITY_REPORT} ; \
>+	fi;
> .endif
> .else # i.e. defined(DISABLE_SECURITY_CHECK)
> security-check:
>@@ -4293,15 +4298,16 @@
> _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
> 				post-build post-build-script
> _INSTALL_DEP=	build
>-_INSTALL_SEQ=	install-message check-install-conflicts run-depends lib-depends apply-slist pre-install \
>-				pre-install-script generate-plist check-already-installed
>+_INSTALL_SEQ=	install-message check-install-conflicts run-depends lib-depends \
>+				apply-slist add-pkg-notices pre-install pre-install-script \
>+				generate-plist check-already-installed 
> _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
> 				pre-su-install-script create-users-groups do-install \
> 				install-desktop-entries install-license install-rc-script \
>-				post-install post-install-script add-plist-info \
>+				post-install post-install-script show-pkg-notices add-plist-info \
> 				add-plist-docs add-plist-examples add-plist-data \
> 				add-plist-post fix-plist-sequence compress-man \
>-				install-ldconfig-file fake-pkg security-check
>+				install-ldconfig-file security-check fake-pkg
> _PACKAGE_DEP=	install
> _PACKAGE_SEQ=	package-message pre-package pre-package-script \
> 				do-package post-package-script
>@@ -5615,6 +5621,48 @@
> .endif
> .endif
> 
>+# Add notices automatically when certain conditions are flagged.  This
>+# will be appended to any pre-existing pkg-message in a generated pkg,
>+# and displayed after installation, either from ports or from .pkg.
>+#
>+# FORBIDDEN, BROKEN, RESTRICTED, NO_PACKAGE will usually cause this code
>+# to be not-reached, but can be overridden, in which case a suitable
>+# message should be produced.
>+
>+.if !target(add-pkg-notices)
>+add-pkg-notices:
>+	@${RM} -f ${PKGNOTICES}
>+.if defined(DEPRECATED) || defined(FORBIDDEN) || defined(BROKEN) || \
>+	defined(RESTRICTED) || defined(NO_PACKAGE) || defined(NO_CDROM) || \
>+	defined(EXPIRATION_DATE) || \
>+	( defined(MAINTAINER) && ${MAINTAINER:L} == ports@freebsd.org )
>+.for i in DEPRECATED FORBIDDEN BROKEN RESTRICTED
>+.if defined(${i})
>+	@( ${ECHO_CMD} "===> This port is ${i}:"; \
>+	   ${ECHO_CMD} "     "${${i}:Q} | ${FMT} 72 72 ) >> ${PKGNOTICES}
>+.endif
>+.endfor
>+.if defined(NO_PACKAGE)
>+	@( ${ECHO_CMD} "===> Not for public redistribution as a PACKAGE:"; \
>+	   ${ECHO_CMD} "     "${NO_PACKAGE:Q} | ${FMT} 72 72 ) >> ${PKGNOTICES}
>+.endif
>+.if defined(NO_CDROM)
>+	@( ${ECHO_CMD} "===> Not for resale via CDROM/DVD set:"; \
>+       ${ECHO_CMD} "     "${NO_CDROM:Q} | ${FMT} 72 72 ) >> ${PKGNOTICES}
>+.endif
>+.if defined(EXPIRATION_DATE)
>+	@( ${ECHO_CMD} "===> EXPIRATION DATE is set to:"; \
>+	   ${ECHO_CMD} "     "${EXPIRATION_DATE:Q} ) >> ${PKGNOTICES}
>+.endif
>+.if defined(MAINTAINER) && ${MAINTAINER:L} == ports@freebsd.org
>+	@( ${ECHO_CMD} "===> The ${UNIQUENAME} port currently lacks a MAINTAINER"; \
>+	   ${ECHO_CMD} "     Anyone interested in volunteering please enquire"; \
>+	   ${ECHO_CMD} "     via the freebsd-ports@freebsd.org mailing list" ) \
>+	  >> ${PKGNOTICES}
>+.endif
>+.endif
>+.endif
>+
> # Generate packing list.  Also tests to make sure all required package
> # files exist.
> 
>@@ -5884,8 +5932,16 @@
> 		if [ -f ${PKGREQ} ]; then \
> 			${CP} ${PKGREQ} ${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \
> 		fi; \
>-		if [ -f ${PKGMESSAGE} ]; then \
>-			${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
>+		if [ -f ${PKGMESSAGE} -o -f ${PKGNOTICES} -o -s ${SECURITY_REPORT} ]; then \
>+			if [ -f ${PKGMESSAGE} ]; then \
>+				${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
>+			fi; \
>+			if [ -f ${PKGNOTICES} ]; then \
>+				${CAT} ${PKGNOTICES} >> ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
>+			fi; \
>+			if [ -s ${SECURITY_REPORT} ]; then \
>+				${CAT} ${SECURITY_REPORT} >> ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
>+			fi; \
> 			${ECHO_CMD} "@display +DISPLAY" >> ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
> 		fi; \
> 		for dep in `${PKG_INFO} -qf ${PKGNAME} | ${AWK} '/^@pkgdep / {print $$2}' | ${SORT} -u`; do \
>@@ -5911,6 +5967,13 @@
> .endif
> .endif
> 
>+.if !target(show-pkg-notices)
>+show-pkg-notices:
>+	@if [ -f ${PKGNOTICES} ] ; then \
>+		${CAT} ${PKGNOTICES} ; \
>+	fi
>+.endif
>+
> # Depend is generally meaningless for arbitrary ports, but if someone wants
> # one they can override this.  This is just to catch people who've gotten into
> # the habit of typing `make depend all install' as a matter of course.

Actions: View | Diff

Attachments on bug 162924: 120172