aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-08-29 23:10:43 +0800
committervs <vs@FreeBSD.org>2005-08-29 23:10:43 +0800
commit015f9783c8e04094fbfd0544e544aedb54b36f86 (patch)
treeddac8e4052a0b1a05fd30fa5c8ce6708df2e8a2d
parent187fb36edc2a4440f3ae45b9e5562abb67c370f0 (diff)
downloadfreebsd-ports-gnome-015f9783c8e04094fbfd0544e544aedb54b36f86.tar.gz
freebsd-ports-gnome-015f9783c8e04094fbfd0544e544aedb54b36f86.tar.zst
freebsd-ports-gnome-015f9783c8e04094fbfd0544e544aedb54b36f86.zip
Correctly record user- and group-id in pkg-install used during package-build
PR: ports/85047 Submitted by: Vladimir Kotal
-rw-r--r--net-mgmt/cricket/Makefile10
-rw-r--r--net-mgmt/cricket/files/pkg-install.in (renamed from net-mgmt/cricket/pkg-install)7
2 files changed, 10 insertions, 7 deletions
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 7dfbef6233af..d9e05e1378d8 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cricket
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -29,13 +29,13 @@ HAS_CONFIGURE= yes
USE_PERL5= yes
NO_BUILD= yes
PLIST_SUB+= VERSION=${PORTVERSION}
-SUB_FILES= pkg-message
+SUB_FILES= pkg-message pkg-install
+SUB_LIST= USER="${CRICKET_USER}" GROUP="${CRICKET_GROUP}" UID="${CRICKET_UID}" GID="${CRICKET_GID}"
CRICKET_USER?= wwwadm
CRICKET_UID?= 81
CRICKET_GROUP?= www
CRICKET_GID?= 80
USE_REINPLACE= yes
-PKGMESSAGE= ${WRKDIR}/pkg-message
post-patch:
@${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \
@@ -44,9 +44,7 @@ post-patch:
${WRKSRC}/sample-config/news-server/Defaults
do-install:
- @PREFIX="${PREFIX}" USER="${CRICKET_USER}" GROUP="${CRICKET_GROUP}" \
- UID="${CRICKET_UID}" GID="${CRICKET_GID}" ${SH} \
- ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+ @PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@${MKDIR} -m 755 ${PREFIX}/cricket/cricket-${PORTVERSION}
@${CP} -R ${WRKSRC}/* ${PREFIX}/cricket/cricket-${PORTVERSION}
@${FIND} ${PREFIX}/cricket/cricket-${PORTVERSION} -name \*.orig -or \
diff --git a/net-mgmt/cricket/pkg-install b/net-mgmt/cricket/files/pkg-install.in
index 2dcfb0ade92d..871a2dbc437a 100644
--- a/net-mgmt/cricket/pkg-install
+++ b/net-mgmt/cricket/files/pkg-install.in
@@ -1,7 +1,12 @@
#!/bin/sh
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/cricket/files/Attic/pkg-install.in,v 1.1 2005-08-29 15:10:43 vs Exp $
#
+GROUP=%%GROUP%%
+USER=%%USER%%
+UID=%%UID%%
+GID=%%GID%%
+
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi