diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 7 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 50 | ||||
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 2 |
3 files changed, 15 insertions, 44 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 64cb5b7..7963c83 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -334,21 +334,18 @@ PLIST_SUB+= GNOME:="@comment " NOGNOME:="" DATADIR="share" BUILD_DEPENDS+= python:${PORTSDIR}/lang/python CHKDPCHN_CMD?= ${PORTSDIR}/Tools/scripts/chkdepschain.py CHKDPCHN_CACHE= .chkdpchn.cache.${PKGNAME} -.if defined(GNOME_STRICT_DEPS_VALIDATION) -CHKDPCHN_ARGS+= -e -.endif .if !target(pre-extract) pre-extract:: @${ECHO_MSG} "===> Validating build-time dependency chain for ${PKGNAME}" @${MKDIR} ${WRKDIR} - @${CHKDPCHN_CMD} ${CHKDPCHN_ARGS} -b -s ${WRKDIR}/${CHKDPCHN_CACHE} + @${CHKDPCHN_CMD} -b -s ${WRKDIR}/${CHKDPCHN_CACHE} .endif .if !target(pre-install) pre-install:: @${ECHO_MSG} "===> Validating run-time dependency chain for ${PKGNAME}" - @${CHKDPCHN_CMD} ${CHKDPCHN_ARGS} -r -L ${WRKDIR}/${CHKDPCHN_CACHE} + @${CHKDPCHN_CMD} -r -L ${WRKDIR}/${CHKDPCHN_CACHE} .endif .endif # End of GNOME_VALIDATE_DEPS_CHAIN part. diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5d91bde..2ba6164 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -848,12 +848,9 @@ PLIST_SUB+= PORTDOCS="@comment " PLIST_SUB+= PORTDOCS="" .endif -CONFIGURE_SHELL?= ${SH} -MAKE_SHELL?= ${SH} - -CONFIGURE_ENV+= SHELL=${SH} CONFIG_SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT} +CONFIGURE_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT} SCRIPTS_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT} -MAKE_ENV+= SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT} +MAKE_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT} PLIST_SUB+= PORTOBJFORMAT=${PORTOBJFORMAT} .if defined(MANCOMPRESSED) @@ -1826,7 +1823,7 @@ VERSIONFILE= ${PKG_DBDIR}/.mkversion .endif .if exists(${VERSIONFILE}) .if !defined(SYSTEMVERSION) -SYSTEMVERSION!= ${CAT} ${VERSIONFILE} +SYSTEMVERSION!= cat ${VERSIONFILE} .endif .else SYSTEMVERSION= 0 @@ -2165,13 +2162,7 @@ do-fetch: .if !target(do-extract) do-extract: -.if !defined(CHKDPCHN_CACHE) @${RM} -rf ${WRKDIR} -.else - @for file in `${LS} -A ${WRKDIR} | ${GREP} -v ${CHKDPCHN_CACHE}`; do \ - ${RM} -rf ${WRKDIR}/$$file; \ - done -.endif @${MKDIR} ${WRKDIR} @for file in ${EXTRACT_ONLY}; do \ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ @@ -2468,7 +2459,6 @@ run-ldconfig: .if !target(security-check) security-check: -.if !defined(PKG_NO_SECURITY_CHECK) # Scan PLIST for setugid files and startup scripts -@for i in `${GREP} -v '^@' ${TMPPLIST}`; do \ ${FIND} ${PREFIX}/$$i -prune -type f \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) -ls 2>/dev/null; \ @@ -2499,9 +2489,6 @@ security-check: ${MAKE} www-site; \ fi; \ fi -.else - @${DO_NADA} -.endif .endif ################################################################ @@ -3172,20 +3159,9 @@ RUN-DEPENDS-LIST= \ package-depends-list: @${PACKAGE-DEPENDS-LIST} -PACKAGE-DEPENDS-LIST?= \ +PACKAGE-DEPENDS-LIST= \ if [ "${CHILD_DEPENDS}" ]; then \ - for origin in ${PKGORIGIN} ${ALT_ORIGINS}; do \ - installed=$$(${PKG_INFO} -qO $$origin); \ - if [ "$$installed" ]; then \ - break; \ - fi; \ - done; \ - if [ -z "$$installed" ]; then \ - installed="${PKGNAME}"; \ - fi; \ - for pkgname in $$installed; do \ - ${ECHO_CMD} "$$pkgname ${.CURDIR} ${PKGORIGIN}"; \ - done; \ + ${ECHO_CMD} "${PKGNAME} ${.CURDIR}"; \ fi; \ checked="${PARENT_CHECKED}"; \ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ @@ -3193,11 +3169,12 @@ PACKAGE-DEPENDS-LIST?= \ if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ set -- $$childout; \ - childdir=""; \ + childname=""; childdir=""; \ while [ $$\# != 0 ]; do \ + childname="$$childname $$1"; \ childdir="$$childdir $$2"; \ - ${ECHO_CMD} "$$1 $$2 $$3"; \ - shift 3; \ + ${ECHO_CMD} "$$1 $$2"; \ + shift 2; \ done; \ checked="$$dir $$childdir $$checked"; \ fi; \ @@ -3209,7 +3186,7 @@ PACKAGE-DEPENDS-LIST?= \ # Print out package names. package-depends: - @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}' + @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1}' ################################################################ # Everything after here are internal targets and really @@ -3444,11 +3421,8 @@ fake-pkg: if [ -f ${PKGMESSAGE} ]; then \ ${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ fi; \ - if [ -f ${MTREE_FILE} ]; then \ - ${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \ - fi; \ - for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | sort -u`; do \ - if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ + for dep in `cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} package-depends ECHO_MSG=${TRUE} | sort -u`; do \ + if [ -d ${PKG_DBDIR}/$$dep -a -z `echo $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ >/dev/null 2>&1; then \ ${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \ diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 2287067..61cdec2 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -250,7 +250,7 @@ README.html: search: ${PORTSDIR}/INDEX - @here="${.CURDIR}"; \ + @here=`pwd`; \ cd ${PORTSDIR}; \ top=`pwd`; \ there=`echo "$$here/" | sed s%$$top%${PORTSDIR}%`; \ |
