diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-24 20:48:15 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-24 20:48:15 +0800 |
| commit | 9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d (patch) | |
| tree | 45f99aa8a84816af81599a89d4cc74307128bf9f | |
| parent | f1717f9aba593960a94d1149a5a0cd08001818ab (diff) | |
| download | xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar.gz xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar.bz2 xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar.lz xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar.xz xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.tar.zst xorg-devel-ports-9a75dc9a108af3b19fcc62b6bcfc37d454c0e14d.zip | |
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1168 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | Mk/bsd.port.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1f60cbf..90cac2f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1500,6 +1500,10 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg USES+= gmake .endif +.if !defined(UID) +UID!= ${ID} -u +.endif + # Loading features .for f in ${USES} _f=${f:C/\:.*//g} @@ -1631,10 +1635,6 @@ PATCH_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip .endif .endif -.if !defined(UID) -UID!= ${ID} -u -.endif - # Check the compatibility layer for amd64/ia64 .if ${ARCH} == "amd64" || ${ARCH} =="ia64" @@ -4067,7 +4067,7 @@ install-ldconfig-file: .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} @@ -4092,7 +4092,7 @@ install-ldconfig-file: .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} @@ -5730,7 +5730,11 @@ generate-plist: @${ECHO_MSG} "===> Generating temporary packing list" @${MKDIR} `${DIRNAME} ${TMPPLIST}` @if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi +.if defined(NO_STAGE) @>${TMPPLIST} +.else + @${ECHO_CMD} -e "@owner root\n@group wheel" >${TMPPLIST} +.endif @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ done |