aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlth <lth@FreeBSD.org>2005-04-08 22:53:59 +0800
committerlth <lth@FreeBSD.org>2005-04-08 22:53:59 +0800
commit36c2618a0dffec211f3e9f441c90867b00f241e2 (patch)
treea025c12a11bf7ac7c96ca707b3297df16b2ad303
parentb76d7dc4af5bc02b3840c98a39a5417e067a6816 (diff)
downloadfreebsd-ports-gnome-36c2618a0dffec211f3e9f441c90867b00f241e2.tar.gz
freebsd-ports-gnome-36c2618a0dffec211f3e9f441c90867b00f241e2.tar.zst
freebsd-ports-gnome-36c2618a0dffec211f3e9f441c90867b00f241e2.zip
Backing out part of last commit, that was breaking the version string.
Noticed by: chkversion Pointy hat to: lth
-rw-r--r--devel/p4/Makefile6
-rw-r--r--devel/p4d/Makefile6
-rw-r--r--devel/p4ftpd/Makefile6
-rw-r--r--devel/p4p/Makefile6
-rw-r--r--devel/p4web/Makefile6
-rw-r--r--devel/perforce/Makefile6
6 files changed, 18 insertions, 18 deletions
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index a3acc7cbabb1..460cf818e8dd 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -18,13 +18,11 @@ EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
COMMENT= Perforce client and server
-.include <bsd.port.pre.mk>
-
#
# This is a kludge. I don't know a better way to set PORTVERSION and
# PORTREVISION such that pkg_version figures out an update is needed
#
-ARCH!= ${UNAME} -p
+ARCH!= /usr/bin/uname -p
ARCH?= i386
.if (${ARCH} == i386) || (${ARCH} == amd64)
@@ -60,6 +58,8 @@ NO_WRKSUBDIR= yes
PLIST_FILES= ${BIN_FILES:S+^+bin/+g} \
${SBIN_FILES:S+^+sbin/+g}
+.include <bsd.port.pre.mk>
+
# These variables are all configurable.
PERFORCE_USER?= p4admin
PERFORCE_UID?= 94