diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2011-02-25 08:56:51 +0800 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2011-02-25 08:56:51 +0800 |
| commit | 57c29b88a3c738f9288e9b82de77f8441451cd78 (patch) | |
| tree | 7c7c4ee03533df7f780d064b689f2ff5508b5e69 /Mk | |
| parent | 9af93ac9365777575e79d1b88f548e80f79de454 (diff) | |
| download | freebsd-ports-gnome-57c29b88a3c738f9288e9b82de77f8441451cd78.tar.gz freebsd-ports-gnome-57c29b88a3c738f9288e9b82de77f8441451cd78.tar.zst freebsd-ports-gnome-57c29b88a3c738f9288e9b82de77f8441451cd78.zip | |
- make dirrmtry more friendly [1]
- allow checking STRIP when WITH_DEBUG is defined [2]
- unify the message with real URL by removing superfluous slash [3]
PR: 152102 [1],
153539 [2],
154653 [3]
Submitted by: az [1],
Anonymous <swell dot k at gmail dot com> [2],
sunpoet [3]
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a08a83420e43..1499103d309b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1348,6 +1348,11 @@ MAKE_ENV+= TMPDIR="${TMPDIR}" CONFIGURE_ENV+= TMPDIR="${TMPDIR}" .endif # defined(TMPDIR) +# Reset value from bsd.own.mk. +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +STRIP= #none +.endif + # Start of pre-makefile section. .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK) @@ -1638,7 +1643,7 @@ SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ WWWDIR=${WWWDIR} ETCDIR=${ETCDIR} PLIST_REINPLACE+= dirrmtry stopdaemon rmtry -PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! +PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir "%D/\1" 2>/dev/null || true! PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true! PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1 forcestop 2>/dev/null || true! @@ -1655,7 +1660,6 @@ CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} .endif .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) -STRIP= #none STRIP_CMD= ${TRUE} DEBUG_FLAGS?= -g CFLAGS:= ${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS} @@ -3571,7 +3575,7 @@ do-fetch: SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ fi; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - ${ECHO_MSG} "=> Attempting to fetch $${site}/$${file}"; \ + ${ECHO_MSG} "=> Attempting to fetch $${site}$${file}"; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ @@ -3623,7 +3627,7 @@ do-fetch: SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ - ${ECHO_MSG} "=> Attempting to fetch $${site}/$${file}"; \ + ${ECHO_MSG} "=> Attempting to fetch $${site}$${file}"; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ |