From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 15 22:10:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78ACC106564A for ; Fri, 15 Jul 2011 22:10:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 53B4E8FC1A for ; Fri, 15 Jul 2011 22:10:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6FMABOg045775 for ; Fri, 15 Jul 2011 22:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6FMABPY045774; Fri, 15 Jul 2011 22:10:11 GMT (envelope-from gnats) Resent-Date: Fri, 15 Jul 2011 22:10:11 GMT Resent-Message-Id: <201107152210.p6FMABPY045774@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Baptiste Daroussin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E2D0106566C for ; Fri, 15 Jul 2011 22:01:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 043348FC1B for ; Fri, 15 Jul 2011 22:01:56 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6FM1tPY045205 for ; Fri, 15 Jul 2011 22:01:55 GMT (envelope-from bapt@freefall.freebsd.org) Received: (from bapt@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6FM1tFb045204; Fri, 15 Jul 2011 22:01:55 GMT (envelope-from bapt) Message-Id: <201107152201.p6FM1tFb045204@freefall.freebsd.org> Date: Fri, 15 Jul 2011 22:01:55 GMT From: Baptiste Daroussin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/158956: [bsd.port.mk] [patch] yet more cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Baptiste Daroussin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2011 22:10:11 -0000 >Number: 158956 >Category: ports >Synopsis: [bsd.port.mk] [patch] yet more cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 15 22:10:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Baptiste Daroussin >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #4 r220774: Mon Apr 18 13:56:14 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: remove the unuser ${__softMAKEFLAGS} while here combine with ports/156077 (remove old security check code) and ports/158955: use SRC_BASE instead of hardcoded /usr/src >How-To-Repeat: >Fix: --- cleanup-bpm.patch begins here --- --- bsd.port.mk.orig 2011-07-15 10:26:30.000000000 +0200 +++ bsd.port.mk 2011-07-15 23:54:14.713165655 +0200 @@ -1217,8 +1217,8 @@ .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h -.elif exists(/usr/src/sys/sys/param.h) -OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h +.elif exists(${SRC_BASE}/sys/sys/param.h) +OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif @@ -2808,10 +2808,10 @@ .endfor MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } -SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT -SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT -SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL -SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL +SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} master-sites-DEFAULT +SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-DEFAULT +SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} master-sites-ALL +SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-ALL # # Sort the master site list according to the patterns in MASTER_SORT @@ -2823,7 +2823,7 @@ . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/^://:S/,/ /g} . if !target(master-sites-${_group}) -SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-${_group} +SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group} master-sites-${_group}: @${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} . endif @@ -2835,7 +2835,7 @@ . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/^://:S/,/ /g} . if !target(patch-sites-${_group}) -SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} +SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group} patch-sites-${_group}: @${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} . endif @@ -3961,13 +3961,12 @@ fi; \ fi; \ fi - @__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \ - if ${PKG_CMD} -b ${PKGNAME} ${PKGFILE}; then \ + @if ${PKG_CMD} -b ${PKGNAME} ${PKGFILE}; then \ if [ -d ${PACKAGES} ]; then \ - cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \ + cd ${.CURDIR} && eval ${MAKE} package-links; \ fi; \ else \ - cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package; \ exit 1; \ fi .endif @@ -4281,8 +4280,6 @@ .if !defined(DISABLE_SECURITY_CHECK) .if !target(security-check) -.if !defined(OLD_SECURITY_CHECK) - security-check: # Scan PLIST for: # 1. setugid files @@ -4309,102 +4306,7 @@ ! ${AWK} -v audit="$${PORTS_AUDIT}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ ${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \ then \ - www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ - if [ ! -z "$${www_site}" ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} " For more information, and contact details about the security"; \ - ${ECHO_MSG} " status of this software, see the following webpage: "; \ - ${ECHO_MSG} "$${www_site}"; \ - fi; \ - fi - - -.else # i.e. defined(OLD_SECURITY_CHECK) - -security-check: -# Scan PLIST for: -# 1. setugid files -# 2. accept()/recvfrom() which indicates network listening capability -# 3. insecure functions (gets/mktemp/tempnam/[XXX]) -# 4. startup scripts, in conjunction with 2. -# 5. world-writable files/dirs -# - -@${RM} -f ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.stupid \ - ${WRKDIR}/.PLIST.network ${WRKDIR}/.PLIST.writable; \ - if [ -n "$$PORTS_AUDIT" ]; then \ - stupid_functions_regexp=' (gets|mktemp|tempnam|tmpnam|strcpy|strcat|sprintf)$$'; \ - else \ - stupid_functions_regexp=' (gets|mktemp|tempnam|tmpnam)$$'; \ - fi; \ - for i in `${GREP} -v '^@' ${TMPPLIST}`; do \ - if [ ! -L "${PREFIX}/$$i" -a -f "${PREFIX}/$$i" ]; then \ - ${OBJDUMP} -R ${PREFIX}/$$i > \ - ${WRKDIR}/.PLIST.objdump 2> /dev/null; \ - if [ -s ${WRKDIR}/.PLIST.objdump ] ; then \ - ${EGREP} " $$stupid_functions_regexp" \ - ${WRKDIR}/.PLIST.objdump | ${AWK} '{print " " $$3}' | ${TR} -d '\n' \ - > ${WRKDIR}/.PLIST.stupid; \ - if [ -n "`${EGREP} ' (accept|recvfrom)$$' ${WRKDIR}/.PLIST.objdump`" ] ; then \ - if [ -s ${WRKDIR}/.PLIST.stupid ]; then \ - ${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \ - ${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.network; \ - ${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.network; \ - else \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.network; \ - fi; \ - fi; \ - fi; \ - if [ -n "`${FIND} ${PREFIX}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \ - if [ -s ${WRKDIR}/.PLIST.stupid ]; then \ - ${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \ - ${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.setuid; \ - ${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.setuid; \ - else \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.setuid; \ - fi; \ - fi; \ - fi; \ - if [ ! -L "${PREFIX}/$$i" ]; then \ - if [ -n "`${FIND} ${PREFIX}/$$i -prune -perm -0002 \! -type l 2>/dev/null`" ]; then \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.writable; \ - fi; \ - fi; \ - done; \ - ${GREP} '^etc/rc.d/' ${TMPPLIST} > ${WRKDIR}/.PLIST.startup; \ - if [ -s ${WRKDIR}/.PLIST.setuid -o -s ${WRKDIR}/.PLIST.network -o -s ${WRKDIR}/.PLIST.writable ]; then \ - if [ -n "$$PORTS_AUDIT" ]; then \ - ${ECHO_MSG} "===> SECURITY REPORT (PARANOID MODE): "; \ - else \ - ${ECHO_MSG} "===> SECURITY REPORT: "; \ - fi; \ - if [ -s ${WRKDIR}/.PLIST.setuid ] ; then \ - ${ECHO_MSG} " This port has installed the following binaries,"; \ - ${ECHO_MSG} " which execute with increased privileges."; \ - ${CAT} ${WRKDIR}/.PLIST.setuid; \ - ${ECHO_MSG}; \ - fi; \ - if [ -s ${WRKDIR}/.PLIST.network ] ; then \ - ${ECHO_MSG} " This port has installed the following files, which may act as network"; \ - ${ECHO_MSG} " servers and may therefore pose a remote security risk to the system."; \ - ${CAT} ${WRKDIR}/.PLIST.network; \ - ${ECHO_MSG}; \ - if [ -s ${WRKDIR}/.PLIST.startup ] ; then \ - ${ECHO_MSG} " This port has installed the following startup scripts,"; \ - ${ECHO_MSG} " which may cause these network services to be started at boot time."; \ - ${SED} s,^,${PREFIX}/, < ${WRKDIR}/.PLIST.startup; \ - ${ECHO_MSG}; \ - fi; \ - fi; \ - if [ -s ${WRKDIR}/.PLIST.writable ] ; then \ - ${ECHO_MSG} " This port has installed the following world-writable files/directories."; \ - ${CAT} ${WRKDIR}/.PLIST.writable; \ - ${ECHO_MSG}; \ - fi; \ - ${ECHO_MSG} " If there are vulnerabilities in these programs there may be a security"; \ - ${ECHO_MSG} " risk to the system. The FreeBSD Project makes no guarantee about the"; \ - ${ECHO_MSG} " security of ports included in the Ports Collection."; \ - ${ECHO_MSG} " Please type 'make deinstall' to deinstall the port if this is a concern."; \ - www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ + www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \ if [ ! -z "$${www_site}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} " For more information, and contact details about the security"; \ @@ -4412,7 +4314,6 @@ ${ECHO_MSG} "$${www_site}"; \ fi; \ fi -.endif # !defined(OLD_SECURITY_CHECK) .endif .else # i.e. defined(DISABLE_SECURITY_CHECK) security-check: @@ -4495,7 +4396,7 @@ ${target}: ${${target:U}_COOKIE} .elif !target(${target}) ${target}: config-conditional - @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE} + @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${${target:U}_COOKIE} .elif target(${target}) && defined(IGNORE) .endif @@ -4504,19 +4405,19 @@ .if ${UID} != 0 && defined(_${target:U}_SUSEQ) && !defined(INSTALL_AS_USER) .if defined(USE_SUBMAKE) ${${target:U}_COOKIE}: ${_${target:U}_DEP} - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ} + @cd ${.CURDIR} && ${MAKE} ${_${target:U}_SEQ} .else ${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ} .endif @${ECHO_MSG} "===> Switching to root credentials for '${target}' target" @cd ${.CURDIR} && \ - ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SUSEQ}" + ${SU_CMD} "${MAKE} ${_${target:U}_SUSEQ}" @${ECHO_MSG} "===> Returning to user credentials" @${TOUCH} ${TOUCH_FLAGS} ${.TARGET} .elif defined(USE_SUBMAKE) ${${target:U}_COOKIE}: ${_${target:U}_DEP} @cd ${.CURDIR} && \ - ${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ} + ${MAKE} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ} @${TOUCH} ${TOUCH_FLAGS} ${.TARGET} .else ${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ} @@ -4528,7 +4429,7 @@ @if [ -e ${.TARGET} ]; then \ ${DO_NADA}; \ else \ - cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${.TARGET}; \ + cd ${.CURDIR} && ${MAKE} ${.TARGET}; \ fi .endif @@ -4593,7 +4494,7 @@ .if !target(pretty-print-www-site) pretty-print-www-site: - @www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ + @www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \ if [ -n "$${www_site}" ]; then \ ${ECHO_MSG} -n " and/or visit the "; \ ${ECHO_MSG} -n "web site"; \ @@ -4611,7 +4512,7 @@ .if !target(checkpatch) checkpatch: - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} PATCH_CHECK_ONLY=yes ${_PATCH_DEP} ${_PATCH_SEQ} + @cd ${.CURDIR} && ${MAKE} PATCH_CHECK_ONLY=yes ${_PATCH_DEP} ${_PATCH_SEQ} .endif # Reinstall @@ -4633,7 +4534,7 @@ .if ${UID} != 0 && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Switching to root credentials for '${.TARGET}' target" @cd ${.CURDIR} && \ - ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}" + ${SU_CMD} "${MAKE} ${.TARGET}" @${ECHO_MSG} "===> Returning to user credentials" .else @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" @@ -4666,7 +4567,7 @@ .if ${UID} != 0 && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Switching to root credentials for '${.TARGET}' target" @cd ${.CURDIR} && \ - ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}" + ${SU_CMD} "${MAKE} ${.TARGET}" @${ECHO_MSG} "===> Returning to user credentials" .else @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" @@ -4702,15 +4603,15 @@ .if !target(clean) clean: .if !defined(NOCLEANDEPENDS) - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} limited-clean-depends + @cd ${.CURDIR} && ${MAKE} limited-clean-depends .endif @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" .if target(pre-clean) - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pre-clean + @cd ${.CURDIR} && ${MAKE} pre-clean .endif - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} do-clean + @cd ${.CURDIR} && ${MAKE} do-clean .if target(post-clean) - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} post-clean + @cd ${.CURDIR} && ${MAKE} post-clean .endif .endif @@ -4947,7 +4848,7 @@ .if !target(makesum) makesum: check-checksum-algorithms - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch NO_CHECKSUM=yes \ + @cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=yes \ DISABLE_SIZE=yes @if [ -f ${DISTINFO_FILE} ]; then ${CAT} /dev/null > ${DISTINFO_FILE}; fi @( \ @@ -5120,7 +5021,7 @@ .if !target(package-noinstall) package-noinstall: @${MKDIR} ${WRKDIR} - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pre-package \ + @cd ${.CURDIR} && ${MAKE} pre-package \ pre-package-script do-package post-package-script @${RM} -f ${TMPPLIST} -@${RMDIR} ${WRKDIR} @@ -5711,13 +5612,12 @@ .if !target(readme) readme: @${RM} -f ${.CURDIR}/README.html - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${.CURDIR}/README.html + @cd ${.CURDIR} && ${MAKE} ${.CURDIR}/README.html .endif ${.CURDIR}/README.html: @${ECHO_MSG} "===> Creating README.html for ${PKGNAME}" - @__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \ - ${SED} -e 's|%%PORT%%|'$$(${ECHO_CMD} ${.CURDIR} | \ + @${SED} -e 's|%%PORT%%|'$$(${ECHO_CMD} ${.CURDIR} | \ ${SED} -e 's|.*/\([^/]*/[^/]*\)$$|\1|')'|g' \ -e 's|%%PKG%%|${PKGNAME}|g' \ -e 's|%%COMMENT%%|'"$$(${ECHO_CMD} ${COMMENT:Q})"'|' \ @@ -5727,12 +5627,9 @@ -e 's|%%EMAIL%%|'"$$(${ECHO_CMD} "${MAINTAINER}" | \ ${SED} -e 's/([^)]*)//;s/.*.*//')"'|g' \ -e 's|%%MAINTAINER%%|${MAINTAINER}|g' \ - -e 's|%%WEBSITE%%|'"$$(cd ${.CURDIR} && eval ${MAKE} \ - $${__softMAKEFLAGS} pretty-print-www-site)"'|' \ - -e 's|%%BUILD_DEPENDS%%|'"$$(cd ${.CURDIR} && eval ${MAKE} \ - $${__softMAKEFLAGS} pretty-print-build-depends-list)"'|' \ - -e 's|%%RUN_DEPENDS%%|'"$$(cd ${.CURDIR} && eval ${MAKE} \ - $${__softMAKEFLAGS} pretty-print-run-depends-list)"'|' \ + -e 's|%%WEBSITE%%|'"$$(cd ${.CURDIR} && eval ${MAKE} pretty-print-www-site)"'|' \ + -e 's|%%BUILD_DEPENDS%%|'"$$(cd ${.CURDIR} && eval ${MAKE} pretty-print-build-depends-list)"'|' \ + -e 's|%%RUN_DEPENDS%%|'"$$(cd ${.CURDIR} && eval ${MAKE} pretty-print-run-depends-list)"'|' \ -e 's|%%TOP%%|'"$$(${ECHO_CMD} ${CATEGORIES} | \ ${SED} -e 's| .*||' -e 's|[^/]*|..|g')"'/..|' \ ${TEMPLATES}/README.port >> ${.TARGET} @@ -5862,7 +5759,7 @@ .endif ${TMPPLIST}: - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} generate-plist + @cd ${.CURDIR} && ${MAKE} generate-plist .if !target(add-plist-docs) add-plist-docs: @@ -6404,7 +6301,7 @@ exit 1; \ fi; \ else \ - if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \ + if [ -z "`cd ${.CURDIR} && ${MAKE} desktop-categories`" ]; then \ ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \ exit 1; \ fi; \ @@ -6438,7 +6335,7 @@ pathname="${DESKTOPDIR}/$$filename"; \ categories="$$5"; \ if [ -z "$$categories" ]; then \ - categories="`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`"; \ + categories="`cd ${.CURDIR} && ${MAKE} desktop-categories`"; \ fi; \ ${ECHO_CMD} "${_DESKTOPDIR_REL}$$filename" >> ${TMPPLIST}; \ ${ECHO_CMD} "[Desktop Entry]" > $$pathname; \ --- bsd.port.subdir.mk.orig 2011-05-05 00:33:13.000000000 +0200 +++ bsd.port.subdir.mk 2011-07-15 23:47:21.944357691 +0200 @@ -70,8 +70,8 @@ .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h -.elif exists(/usr/src/sys/sys/param.h) -OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h +.elif exists(${SRC_BASE}/sys/sys/param.h) +OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif --- cleanup-bpm.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: