Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2015 21:19:31 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397764 - head/mail/spamdyke
Message-ID:  <201509242119.t8OLJVGb045473@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Sep 24 21:19:31 2015
New Revision: 397764
URL: https://svnweb.freebsd.org/changeset/ports/397764

Log:
  - Switch to options helpers
  - Switch to @sample
  
  Approved by:	portmgr blanket

Modified:
  head/mail/spamdyke/Makefile
  head/mail/spamdyke/pkg-plist

Modified: head/mail/spamdyke/Makefile
==============================================================================
--- head/mail/spamdyke/Makefile	Thu Sep 24 21:19:28 2015	(r397763)
+++ head/mail/spamdyke/Makefile	Thu Sep 24 21:19:31 2015	(r397764)
@@ -3,6 +3,7 @@
 
 PORTNAME=	spamdyke
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spamdyke.org/releases/
 
@@ -33,26 +34,21 @@ TLS_USE=				OPENSSL=yes
 DEBUG_CONFIGURE_ENABLE=			debug-output
 DEBUG_EXCESSIVE_CONFIGURE_ENABLE=	excessive-output
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	Changelog.txt FAQ.html GNUGPL.txt INSTALL.txt \
 		README.html README_ip_file_format.html \
 		README_rdns_directory_format.html README_rdns_file_format.html \
 		UPGRADING.txt UPGRADING_version_3_to_version_4.txt
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/documentation/spamdyke.conf.example ${STAGEDIR}${PREFIX}/etc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#^CFLAGS :=.*#CFLAGS = ${CFLAGS}#' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spamdyke ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/documentation/spamdyke.conf.example \
+		${STAGEDIR}${PREFIX}/etc/spamdyke.conf.sample
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/spamdyke/pkg-plist
==============================================================================
--- head/mail/spamdyke/pkg-plist	Thu Sep 24 21:19:28 2015	(r397763)
+++ head/mail/spamdyke/pkg-plist	Thu Sep 24 21:19:31 2015	(r397764)
@@ -1,4 +1,2 @@
 bin/spamdyke
-@unexec if cmp -s %D/etc/spamdyke.conf.example %D/etc/spamdyke.conf; then rm -f %D/etc/spamdyke.conf; fi
-etc/spamdyke.conf.example
-@exec if [ ! -f %D/etc/spamdyke.conf ] ; then cp -p %D/%F %B/spamdyke.conf; fi
+@sample etc/spamdyke.conf.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509242119.t8OLJVGb045473>