diff options
author | lth <lth@FreeBSD.org> | 2005-04-08 15:43:43 +0800 |
---|---|---|
committer | lth <lth@FreeBSD.org> | 2005-04-08 15:43:43 +0800 |
commit | 49ed836084fcc29c53dafa215c55890ad5d28483 (patch) | |
tree | 66384fcc0054050eaa0520724801ac0156b77198 /devel/p4d | |
parent | 01410e49a92ed1d25b4428986e0244963d17e4ee (diff) | |
download | freebsd-ports-gnome-49ed836084fcc29c53dafa215c55890ad5d28483.tar.gz freebsd-ports-gnome-49ed836084fcc29c53dafa215c55890ad5d28483.tar.zst freebsd-ports-gnome-49ed836084fcc29c53dafa215c55890ad5d28483.zip |
- Fix privilege during pre-install
- Reduce portlint nagging
PR: ports/79654
Submitted by: John Baldwin <jhb@FreeBSD.org>
Diffstat (limited to 'devel/p4d')
-rw-r--r-- | devel/p4d/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index 85974927db1a..a3acc7cbabb1 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -10,7 +10,7 @@ PORTVERSION= ${VERSION} PORTREVISION= ${REVISION} PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ +MASTER_SITES= ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ EXTRACT_SUFX= DISTFILES= ${BIN_FILES} ${SBIN_FILES} EXTRACT_ONLY= # none @@ -18,17 +18,19 @@ 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!= /usr/bin/uname -p -ARCH?= i386 +ARCH!= ${UNAME} -p +ARCH?= i386 .if (${ARCH} == i386) || (${ARCH} == amd64) DIST_SUBDIR= perforce/${VERSION}/i386 VERSION= 04.2 -REVISION= 12 +REVISION= 13 PLATFORM= freebsd4 BIN_FILES= p4 SBIN_FILES= p4d p4ftpd p4p p4web @@ -58,8 +60,6 @@ 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 @@ -69,8 +69,8 @@ PERFORCE_HOME?= ${LOCALBASE}/perforce PERFORCE_ROOT?= ${PERFORCE_HOME}/root PERFORCE_LOGS?= ${PERFORCE_HOME}/logs PERFORCE_PORT?= 1666 -PERFORCE_CACHE?= ${PERFORCE_HOME}/cache -PERFORCE_TARGET?= perforce:1666 +PERFORCE_CACHE?= ${PERFORCE_HOME}/cache +PERFORCE_TARGET?= perforce:1666 pre-everything:: @${ECHO} "If the checksums fail, try doing 'make distclean'" @@ -97,7 +97,7 @@ do-build: ${SED} -e "s,@PREFIX@,${PREFIX},g" \ < ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh -pre-install: +pre-su-install: ${SETENV} PKG_PREFIX=${PREFIX} \ PERFORCE_USER=${PERFORCE_USER} \ PERFORCE_UID=${PERFORCE_UID} \ |