diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2009-08-11 13:53:54 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2009-08-11 13:53:54 +0000 |
| commit | 6a44a79dd3de8bbc53f48d15c89f61be82889de6 (patch) | |
| tree | 8c110afb7bdbc2c9dceccb7d5725c5461b3d2c6e /mail | |
| parent | 81f63153dae2e114b762422b8ccf8a580d456203 (diff) | |
| download | ports-6a44a79dd3de8bbc53f48d15c89f61be82889de6.tar.gz ports-6a44a79dd3de8bbc53f48d15c89f61be82889de6.zip | |
Notes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/nullmailer/Makefile | 13 | ||||
| -rw-r--r-- | mail/nullmailer/files/pkg-install.in | 6 | ||||
| -rw-r--r-- | mail/nullmailer/pkg-deinstall | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index e3b33c30d244..c9259e059ce7 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -7,14 +7,14 @@ PORTNAME= nullmailer PORTVERSION= 1.03 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ http://untroubled.org/nullmailer/archive/ MASTER_SITE_SUBDIR= ${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= glarkin@FreeBSD.org COMMENT= MTA for hosts which relay to a fixed set of smart relays HAS_CONFIGURE= yes @@ -22,11 +22,12 @@ HAS_CONFIGURE= yes USE_SUBMAKE= yes USE_RC_SUBR= ${PORTNAME} -SUB_FILES+= pkg-install pkg-message +SUB_FILES+= pkg-install pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message -PLIST_SUB= LOCALSTATEDIR=${LOCALSTATEDIR} +PLIST_SUB+= LOCALSTATEDIR=${LOCALSTATEDIR} +SUB_LIST+= LOCALSTATEDIR=${LOCALSTATEDIR} LOCALSTATEDIR= /var/spool @@ -39,12 +40,12 @@ MAN8= nullmailer-queue.8 nullmailer-send.8 # Pass BATCH to pkg-install for Evil Things(tm) # Pass LOCALSTATEDIR to pkg-install for creating home directory correctly pre-install: - @BATCH="${BATCH}" LOCALSTATEDIR="${LOCALSTATEDIR}" PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @BATCH="${BATCH}" LOCALSTATEDIR="${LOCALSTATEDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @cd ${WRKSRC} && make install-root @${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${PREFIX}/etc/nullmailer/ - @BATCH="${BATCH}" NMH_PREFIX="${NMH_PREFIX}" PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @BATCH="${BATCH}" NMH_PREFIX="${NMH_PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/nullmailer/files/pkg-install.in b/mail/nullmailer/files/pkg-install.in index bee52a796ffd..be785915b606 100644 --- a/mail/nullmailer/files/pkg-install.in +++ b/mail/nullmailer/files/pkg-install.in @@ -98,8 +98,8 @@ EOF fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/nullmailer/me.sample ]; then - echo "Creating \"${PKG_PREFIX}/etc/nullmailer/me.sample\"." - echo `/bin/hostname` > ${PKG_PREFIX}/etc/nullmailer/me.sample + if [ ! -f %%PREFIX%%/etc/nullmailer/me.sample ]; then + echo "Creating \"%%PREFIX%%/etc/nullmailer/me.sample\"." + echo `/bin/hostname` > %%PREFIX%%/etc/nullmailer/me.sample fi fi diff --git a/mail/nullmailer/pkg-deinstall b/mail/nullmailer/pkg-deinstall index d49e047ad1dc..41feaf438d14 100644 --- a/mail/nullmailer/pkg-deinstall +++ b/mail/nullmailer/pkg-deinstall @@ -57,7 +57,7 @@ if [ x"$2" = xDEINSTALL ]; then if [ ! -n "$BATCH" ]; then if /bin/ps -axc | /usr/bin/grep -q nullmailer-send; then if yesno "There are some nullmailer processes running. Shall I kill them" y; then - ${PKG_PREFIX}/etc/rc.d/nullmail.sh stop + ${PREFIX}/etc/rc.d/nullmail.sh stop sleep 2 else echo "OK ... I hope you know what you are doing." |