diff options
author | agc <agc> | 2001-12-05 16:03:56 +0000 |
---|---|---|
committer | agc <agc> | 2001-12-05 16:03:56 +0000 |
commit | 9464be437cc4cd5f4315faa4d49b20ba79eccc45 (patch) | |
tree | 76e01eccce12f6883aede366073ab45f9f09a336 | |
parent | 1478be8dd6988d5af30bc8667d4e7a74a61adc8c (diff) | |
download | pkgsrc-9464be437cc4cd5f4315faa4d49b20ba79eccc45.tar.gz |
Normalise all the uses of "wheel", and "root" for ${ROOT_GROUP}, now that
the definition is available in all the defs.${OPSYS}.mk files.
-rw-r--r-- | databases/geneweb/Makefile | 4 | ||||
-rw-r--r-- | emulators/netbsd32_compat15/Makefile | 8 | ||||
-rw-r--r-- | net/snort/Makefile | 12 | ||||
-rw-r--r-- | security/ssh/Makefile | 8 |
4 files changed, 9 insertions, 23 deletions
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index 08682f443cf..34efff4e951 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/07/15 15:34:57 wulf Exp $ +# $NetBSD: Makefile,v 1.7 2001/12/05 16:03:56 agc Exp $ # DISTNAME= geneweb-4.02 @@ -61,6 +61,6 @@ do-install: ${TOUCH} ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log ${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/passwd ${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log - ${CHOWN} -R nobody.wheel ${PREFIX}/share/geneweb + ${CHOWN} -R nobody.${ROOT_GROUP} ${PREFIX}/share/geneweb .include "../../mk/bsd.pkg.mk" diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index b538967c848..419f356bd0f 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 18:38:20 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/12/05 16:03:57 agc Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -49,18 +49,18 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR} (cd ${WRKDIR}/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \ - chown root:wheel ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \ + chown ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \ chmod 555 ${PREFIX}/${COMPAT_LIBDIR}/lib*.so* ) if [ -d ${WRKDIR}/X11R6/lib ]; then \ ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \ (cd ${WRKDIR}/X11R6/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \ - chown root:wheel ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \ + chown ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \ chmod 555 ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so* ) \ fi if [ -d ${WRKDIR}/libexec ]; then \ ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBEXECDIR}; \ (cd ${WRKDIR}/libexec; pax -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \ - chown root:wheel ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \ + chown ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \ chmod 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \ fi diff --git a/net/snort/Makefile b/net/snort/Makefile index ccef51e7eff..14f042443b9 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/12/02 14:43:49 kleink Exp $ +# $NetBSD: Makefile,v 1.15 2001/12/05 16:03:57 agc Exp $ # DISTNAME= snort-1.8.3 @@ -19,18 +19,10 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-libpcap-includes=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --with-libpcap-libraries=${BUILDLINK_DIR}/lib -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" -ROOTGROUP= root -.endif - -ROOTGROUP?= wheel - #WRKSRC= ${WRKDIR}/snort post-install: - ${INSTALL_DATA_DIR} -m 700 -o root -g ${ROOTGROUP} /var/log/snort + ${INSTALL_DATA_DIR} -m 700 -o ${ROOT_USER} -g ${ROOT_GROUP} /var/log/snort ${INSTALL_DATA_DIR} ${PREFIX}/share/snort cd ${WRKSRC} ; \ for i in snort.conf *.config *.rules ; do \ diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 2aff305b65b..e8460587a3a 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2001/11/29 01:12:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.95 2001/12/05 16:03:57 agc Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -143,12 +143,6 @@ CONFIGURE_ARGS+= --disable-asm CFLAGS+= -m68060 .endif -.if ${OPSYS} == "SunOS" -ROOT_GROUP?= root -.else -ROOT_GROUP?= wheel -.endif - DEINSTALL_FILE= ${WRKDIR}/DEINSTALL PLIST_SRC= ${WRKDIR}/PLIST PLIST_SUBST+= INSTALL="${INSTALL}" \ |