diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-05 14:06:46 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-05 14:06:46 +0000 |
| commit | 4136c5b3ee388d5b4a3caae28f9c2f53a3097f2c (patch) | |
| tree | 525d4c05e5d91e155ca1b789a76c9d9a83830697 /mail/dk-milter | |
| parent | d33a1b4d3b4b37510e2c6a73639ea55b2f0f3a8c (diff) | |
| download | ports-4136c5b3ee388d5b4a3caae28f9c2f53a3097f2c.tar.gz ports-4136c5b3ee388d5b4a3caae28f9c2f53a3097f2c.zip | |
- Fix manpage handling
- Fix installation from non-root
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=398649
Diffstat (limited to 'mail/dk-milter')
| -rw-r--r-- | mail/dk-milter/Makefile | 5 | ||||
| -rw-r--r-- | mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4 | 11 | ||||
| -rw-r--r-- | mail/dk-milter/pkg-plist | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 1db21a2ad5f8..cf04cd3a5296 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -3,7 +3,7 @@ PORTNAME= dk-milter PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION} @@ -32,7 +32,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix .endif WCONF= ${WRKSRC}/devtools/Site -MAN8= dk-filter.8 DOCSFILES= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \ rfc4870.txt dk-filter/autorespond.csh @@ -107,7 +106,7 @@ post-install: .endif ${INSTALL_SCRIPT} ${WRKSRC}/dk-filter/gentxt.csh \ ${STAGEDIR}${PREFIX}/sbin/gentxt-dk -.for i in ${MAN8} +.for i in dk-filter.8 @${RM} -f ${STAGEDIR}${PREFIX}/man/cat8/${i} \ ${STAGEDIR}${PREFIX}/man/cat8/${i}.gz ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/ diff --git a/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4 b/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4 new file mode 100644 index 000000000000..0e58236e7182 --- /dev/null +++ b/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4 @@ -0,0 +1,11 @@ +--- devtools/M4/UNIX/executable.m4.orig 2006-10-06 05:44:44 UTC ++++ devtools/M4/UNIX/executable.m4 +@@ -31,7 +31,7 @@ ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE + ifdef(`bldNO_INSTALL', , + `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP') + ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ') +- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ++ ${INSTALL} -c -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} + ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')') + + strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT diff --git a/mail/dk-milter/pkg-plist b/mail/dk-milter/pkg-plist index 8109371e8525..547aa586a64e 100644 --- a/mail/dk-milter/pkg-plist +++ b/mail/dk-milter/pkg-plist @@ -1,4 +1,5 @@ libexec/dk-filter +man/man8/dk-filter.8.gz sbin/gentxt-dk %%PORTDOCS%%%%DOCSDIR%%/FEATURES %%PORTDOCS%%%%DOCSDIR%%/INSTALL @@ -8,4 +9,3 @@ sbin/gentxt-dk %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/autorespond.csh %%PORTDOCS%%%%DOCSDIR%%/rfc4870.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% |