diff options
author | bapt <bapt@FreeBSD.org> | 2011-06-09 01:08:47 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2011-06-09 01:08:47 +0800 |
commit | eb8361029d63651f70642a7b65e0a805c1be3443 (patch) | |
tree | 0965ff8fe59c6d43272269a0122e516b067b2298 /irc | |
parent | ffabf7de7e620d29e2ce91a0f991683d55a4a507 (diff) | |
download | freebsd-ports-gnome-eb8361029d63651f70642a7b65e0a805c1be3443.tar.gz freebsd-ports-gnome-eb8361029d63651f70642a7b65e0a805c1be3443.tar.zst freebsd-ports-gnome-eb8361029d63651f70642a7b65e0a805c1be3443.zip |
- switch to USERS/GROUPS macro
- bump portrevision
Diffstat (limited to 'irc')
-rw-r--r-- | irc/bopm/Makefile | 12 | ||||
-rw-r--r-- | irc/bopm/files/pkg-install.in | 48 |
2 files changed, 6 insertions, 54 deletions
diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile index d91eb9020de7..46b477730217 100644 --- a/irc/bopm/Makefile +++ b/irc/bopm/Makefile @@ -7,6 +7,7 @@ PORTNAME= bopm PORTVERSION= 3.1.3 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://static.blitzed.org/www.blitzed.org/bopm/files/ \ ftp://rusunix.org/pub/FreeBSD/distfiles/ @@ -23,12 +24,12 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --localstatedir=${LOGDIR} USE_LDCONFIG= yes USE_RC_SUBR= bopm -SUB_FILES= pkg-message pkg-install pkg-deinstall +SUB_FILES= pkg-message pkg-deinstall PLIST_SUB= LOGDIR=${LOGDIR} SUB_LIST= LOGDIR=${LOGDIR} -pre-su-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +USERS= bopm +GROUPS= bopm post-patch: @${REINPLACE_CMD} \ @@ -41,10 +42,9 @@ post-patch: ${WRKSRC}/bopm.conf.sample post-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CHOWN} bopm:bopm ${LOGDIR} + @${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} @${CHMOD} 750 ${LOGDIR} - @${CHOWN} bopm:bopm ${PREFIX}/etc/bopm.conf.sample + @${CHOWN} ${USERS}:${GROUPS} ${PREFIX}/etc/bopm.conf.sample @${CHMOD} 640 ${PREFIX}/etc/bopm.conf.sample @${CAT} ${PKGMESSAGE} diff --git a/irc/bopm/files/pkg-install.in b/irc/bopm/files/pkg-install.in deleted file mode 100644 index 10a5a457acaa..000000000000 --- a/irc/bopm/files/pkg-install.in +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# This script is a modified copy of the pkg-install script -# from the ircd-hybrid-ru port. - -PATH=/bin:/usr/bin:/usr/sbin - -#----------------------------------------------------------------------- -if [ "x$2" = "xPRE-INSTALL" ]; then -#----------------------------------------------------------------------- - -USER=bopm -GROUP=${USER} -UID=717 -GID=${UID} -SHELL=/bin/sh -HOMEDIR=/nonexistent -GECOS="Blitzed Open Proxy Monitor" - -if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." -else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." -else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d ${HOMEDIR} -s ${SHELL} -c "${GECOS}" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi - -#----------------------------------------------------------------------- -fi -#----------------------------------------------------------------------- - -exit 0 |