summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-25 23:44:45 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-25 23:44:45 +0800
commit466dd8a1c960abdd0d5c0e80f544220e22e97e2d (patch)
tree50cc53dd9589594e08bbfb4701626c322d944b49 /Mk
parentae50e98e5f8bf180148e44d01ebaf04217de0c0f (diff)
downloadxorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar.gz
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar.bz2
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar.lz
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar.xz
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.tar.zst
xorg-devel-ports-466dd8a1c960abdd0d5c0e80f544220e22e97e2d.zip
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@975 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b14eefb..8228bd7 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1641,6 +1641,10 @@ 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"
@@ -1648,7 +1652,10 @@ PATCH_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
HAVE_COMPAT_IA32_LIBS?= YES
.endif
.if !defined(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi
+HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi; echo
+.if empty(HAVE_COMPAT_IA32_KERN)
+.undef HAVE_COMPAT_IA32_KERN
+.endif
.endif
.endif
@@ -2318,9 +2325,6 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
READLINK_CMD?= /usr/bin/readlink
# Determine whether or not we can use rootly owner/group functions.
-.if !defined(UID)
-UID!= ${ID} -u
-.endif
.if ${UID} == 0
_BINOWNGRP= -o ${BINOWN} -g ${BINGRP}
_SHROWNGRP= -o ${SHAREOWN} -g ${SHAREGRP}