- Update to 1.10.

PR:		ports/174173
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 22 insertions, 23 deletions

diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index c5dca31fd89e..fd0e55b8c90d 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	proxsmtp
-PORTVERSION=	1.8
+PORTVERSION=	1.10
 CATEGORIES=	mail security
-MASTER_SITES=	http://memberwebs.com/stef/software/proxsmtp/
+MASTER_SITES=	http://thewalter.net/stef/software/proxsmtp/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A flexible SMTP filter which can act also as transparent proxy
+COMMENT=	Flexible SMTP filter which can act also as transparent proxy
+
+LICENSE=	BSD
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+MAKE_JOBS_SAFE=	yes
 
 USE_RC_SUBR=	proxsmtpd
 SUB_FILES=	pkg-message
@@ -21,14 +23,22 @@ MAN8=		proxsmtpd.8
 
 PORTDOCS=	ChangeLog NEWS README
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^acx_pthread_flags/s|=.*|="${PTHREAD_LIBS}"|' \
+		${WRKSRC}/configure
+
 post-install:
-	@${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
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} proxsmtpd.conf \
+		${PREFIX}/etc/proxsmtpd.conf-sample)
+.if !exists(${PREFIX}/etc/proxsmtpd.conf)
+	(cd ${PREFIX}/etc && ${CP} -p proxsmtpd.conf-sample \
+		${PREFIX}/etc/proxsmtpd.conf)
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for docs in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR})
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/proxsmtp/distinfo b/mail/proxsmtp/distinfo
index 1b3fea73b4a8..4beb2dfaf8fb 100644
--- a/mail/proxsmtp/distinfo
+++ b/mail/proxsmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (proxsmtp-1.8.tar.gz) = b6704790a5a4c0e5a53901baae7a8e894b22db48c016c628501b0559c53eb4b1
-SIZE (proxsmtp-1.8.tar.gz) = 202233
+SHA256 (proxsmtp-1.10.tar.gz) = 33b13cb4cbbebd784768893404c992d6cc2e8d057c27c012e3a69f24ac60c4b5
+SIZE (proxsmtp-1.10.tar.gz) = 181262
diff --git a/mail/proxsmtp/files/patch-configure b/mail/proxsmtp/files/patch-configure
deleted file mode 100644
index 5d025d1c5658..000000000000
--- a/mail/proxsmtp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Apr 15 07:18:10 2005
-+++ configure	Wed Apr 20 15:45:54 2005
-@@ -3156,7 +3156,7 @@
- # which indicates that we try without any flags at all, and "pthread-config"
- # which is a program returning the flags for the Pth emulation library.
- 
--acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+acx_pthread_flags="pthreads none -Kthread -kthread %%PTHREAD_LIBS%% -pthreads lthread -mthreads pthread --thread-safe -mt pthread-config"
- 
- # The ordering *is* (sometimes) important.  Some notes on the
- # individual items follow:
diff --git a/mail/proxsmtp/pkg-descr b/mail/proxsmtp/pkg-descr
index 8a7446cb999a..f0588cdf3b98 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/stef/software/proxsmtp/
+WWW:	http://thewalter.net/stef/software/proxsmtp/