- Update to 1.7

- Add config file create

PR:		ports/114638
Submitted by:	Thomas Abthorpe <thomas@goodking.ca>
Approved by:	Dario Freni <saturnero@gufi.org> (maintainer),
		sat (mentor)

5 files changed, 15 insertions, 16 deletions

diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index e8e67b91c314..2442dd5596b4 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	proxsmtp
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	mail security
-MASTER_SITES=	http://memberwebs.com/nielsen/software/proxsmtp/
+MASTER_SITES=	http://memberwebs.com/stef/software/proxsmtp/
 
 MAINTAINER=	saturnero@gufi.org
 COMMENT=	A flexible SMTP filter which can act also as transparent proxy
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 
 USE_RC_SUBR=	proxsmtpd.sh
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN5=		proxsmtpd.conf.5
 MAN8=		proxsmtpd.8
@@ -28,10 +27,12 @@ MAN8=		proxsmtpd.8
 PORTDOCS=	*
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/proxsmtpd.conf ${PREFIX}/etc/proxsmtpd.conf-sample
+	@${INSTALL_DATA} ${WRKSRC}/doc/proxsmtpd.conf ${PREFIX}/etc/proxsmtpd.conf-sample
+	@if [ ! -f ${PREFIX}/etc/proxsmtpd.conf ]; then \
+	${CP} -p ${PREFIX}/etc/proxsmtpd.conf-sample ${PREFIX}/etc/proxsmtpd.conf ; fi
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/proxsmtp/distinfo b/mail/proxsmtp/distinfo
index 7d7de0034f67..739008828e91 100644
--- a/mail/proxsmtp/distinfo
+++ b/mail/proxsmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (proxsmtp-1.6.tar.gz) = 4ceeb55413fa3f1fae7072054a8b98dc
-SHA256 (proxsmtp-1.6.tar.gz) = 3fec4c91b2eaf9787a20dd9d2ca7441fd44320913216db3d2e1651b0805b29e0
-SIZE (proxsmtp-1.6.tar.gz) = 187180
+MD5 (proxsmtp-1.7.tar.gz) = de6ce4a743b45cf84c4dbaccda9ee147
+SHA256 (proxsmtp-1.7.tar.gz) = 53fa714c7c4a63cfeec2cd27b646f43aea58141aad2368a1063db47dadb7e1b6
+SIZE (proxsmtp-1.7.tar.gz) = 186015
diff --git a/mail/proxsmtp/files/pkg-message.in b/mail/proxsmtp/files/pkg-message.in
index 360c370288b8..1cdac12db3cf 100644
--- a/mail/proxsmtp/files/pkg-message.in
+++ b/mail/proxsmtp/files/pkg-message.in
@@ -5,10 +5,6 @@ proxsmtpd_enable="YES"
 
 to enable proxsmtpd. 
 
-Also, there is a proxsmtpd.conf-sample in %%PREFIX%%/etc/, 
-rename to proxsmtpd.conf, otherwise specify -f option to your
-config file. 
-
-To work with postfix, See also
-http://memberwebs.com/nielsen/software/proxsmtp/postfix.html
+To make it work with Postfix, see: 
+http://memberwebs.com/stef/software/proxsmtp/postfix.html
 /* ================================================================= */
diff --git a/mail/proxsmtp/pkg-descr b/mail/proxsmtp/pkg-descr
index b129758a7d7d..8a7446cb999a 100644
--- a/mail/proxsmtp/pkg-descr
+++ b/mail/proxsmtp/pkg-descr
@@ -5,4 +5,4 @@ need to be able to write the filtering scripts that integrate it with
 your particular needs.
 
 Author:	Nielsen <nielsen at memberwebs.com>
-WWW:	http://memberwebs.com/nielsen/software/proxsmtp/
+WWW:	http://memberwebs.com/stef/software/proxsmtp/
diff --git a/mail/proxsmtp/pkg-plist b/mail/proxsmtp/pkg-plist
index 4a0746965168..e78240b92a7c 100644
--- a/mail/proxsmtp/pkg-plist
+++ b/mail/proxsmtp/pkg-plist
@@ -1,4 +1,6 @@
 @comment $FreeBSD$
 @unexec [ ! -f /var/run/proxsmtpd.pid ] || %%PREFIX%%/etc/rc.d/proxsmtpd.sh stop || true
+@unexec if cmp -s %D/etc/proxsmtpd.conf-sample %D/etc/proxsmtpd.conf; then rm -f %D/etc/proxsmtpd.conf; fi
 etc/proxsmtpd.conf-sample
+@exec if [ ! -f %D/etc/proxsmtpd.conf ] ; then cp -p %D/%F %B/proxsmtpd.conf; fi
 sbin/proxsmtpd