diff options
Diffstat (limited to 'devel/perforce')
| -rw-r--r-- | devel/perforce/Makefile | 10 | ||||
| -rw-r--r-- | devel/perforce/files/perforce.sh.in | 2 |
2 files changed, 7 insertions, 5 deletions
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 ;; |