9 files changed, 86 insertions, 118 deletions

diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 4d0dc8579d2a..12611a2facbb 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	perforce
-PORTVERSION=	${VERSION}
-PORTREVISION=	${REVISION}
+PORTVERSION=	08.2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
@@ -19,36 +18,15 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perforce client and server
 
-ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
+ONLY_FOR_ARCHS=	amd64 i386 sparc64
 
-DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
+DIST_SUBDIR=	perforce/${PORTVERSION}_${PORTREVISION}/${ARCH}
 MD5_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 
-#
-# 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
-
-.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64
-VERSION=	07.3
-REVISION=	2
 BIN_FILES=	p4
 SBIN_FILES=	p4d p4ftpd p4p p4web
-REL_NOTES=	http://www.perforce.com/perforce/doc.073/user/relnotes.txt
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-REL_NOTES=	http://www.perforce.com/perforce/doc.991/user/relnotes.txt
-.else
-VERSION=	0
-IGNORE=		unsupported platform, sorry
-.endif
 
-# End of kludge
+REL_NOTES=	http://www.perforce.com/perforce/doc.082/user/relnotes.txt
 
 RESTRICTED=	Restricted distribution
 
@@ -60,20 +38,14 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 .include <bsd.port.pre.mk>
 
 # Figure out what to install
-.if ${ARCH} == alpha
-PLATFORM=	freebsdaxp
-.elif ${ARCH} == amd64
-.if ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
+.if ${ARCH} == amd64 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
 PLATFORM=	freebsd54x86_64
-.elif ${OSVERSION} >= 600000
+.elif ${ARCH} == amd64 && ${OSVERSION} >= 600000
 PLATFORM=	freebsd60x86_64
-.endif
-.elif ${ARCH} == i386
-.if ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
+.elif ${ARCH} == i386 && ${OSVERSION} >= 504000 && ${OSVERSION} < 600000
 PLATFORM=	freebsd54x86
-.elif ${OSVERSION} >= 600000
+.elif ${ARCH} == i386 && ${OSVERSION} >= 600000
 PLATFORM=	freebsd60x86
-.endif
 .elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
 PLATFORM=	freebsd61sparc64
 .else
diff --git a/devel/p4/distinfo.freebsd54x86 b/devel/p4/distinfo.freebsd54x86
index 094d657eaeeb..73518923697a 100644
--- a/devel/p4/distinfo.freebsd54x86
+++ b/devel/p4/distinfo.freebsd54x86
@@ -1,15 +1,15 @@
-MD5 (perforce/07.3/i386/p4) = 2cd989467d149b7bd43c03ff7fcd8a51
-SHA256 (perforce/07.3/i386/p4) = 6fe047f7de842ac484d17a0343b2c3f2d2bbf70b1de3709a2401e94689f86c58
-SIZE (perforce/07.3/i386/p4) = 519272
-MD5 (perforce/07.3/i386/p4d) = 5bc4560650641cf8c3019e5cf5f84019
-SHA256 (perforce/07.3/i386/p4d) = 4419a50609263580f498ba4b00383d81bab6f4ab2690c62e90c8b259afb7f42d
-SIZE (perforce/07.3/i386/p4d) = 1508572
-MD5 (perforce/07.3/i386/p4ftpd) = 11375cc50835c475e34aa061cbf4906a
-SHA256 (perforce/07.3/i386/p4ftpd) = 77c39019a9833ff534a48e580f6170f57b0fc4d9f2f3e7cc31028ef96edf57df
-SIZE (perforce/07.3/i386/p4ftpd) = 916553
-MD5 (perforce/07.3/i386/p4p) = cbae23c9949cb0283e527af16ee13285
-SHA256 (perforce/07.3/i386/p4p) = ab5dd647aaabccbaefcf57f1b38a04a68db913f95e50c43ae55b47e30cb2da72
-SIZE (perforce/07.3/i386/p4p) = 473064
-MD5 (perforce/07.3/i386/p4web) = 6d1a9472bc5796904f4895a17c4fe96e
-SHA256 (perforce/07.3/i386/p4web) = e333214fcd23ad5ac9abb03b92f3dceb27bfc05dea87a35fe43e76f2192b28a0
-SIZE (perforce/07.3/i386/p4web) = 2246201
+MD5 (perforce/08.2_0/i386/p4) = b83fca632e6be3721b43ab83285d88f2
+SHA256 (perforce/08.2_0/i386/p4) = 809ee98fdf4a0bdc67dde689334a22dd0930a734d898bcebc04b0a8287311868
+SIZE (perforce/08.2_0/i386/p4) = 544684
+MD5 (perforce/08.2_0/i386/p4d) = 0b547f61b2522b0e19562fe551cb4e5b
+SHA256 (perforce/08.2_0/i386/p4d) = c081020937f9524745613eadf76f5e570a05ac032c304593ec25448fb83ef213
+SIZE (perforce/08.2_0/i386/p4d) = 1577536
+MD5 (perforce/08.2_0/i386/p4ftpd) = a4047079042bd7b26e895b337f91f389
+SHA256 (perforce/08.2_0/i386/p4ftpd) = 45555206e265a5cf087efcae88184247e54ecebeb70435fa06c8d6d3af9f1e4e
+SIZE (perforce/08.2_0/i386/p4ftpd) = 707280
+MD5 (perforce/08.2_0/i386/p4p) = d77b98d78485bac6632e738df3f8a515
+SHA256 (perforce/08.2_0/i386/p4p) = 9dbcd5076d864caa9e79404e2c388624558b8b7352648c8fb0c0a663e2ab9e18
+SIZE (perforce/08.2_0/i386/p4p) = 493800
+MD5 (perforce/08.2_0/i386/p4web) = 83a671908b01485897e46a1be8148991
+SHA256 (perforce/08.2_0/i386/p4web) = 731d92ffc9a8b80f3d99e500fd1f324d190812431e367bd9525f60b5af9f9993
+SIZE (perforce/08.2_0/i386/p4web) = 2362664
diff --git a/devel/p4/distinfo.freebsd54x86_64 b/devel/p4/distinfo.freebsd54x86_64
index 0f0e8d30bd6c..e42a132eaa6a 100644
--- a/devel/p4/distinfo.freebsd54x86_64
+++ b/devel/p4/distinfo.freebsd54x86_64
@@ -1,15 +1,15 @@
-MD5 (perforce/07.3/amd64/p4) = b1f0661f906830da3fd648c45d363e90
-SHA256 (perforce/07.3/amd64/p4) = da6a4172e3a24804f04df7ce61d9320a7b38c1b56298bb8249c80a0e977a16f1
-SIZE (perforce/07.3/amd64/p4) = 579528
-MD5 (perforce/07.3/amd64/p4d) = eca89bb3e34c4f535e1ee5ba70620964
-SHA256 (perforce/07.3/amd64/p4d) = cda04ac3d43b6235c911cd8fc7bb589bc80ebd604d15cf24efa415707f7821ea
-SIZE (perforce/07.3/amd64/p4d) = 1688616
-MD5 (perforce/07.3/amd64/p4ftpd) = 343d1d7ea997668e4afbf206728be0fb
-SHA256 (perforce/07.3/amd64/p4ftpd) = e1805c8dd97249d3b7095869a77d73797c24c76e2717707e5eb0cfb18daa5536
-SIZE (perforce/07.3/amd64/p4ftpd) = 974539
-MD5 (perforce/07.3/amd64/p4p) = 3c7759ee9b765cef7a1fdc2e44aed410
-SHA256 (perforce/07.3/amd64/p4p) = a0e350876794e2e07f1a242bc2b9b1f7e6ae233368c0442d17dad5a3437f59ed
-SIZE (perforce/07.3/amd64/p4p) = 566344
-MD5 (perforce/07.3/amd64/p4web) = 7446f18d50724e5db46522dd8cedaaeb
-SHA256 (perforce/07.3/amd64/p4web) = 3e5deab8a0f55fb0764e795c1858c1afb8f94c3378c095ca366a0f35bc62cfee
-SIZE (perforce/07.3/amd64/p4web) = 2319744
+MD5 (perforce/08.2_0/amd64/p4) = 460ae9678427306e8b2a488612d0d25a
+SHA256 (perforce/08.2_0/amd64/p4) = bc49a62bf9efebe5816f4b211d8883a2adec7fc3785a84d3e42f9e7c82f7dc3b
+SIZE (perforce/08.2_0/amd64/p4) = 607432
+MD5 (perforce/08.2_0/amd64/p4d) = 1381c7f990a9686ff5cdd90bc07c9f21
+SHA256 (perforce/08.2_0/amd64/p4d) = b789d55903cedfa94129be8459a5f13acd6ee7651361b1bdcfe2ce02dcb93e2f
+SIZE (perforce/08.2_0/amd64/p4d) = 1740000
+MD5 (perforce/08.2_0/amd64/p4ftpd) = b1f2d5dc4e5968c8a04d2c43fb9f186c
+SHA256 (perforce/08.2_0/amd64/p4ftpd) = 2ab63f3cee095fea0ffe39956cdc1fa9644738890e874ac8e88167b99b5f4195
+SIZE (perforce/08.2_0/amd64/p4ftpd) = 743824
+MD5 (perforce/08.2_0/amd64/p4p) = 83657cf66faacfdb0d721f2daa2497c2
+SHA256 (perforce/08.2_0/amd64/p4p) = 0a9a3f4c4abbd4700903616e1132ffa42bdab2994e0bbcd006a47e148c02ae59
+SIZE (perforce/08.2_0/amd64/p4p) = 586600
+MD5 (perforce/08.2_0/amd64/p4web) = 2459a171a4c8bcda63eb494753752f88
+SHA256 (perforce/08.2_0/amd64/p4web) = 706d2fa78537d4eef0392cd1e1661caa9d47c6c4a1a5e9ffc9a32e79f2811c8b
+SIZE (perforce/08.2_0/amd64/p4web) = 2425768
diff --git a/devel/p4/distinfo.freebsd60x86 b/devel/p4/distinfo.freebsd60x86
index 0c55add8fb5f..c2181cde9979 100644
--- a/devel/p4/distinfo.freebsd60x86
+++ b/devel/p4/distinfo.freebsd60x86
@@ -1,15 +1,15 @@
-MD5 (perforce/07.3/i386/p4) = ea0f8d86bfe7f86d225e3a871c54f8d4
-SHA256 (perforce/07.3/i386/p4) = a0c6806ccf67ba60c8f85c8d1131e3776d6b02722ed2702b7f89fe7081fe59b8
-SIZE (perforce/07.3/i386/p4) = 519916
-MD5 (perforce/07.3/i386/p4d) = a0ea299963e1e95b0ffc69456d8594f3
-SHA256 (perforce/07.3/i386/p4d) = 333f0c028973a66820f0fd5530532a72d57a6dddad8b238e50045844cd6e5662
-SIZE (perforce/07.3/i386/p4d) = 1517152
-MD5 (perforce/07.3/i386/p4ftpd) = b2d83ebb3aecea264ca9036b28b8eb7f
-SHA256 (perforce/07.3/i386/p4ftpd) = 8341912d704c313a1cf68b98f7c00bd91faab134919465e429121703c13514f4
-SIZE (perforce/07.3/i386/p4ftpd) = 812601
-MD5 (perforce/07.3/i386/p4p) = b80df3f40d448b29e357dc901daf0f19
-SHA256 (perforce/07.3/i386/p4p) = 64fdc6dc97d8c19742da44b1cef74b2efe1625cbde34a207935f0c4cf4e4b6fb
-SIZE (perforce/07.3/i386/p4p) = 477152
-MD5 (perforce/07.3/i386/p4web) = 8305a455c72b2963d085ddc95118c61a
-SHA256 (perforce/07.3/i386/p4web) = 2b04bf576378d37856c27914ee99a4c18c8a44c017fd6d81dd2d8fadb513c1d0
-SIZE (perforce/07.3/i386/p4web) = 2144460
+MD5 (perforce/08.2_0/i386/p4) = 03eb51806079a56630ebc0519213f14e
+SHA256 (perforce/08.2_0/i386/p4) = a0f5a57963f72a95867e320c69a0c4880bae310441c374b4ad34c5e6ef3ff08b
+SIZE (perforce/08.2_0/i386/p4) = 545176
+MD5 (perforce/08.2_0/i386/p4d) = efc7cced673aef2e356259b7a0e6a1f8
+SHA256 (perforce/08.2_0/i386/p4d) = 3c132fda3f1573bc9c4b77ab3435a685f035cc2e42c15eb0bff763d906f81c11
+SIZE (perforce/08.2_0/i386/p4d) = 1590280
+MD5 (perforce/08.2_0/i386/p4ftpd) = 309bbcc2d9facdde095494671742abc3
+SHA256 (perforce/08.2_0/i386/p4ftpd) = 414f43c12593afcceb57c5bb12671e73f0f8de2302517327c34712fe885ec6e0
+SIZE (perforce/08.2_0/i386/p4ftpd) = 711840
+MD5 (perforce/08.2_0/i386/p4p) = ee253deeab529151e8d50c91092ef1f6
+SHA256 (perforce/08.2_0/i386/p4p) = 1b1131df308974f0ddd2bb6f70bde94b2161dc9f4fc4f382972e3471c0611c12
+SIZE (perforce/08.2_0/i386/p4p) = 502496
+MD5 (perforce/08.2_0/i386/p4web) = b9cf74c499e5f9390075cb4b635ae049
+SHA256 (perforce/08.2_0/i386/p4web) = 3fc871a5f3e3ccd5e1d336906e138b6bb3808c1ed9893d3115f42696ff4b021b
+SIZE (perforce/08.2_0/i386/p4web) = 2369676
diff --git a/devel/p4/distinfo.freebsd60x86_64 b/devel/p4/distinfo.freebsd60x86_64
index 142869a74df2..8a942fc3281c 100644
--- a/devel/p4/distinfo.freebsd60x86_64
+++ b/devel/p4/distinfo.freebsd60x86_64
@@ -1,15 +1,15 @@
-MD5 (perforce/07.3/amd64/p4) = 60512b2e37f7d9fab9d7c16dae853f79
-SHA256 (perforce/07.3/amd64/p4) = b7e670119dcb59f77685c90680575385c1c6ef4e08a4998c7308582adeeeb15a
-SIZE (perforce/07.3/amd64/p4) = 587112
-MD5 (perforce/07.3/amd64/p4d) = 4223da0eb4bc03f5984f5420d92a770c
-SHA256 (perforce/07.3/amd64/p4d) = 8a66df1d7dc8f488abdbaae79aa1b1b5bd6ac76fc25511c6d0c21f6259b0d332
-SIZE (perforce/07.3/amd64/p4d) = 1685024
-MD5 (perforce/07.3/amd64/p4ftpd) = d9c8a371a074cb111d9ac6a5b8bf8d4c
-SHA256 (perforce/07.3/amd64/p4ftpd) = e8566db11a5dcc879d425afc43fc4be222be0556a4f4433e353afa791688b69b
-SIZE (perforce/07.3/amd64/p4ftpd) = 873601
-MD5 (perforce/07.3/amd64/p4p) = 051620326a4130c12f7c1a83fc39c7b7
-SHA256 (perforce/07.3/amd64/p4p) = 6b8995d695531eee605fb570947c07f22d8037b5baae60ba25b9480253e52ac2
-SIZE (perforce/07.3/amd64/p4p) = 577632
-MD5 (perforce/07.3/amd64/p4web) = 34c80e3ec0da3f5765efc1d0c0ee706e
-SHA256 (perforce/07.3/amd64/p4web) = 2c9762cef39b4fd547c9dde3bf0e7006252db1eaef0f07ef752b55b2975ecc67
-SIZE (perforce/07.3/amd64/p4web) = 2220526
+MD5 (perforce/08.2_0/amd64/p4) = 45c8eac9d77e42472e90c16fb92bb99e
+SHA256 (perforce/08.2_0/amd64/p4) = 56dc914822f322c7d0a4345b82ab804a509e277b04ba3dbdd45ddab8ff3329c6
+SIZE (perforce/08.2_0/amd64/p4) = 614904
+MD5 (perforce/08.2_0/amd64/p4d) = 9a1998f6a303d1b9e3a94853f8647c43
+SHA256 (perforce/08.2_0/amd64/p4d) = 070c87aeefe5568944c14a98e952a9b33087172f3f8812c30e96642b880a1e0e
+SIZE (perforce/08.2_0/amd64/p4d) = 1758504
+MD5 (perforce/08.2_0/amd64/p4ftpd) = c7ff40b791af8cd56241209e845843c8
+SHA256 (perforce/08.2_0/amd64/p4ftpd) = f4bb286352b28f2acc9aea2d156cf5bbbc006cc4fc6c6269ce3753b95eac80f4
+SIZE (perforce/08.2_0/amd64/p4ftpd) = 752672
+MD5 (perforce/08.2_0/amd64/p4p) = 4375378956b424b9a132844b2e938682
+SHA256 (perforce/08.2_0/amd64/p4p) = d95faabf9e93916648d0556df7bec20022c4e40b13ff285ed12a347ec521fabc
+SIZE (perforce/08.2_0/amd64/p4p) = 602816
+MD5 (perforce/08.2_0/amd64/p4web) = 3cd2c23e4d15066b91cc90c81ac68f9e
+SHA256 (perforce/08.2_0/amd64/p4web) = e1d87fa0c2d3f3b05cb7727ad32d018be5ad5dfad5a983bc1b183c844ee31649
+SIZE (perforce/08.2_0/amd64/p4web) = 2435976
diff --git a/devel/p4/distinfo.freebsd61sparc64 b/devel/p4/distinfo.freebsd61sparc64
index 235a8a801ffa..23a113ff9485 100644
--- a/devel/p4/distinfo.freebsd61sparc64
+++ b/devel/p4/distinfo.freebsd61sparc64
@@ -1,15 +1,15 @@
-MD5 (perforce/07.3/sparc64/p4) = d771d3a59514821f64fe3354ebcf85b3
-SHA256 (perforce/07.3/sparc64/p4) = a692f53cc6b73a53b66a1b97fcbf84eff740f4f0bb65fa30f4f76de568f9ad28
-SIZE (perforce/07.3/sparc64/p4) = 596608
-MD5 (perforce/07.3/sparc64/p4d) = 36361e19fac8a7a46f3641e38e73e627
-SHA256 (perforce/07.3/sparc64/p4d) = 731df4345ebcaa0772a9b780e7008737e662b9096df1a164e6c0e37f2aae2d77
-SIZE (perforce/07.3/sparc64/p4d) = 1700144
-MD5 (perforce/07.3/sparc64/p4ftpd) = f05332cb6a97c780f5fe44091beb5eed
-SHA256 (perforce/07.3/sparc64/p4ftpd) = 7eb10a2dafdc20ab897ab299203a96dbbee04105d36d9071d8d79af407fabf55
-SIZE (perforce/07.3/sparc64/p4ftpd) = 1005411
-MD5 (perforce/07.3/sparc64/p4p) = d3873efb2c4429aa3a148f2d31686b9c
-SHA256 (perforce/07.3/sparc64/p4p) = 8d16eef2c6ce1809c9f805816b2dd801d306dcf267ef9538c6d0dccdb4d07432
-SIZE (perforce/07.3/sparc64/p4p) = 587024
-MD5 (perforce/07.3/sparc64/p4web) = 29863f30c09b77f49a01ad06d5a3679c
-SHA256 (perforce/07.3/sparc64/p4web) = 1e18fab94e68db1a55585642c2c6e342a765d2863e2d7394c3da8c0b400b21db
-SIZE (perforce/07.3/sparc64/p4web) = 2497805
+MD5 (perforce/08.2_0/sparc64/p4) = 5c7575b3df6014d34d6e843b819c7212
+SHA256 (perforce/08.2_0/sparc64/p4) = bb006427937c1e53f8893f4c8f4d96104a2156f18dcd6e462e50902b4cfe1335
+SIZE (perforce/08.2_0/sparc64/p4) = 624968
+MD5 (perforce/08.2_0/sparc64/p4d) = 9a058d9b5fd08531037317ddcba3c85c
+SHA256 (perforce/08.2_0/sparc64/p4d) = 21294d466ac7ddd3a14c1341a8a296d2205aaf643ac97659455b2f64b09f612b
+SIZE (perforce/08.2_0/sparc64/p4d) = 1777848
+MD5 (perforce/08.2_0/sparc64/p4ftpd) = 3b782d44f37504f0a6d140f4296005a9
+SHA256 (perforce/08.2_0/sparc64/p4ftpd) = 3f8d2ee84b04d0208e4a63863251755f9640e7beda94e0a45e06a5b7ba4c537c
+SIZE (perforce/08.2_0/sparc64/p4ftpd) = 896896
+MD5 (perforce/08.2_0/sparc64/p4p) = ba53e566890df5e43dd462aaedaba11e
+SHA256 (perforce/08.2_0/sparc64/p4p) = 170ccd9ad6e0d0704ef49344b7148c273b56add8da67b472a6c929f89be9e273
+SIZE (perforce/08.2_0/sparc64/p4p) = 608368
+MD5 (perforce/08.2_0/sparc64/p4web) = ff01929ee48184d5776ac07368faa7b5
+SHA256 (perforce/08.2_0/sparc64/p4web) = ff9bc56a862c4b4c88dbe040ea0dc0ca192463a4b61789df71ef7069b9824139
+SIZE (perforce/08.2_0/sparc64/p4web) = 2732832
diff --git a/devel/p4/distinfo.freebsdaxp b/devel/p4/distinfo.freebsdaxp
deleted file mode 100644
index c770a1d264b8..000000000000
--- a/devel/p4/distinfo.freebsdaxp
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
-SHA256 (perforce/99.1/alpha/p4) = 2b9b6c9f161c9f468c079f297058bbb514b48a410907e65a86360f671c4571d0
-SIZE (perforce/99.1/alpha/p4) = 201424
-MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
-SHA256 (perforce/99.1/alpha/p4d) = 6d688c995df2c0bd4355ff19158b03931483694ed9fc67055e31eb2c53593841
-SIZE (perforce/99.1/alpha/p4d) = 945544
diff --git a/devel/p4/files/perforce.sh.in b/devel/p4/files/perforce.sh.in
index 2ebc5809fa48..0567a4823bad 100644
--- a/devel/p4/files/perforce.sh.in
+++ b/devel/p4/files/perforce.sh.in
@@ -12,6 +12,7 @@ start)
     [ -f @PREFIX@/etc/perforce.conf ] && . @PREFIX@/etc/perforce.conf
     if [ -x $p4d -a x$PERFORCE_START = xyes ]; then
 	echo -n ' p4d'
+	umask 027
 	su -fm $PERFORCE_USER -c "$p4d -r $PERFORCE_ROOT $PERFORCE_OPTIONS"
     fi
     if [ -x $p4ftpd -a x$PERFORCE_FTPD_START = xyes ]; then
diff --git a/devel/p4/pkg-install b/devel/p4/pkg-install
index 88b4d17472f4..d1f6a568f39b 100644
--- a/devel/p4/pkg-install
+++ b/devel/p4/pkg-install
@@ -9,7 +9,7 @@ PERFORCE_UID=${PERFORCE_UID:-94}
 PERFORCE_GROUP=${PERFORCE_GROUP:-p4admin}
 PERFORCE_GID=${PERFORCE_GID:-94}
 PERFORCE_HOME=${PERFORCE_HOME:-$PKG_PREFIX/perforce}
-PERFORCE_LOGDIR=${PERFORCE_LOGDIR:-$PERFORCE_HOME/log}
+PERFORCE_LOGS=${PERFORCE_LOGS:-$PERFORCE_HOME/log}
 PERFORCE_ROOT=${PERFORCE_ROOT:-$PERFORCE_HOME/root}
 
 case $2 in
@@ -46,6 +46,7 @@ PRE-INSTALL)
 	if [ ! -d $PERFORCE_HOME ] ; then 
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
+		chmod 750 $PERFORCE_ROOT
 	fi
 	;;
 esac