svn commit: r398649 - in head/mail/dk-milter: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Oct  5 14:06:46 2015
New Revision: 398649
URL: https://svnweb.freebsd.org/changeset/ports/398649

Log:
  - Fix manpage handling
  - Fix installation from non-root
  
  Approved by:	portmgr blanket

Added:
  head/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4   (contents, props changed)
Modified:
  head/mail/dk-milter/Makefile
  head/mail/dk-milter/pkg-plist

Modified: head/mail/dk-milter/Makefile
==============================================================================
--- head/mail/dk-milter/Makefile	Mon Oct  5 13:19:44 2015	(r398648)
+++ head/mail/dk-milter/Makefile	Mon Oct  5 14:06:46 2015	(r398649)
@@ -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/postf
 .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/

Added: head/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/dk-milter/files/patch-devtools_M4_UNIX_executable.m4	Mon Oct  5 14:06:46 2015	(r398649)
@@ -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

Modified: head/mail/dk-milter/pkg-plist
==============================================================================
--- head/mail/dk-milter/pkg-plist	Mon Oct  5 13:19:44 2015	(r398648)
+++ head/mail/dk-milter/pkg-plist	Mon Oct  5 14:06:46 2015	(r398649)
@@ -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%%