- Update to 1.3

- Pass PTHREAD_{LIBS,CFLAGS} via CONFIGURE_ARGS instead of REINPLACE_CMD. configure support it.
- PORTDOCS does not need of defined(NOPORTDOCS) check
- Reorganize rc.d script

PR:		93439
Submitted by:	mnag
Approved by:	maintainer

3 files changed, 20 insertions, 22 deletions

diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index 029fb002445d..5a57fd827828 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	proxsmtp
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3
 CATEGORIES=	mail security
 MASTER_SITES=	http://memberwebs.com/nielsen/software/proxsmtp/
 
 MAINTAINER=	saturnero@gufi.org
 COMMENT=	A flexible SMTP filter which can act also as trasparent proxy
 
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+
 USE_RC_SUBR=	proxsmtpd.sh
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -23,17 +25,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MAN5=		proxsmtpd.conf.5
 MAN8=		proxsmtpd.8
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/proxsmtpd.conf ${PREFIX}/etc/proxsmtpd.conf-sample
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/proxsmtp/distinfo b/mail/proxsmtp/distinfo
index 4fffe58b3b57..020fd6b37323 100644
--- a/mail/proxsmtp/distinfo
+++ b/mail/proxsmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (proxsmtp-1.2.1.tar.gz) = 7af2d5feafb1386934d347a5f5dc827e
-SHA256 (proxsmtp-1.2.1.tar.gz) = d3511859273515aff203c0ac229b0e3027f65e6b3903a852e6c30a4a6684e6a2
-SIZE (proxsmtp-1.2.1.tar.gz) = 156525
+MD5 (proxsmtp-1.3.tar.gz) = ed488f2444f3796af44eaa92d4fa477e
+SHA256 (proxsmtp-1.3.tar.gz) = 066c206956c66926bd04aadbddabfd854c500171d33cfe50f2d961eaa56bc395
+SIZE (proxsmtp-1.3.tar.gz) = 188684
diff --git a/mail/proxsmtp/files/proxsmtpd.sh.in b/mail/proxsmtp/files/proxsmtpd.sh.in
index 378453bce74e..6ce1324a0a33 100644
--- a/mail/proxsmtp/files/proxsmtpd.sh.in
+++ b/mail/proxsmtp/files/proxsmtpd.sh.in
@@ -4,27 +4,28 @@
 #
 # PROVIDE: proxsmtpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the fellowing line to /etc/rc.conf to enable proxsmtpd:
 #
-# proxsmtpd_enable="YES"
+# proxsmtpd_enable (bool):	Set to "YES" to enable proxsmtpd.
+#				Default is "NO".
+# proxsmtpd_conf (file):	Set location of proxsmtpd.conf.
+#				Default is "%%PREFIX%%/etc/proxsmtpd.conf"
 #
 
 . %%RC_SUBR%%
 
-name=proxsmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/${name}
-sig_stop=-KILL
+name="proxsmtpd"
+rcvar=${name}_enable
 
 load_rc_config ${name}
 
-proxsmtpd_enable=${proxsmtpd_enable-"NO"}
-proxsmtpd_conf=${proxsmtpd_conf-"%%PREFIX%%/etc/proxsmtpd.conf"}
-proxsmtpd_debug=${proxsmtpd_debug-"0"}
+: ${proxsmtpd_enable="NO"}
+: ${proxsmtpd_conf="%%PREFIX%%/etc/proxsmtpd.conf"}
 
+required_files="${proxsmtpd_conf}"
+command=%%PREFIX%%/sbin/proxsmtpd
 command_args="-f ${proxsmtpd_conf}"
+sig_stop=-KILL
 
 run_rc_command "$1"