diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2009-07-15 05:33:14 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2009-07-15 05:33:14 +0000 |
| commit | e121f077277527c9a6e98254b47f3d97e3b7c51d (patch) | |
| tree | 5c38b9cf1a526b703a0e03ca204c1be0abdabbef /mail | |
| parent | - USE_RC_SUBR !=yes (diff) | |
- USE_RC_SUBR != yes
- Use SUB_FILES correctly
- portlint
Notes
Notes:
svn path=/head/; revision=237851
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/nullmailer/Makefile | 24 | ||||
| -rw-r--r-- | mail/nullmailer/files/nullmailer.in (renamed from mail/nullmailer/files/nullmail.sh) | 0 | ||||
| -rw-r--r-- | mail/nullmailer/files/pkg-install.in (renamed from mail/nullmailer/files/pkg-install.proto) | 0 | ||||
| -rw-r--r-- | mail/nullmailer/files/pkg-message.in (renamed from mail/nullmailer/files/pkg-message.proto) | 0 | ||||
| -rw-r--r-- | mail/nullmailer/pkg-plist | 1 |
5 files changed, 9 insertions, 16 deletions
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index c49ba21e1fce..e3b33c30d244 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -6,8 +6,9 @@ # PORTNAME= nullmailer -PORTEPOCH= 1 PORTVERSION= 1.03 +PORTREVISION= 1 +PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ http://untroubled.org/nullmailer/archive/ @@ -20,25 +21,20 @@ HAS_CONFIGURE= yes USE_SUBMAKE= yes -MAN1= nullmailer-inject.1 sendmail.1 -MAN7= nullmailer.7 -MAN8= nullmailer-queue.8 nullmailer-send.8 - -USE_RC_SUBR= yes +USE_RC_SUBR= ${PORTNAME} +SUB_FILES+= pkg-install pkg-message +PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB= LOCALSTATEDIR=${LOCALSTATEDIR} LOCALSTATEDIR= /var/spool CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} -PLIST_SUB= LOCALSTATEDIR=${LOCALSTATEDIR} -PKGINSTALL= ${WRKDIR}/pkg-install - -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -post-extract: - @${CAT} ${FILESDIR}/pkg-install.proto | ${SED} -e 's,%%LOCALSTATEDIR%%,${LOCALSTATEDIR},g' > ${WRKDIR}/pkg-install - @${CAT} ${FILESDIR}/pkg-message.proto | ${SED} -e 's,%%PREFIX%%,${PREFIX},' > ${PKGMESSAGE} +MAN1= nullmailer-inject.1 sendmail.1 +MAN7= nullmailer.7 +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 @@ -47,8 +43,6 @@ pre-install: post-install: @cd ${WRKSRC} && make install-root - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/nullmail.sh > ${WRKDIR}/nullmail.sh - @${INSTALL_SCRIPT} -c ${WRKDIR}/nullmail.sh ${PREFIX}/etc/rc.d/ @${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${PREFIX}/etc/nullmailer/ @BATCH="${BATCH}" NMH_PREFIX="${NMH_PREFIX}" PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} diff --git a/mail/nullmailer/files/nullmail.sh b/mail/nullmailer/files/nullmailer.in index 6f3650990a89..6f3650990a89 100644 --- a/mail/nullmailer/files/nullmail.sh +++ b/mail/nullmailer/files/nullmailer.in diff --git a/mail/nullmailer/files/pkg-install.proto b/mail/nullmailer/files/pkg-install.in index bee52a796ffd..bee52a796ffd 100644 --- a/mail/nullmailer/files/pkg-install.proto +++ b/mail/nullmailer/files/pkg-install.in diff --git a/mail/nullmailer/files/pkg-message.proto b/mail/nullmailer/files/pkg-message.in index 6c908ad188d5..6c908ad188d5 100644 --- a/mail/nullmailer/files/pkg-message.proto +++ b/mail/nullmailer/files/pkg-message.in diff --git a/mail/nullmailer/pkg-plist b/mail/nullmailer/pkg-plist index 7198ee0fc2f4..8dd31196b2b1 100644 --- a/mail/nullmailer/pkg-plist +++ b/mail/nullmailer/pkg-plist @@ -7,7 +7,6 @@ sbin/nullmailer-queue sbin/nullmailer-send etc/nullmailer/me.sample etc/nullmailer/remotes.sample -etc/rc.d/nullmail.sh @exec mkdir -p %%LOCALSTATEDIR%%/nullmailer/queue @exec chmod 700 %%LOCALSTATEDIR%%/nullmailer/queue @exec mkdir -p %%LOCALSTATEDIR%%/nullmailer/tmp |