diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-09-22 21:20:41 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-09-22 21:20:41 +0000 |
| commit | 8f683392346657873e2a9a07bf78b54b630586f2 (patch) | |
| tree | def757e86a9b66c8ec81c5353918460884b51d68 /mail/spmfilter | |
| parent | 53ceb07d77b2da127b8d86fad1a275d4af566b7a (diff) | |
| download | ports-8f683392346657873e2a9a07bf78b54b630586f2.tar.gz ports-8f683392346657873e2a9a07bf78b54b630586f2.zip | |
- Switch to @sample
- Drop @dirrm* from plist
- Modernize vardir handling
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=397593
Diffstat (limited to 'mail/spmfilter')
| -rw-r--r-- | mail/spmfilter/Makefile | 12 | ||||
| -rw-r--r-- | mail/spmfilter/files/pkg-install.in | 10 | ||||
| -rw-r--r-- | mail/spmfilter/pkg-plist | 8 |
3 files changed, 8 insertions, 22 deletions
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index d9d339530b1b..6e11141a74e9 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -34,13 +34,12 @@ DB4_DESC= DB4 backend # Default requirement for spmfilter rc script _REQUIRE= LOGIN -SUB_FILES= pkg-install pkg-deinstall +SUB_FILES= pkg-deinstall -SUB_LIST+= SMFUSER=${SMFUSER} \ +PLIST_SUB= LIB_VERSION=${PORTVERSION} \ + SMFUSER=${SMFUSER} \ SMFGROUP=${SMFGROUP} \ - SMFDIR=${SMFDIR} \ - -PLIST_SUB= LIB_VERSION=${PORTVERSION} + SMFDIR=${SMFDIR} .include <bsd.port.options.mk> @@ -92,6 +91,7 @@ post-patch: ${WRKSRC}/src/CMakeLists.txt post-install: - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/ + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/ + @${MKDIR} ${STAGEDIR}${SMFDIR} .include <bsd.port.mk> diff --git a/mail/spmfilter/files/pkg-install.in b/mail/spmfilter/files/pkg-install.in deleted file mode 100644 index 5b686f303637..000000000000 --- a/mail/spmfilter/files/pkg-install.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -USER=%%SMFUSER%% -GROUP=%%SMFGROUP%% -DIR=%%SMFDIR%% - -if [ "$2" = "PRE-INSTALL" ]; then - /usr/bin/install -o ${USER} -g ${GROUP} -m 755 -d ${DIR} - echo "Created \"${DIR}\" directory." -fi diff --git a/mail/spmfilter/pkg-plist b/mail/spmfilter/pkg-plist index f11b5f990871..515c646bfff9 100644 --- a/mail/spmfilter/pkg-plist +++ b/mail/spmfilter/pkg-plist @@ -28,9 +28,5 @@ libdata/pkgconfig/spmfilter.pc sbin/spmfilter man/man1/spmfilter.1.gz man/man5/spmfilter.conf.5.gz -@unexec if cmp -s %D/etc/spmfilter.conf.sample %D/etc/spmfilter.conf; then rm -f %D/etc/spmfilter.conf; fi -etc/spmfilter.conf.sample -@exec if [ ! -f %D/etc/spmfilter.conf ] ; then cp -p %D/%F %B/spmfilter.conf; fi -@dirrm include/spmfilter/smf -@dirrm include/spmfilter -@dirrmtry lib/spmfilter +@sample etc/spmfilter.conf.sample +@dir(%%SMFUSER%%,%%SMFGROUP%%,755) %%SMFDIR%% |