summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorLars Thegler <lth@FreeBSD.org>2005-02-20 14:54:00 +0000
committerLars Thegler <lth@FreeBSD.org>2005-02-20 14:54:00 +0000
commitbb9c06466b5390eb3a2987d18af68e7c95094602 (patch)
treee398460c30a160bad3f225fcc27abee704ac769e /devel
parent- create the .package dir (caused issues for gauche-gtk) (diff)
- Now builds on amd64 [1]
- Fixed output redirection for p4web [2] Submitted by: arved [1], "Ryan F." <ryan@kalama.no-ip.org> [2]
Notes
Notes: svn path=/head/; revision=129364
Diffstat (limited to 'devel')
-rw-r--r--devel/p4/Makefile10
-rw-r--r--devel/p4/files/perforce.sh.in2
-rw-r--r--devel/p4d/Makefile10
-rw-r--r--devel/p4d/files/perforce.sh.in2
-rw-r--r--devel/p4ftpd/Makefile10
-rw-r--r--devel/p4ftpd/files/perforce.sh.in2
-rw-r--r--devel/p4p/Makefile10
-rw-r--r--devel/p4p/files/perforce.sh.in2
-rw-r--r--devel/p4web/Makefile10
-rw-r--r--devel/p4web/files/perforce.sh.in2
-rw-r--r--devel/perforce/Makefile10
-rw-r--r--devel/perforce/files/perforce.sh.in2
12 files changed, 42 insertions, 30 deletions
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/p4/files/perforce.sh.in b/devel/p4/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/p4/files/perforce.sh.in
+++ b/devel/p4/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/p4d/files/perforce.sh.in b/devel/p4d/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/p4d/files/perforce.sh.in
+++ b/devel/p4d/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/p4ftpd/files/perforce.sh.in b/devel/p4ftpd/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/p4ftpd/files/perforce.sh.in
+++ b/devel/p4ftpd/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/p4p/files/perforce.sh.in b/devel/p4p/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/p4p/files/perforce.sh.in
+++ b/devel/p4p/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/p4web/files/perforce.sh.in b/devel/p4web/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/p4web/files/perforce.sh.in
+++ b/devel/p4web/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index 5c2532d6fc67..bdf3771a08b1 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/
EXTRACT_SUFX=
DISTFILES= ${BIN_FILES} ${SBIN_FILES}
-DIST_SUBDIR= perforce/${VERSION}/${ARCH}
EXTRACT_ONLY= # none
MAINTAINER= lth@FreeBSD.org
@@ -26,21 +25,24 @@ COMMENT= Perforce client and server
ARCH!= /usr/bin/uname -p
ARCH?= i386
-MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
-.if ${ARCH} == i386
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+DIST_SUBDIR= perforce/${VERSION}/i386
VERSION= 04.2
-REVISION= 9
+REVISION= 10
PLATFORM= freebsd4
BIN_FILES= p4
SBIN_FILES= p4d p4ftpd p4p p4web
REL_NOTES= http://www.perforce.com/perforce/doc.042/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.i386
.elif ${ARCH} == alpha
+DIST_SUBDIR= perforce/${VERSION}/${ARCH}
VERSION= 99.1
REVISION= 1
PLATFORM= freebsdaxp
BIN_FILES= p4
SBIN_FILES= p4d
REL_NOTES= http://www.perforce.com/perforce/doc.991/user/relnotes.txt
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
.else
VERSION= 0
IGNORE= "Unsupported platform, sorry."
diff --git a/devel/perforce/files/perforce.sh.in b/devel/perforce/files/perforce.sh.in
index f0ed1db1c3b5..2ebc5809fa48 100644
--- a/devel/perforce/files/perforce.sh.in
+++ b/devel/perforce/files/perforce.sh.in
@@ -24,7 +24,7 @@ start)
fi
if [ -x $p4web -a x$PERFORCE_WEB_START = xyes ]; then
echo -n ' p4web'
- su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS > /dev/null 2>&1 &"
+ su -fm $PERFORCE_USER -c "$p4web $PERFORCE_WEB_OPTIONS &" >/dev/null 2>&1
fi
;;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 11:24:05 +0000