- Update to version 9.9.9 and point to a working master site

- Stagify, undeprecate, allow unattended (non-interactive) builds
- Install a few more documentation files; cleanup pkg-plist and
  files/pkg-message.in, trim EOL whitespace while I'm here

4 files changed, 29 insertions, 34 deletions

diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index a623ea6066f0..df7569798089 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -2,42 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	delegate
-PORTVERSION=	9.9.7
+PORTVERSION=	9.9.9
 CATEGORIES=	net www
-MASTER_SITES=	http://www.chifeng.name/dist/delegate/
+MASTER_SITES=	ftp://ftp.delegate.org/pub/DeleGate/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose TCP/IP proxy system
 
-DEPRECATED=	Unmaintained interactive port
-EXPIRATION_DATE=2014-08-20
-
-IS_INTERACTIVE=	YES
-PORTDOCS=	HowToDG.html Manual.htm jpconv.htm tutor-jp.htm tutor-en.htm COPYRIGHT
-PLIST_FILES=	sbin/delegated etc/rc.d/delegated.sh-dist
+USES=		gmake
 SUB_FILES=	pkg-message
-SUB_LIST=	DOCSDIR=${DOCSDIR}
-
-# Strip breaks binary checksumming
-STRIP=
 
-MAKE_JOBS_UNSAFE=	yes
+PLIST_FILES=	sbin/delegated etc/rc.d/delegated.sh-dist
+PORTDOCS=	CHANGES COPYRIGHT DG9note.html HowToDG.html IPv6NOTE.txt \
+		Manual.htm jpconv.htm tutor-en.htm tutor-jp.htm
 
-NO_STAGE=	yes
 post-extract:
-	@cd ${WRKSRC} && ${MV} COPYRIGHT doc/
+	@${LN} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/DG9note.html \
+		${WRKSRC}/IPv6NOTE.txt ${WRKSRC}/doc
+
+post-patch:
+# Prevent "filesystem was touched prior to 'make install' phase" warning;
+# allow unattended (non-interactive) builds
+	@${REINPLACE_CMD} -e 's,"$$(XDG)",& DGROOT=${WRKDIR},' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E '/ADMIN/s,undef,admin@example.com, ; \
+		s,-F(esign|ver),& DGROOT=${WRKDIR},' ${WRKSRC}/src/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${FILESDIR}/delegated.sh \
-	   ${PREFIX}/etc/rc.d/delegated.sh-dist
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/$f ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+		${STAGEDIR}${PREFIX}/etc/rc.d/delegated.sh-dist
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/delegate/distinfo b/net/delegate/distinfo
index d7d6ae5c1bb7..fff8d3290a5e 100644
--- a/net/delegate/distinfo
+++ b/net/delegate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (delegate9.9.7.tar.gz) = ddf9832dcb3b6ca8c930d4553eb145cc777bc184f6357184dab02d04e3e673bf
-SIZE (delegate9.9.7.tar.gz) = 2155076
+SHA256 (delegate9.9.9.tar.gz) = 4b81a1dab0179809eda78b46cf0366d49c086732f91865dea26c0cf756673d61
+SIZE (delegate9.9.9.tar.gz) = 2261381
diff --git a/net/delegate/files/pkg-message.in b/net/delegate/files/pkg-message.in
index 9cb8b5a9ff5c..3ae37ced4c9f 100644
--- a/net/delegate/files/pkg-message.in
+++ b/net/delegate/files/pkg-message.in
@@ -1,12 +1,11 @@
-
 ----------------------------------------------------------------------
-Now, edit the sample script in %%PREFIX%%/etc/rc.d/delegate.sh-dist
-directory and copy it into /usr/local/etc/rc.d.
+Now, edit the sample script in %%ETCDIR%%/rc.d/delegate.sh-dist
+directory and copy it into %%ETCDIR%%/rc.d.
 Especially, don't forget to specify correct value for the MANAGER.
 
-You can also run an interactive configuration session by executing 
+You can also run an interactive configuration session by executing
 delegated with no argument.
 
-Consult %%DOCSDIR%%/Manual.htm for configuration 
+Consult %%DOCSDIR%%/Manual.htm for configuration
 information.
 ----------------------------------------------------------------------
diff --git a/net/delegate/pkg-descr b/net/delegate/pkg-descr
index 741f0ac9c630..748cc702eb51 100644
--- a/net/delegate/pkg-descr
+++ b/net/delegate/pkg-descr
@@ -1,5 +1,5 @@
-DeleGate is a general purpose protocol proxy system for protocols
-using TCP/IP.  This software includes support for HTTP, Gopher, FTP,
-SMTP, NNTP, POP, Telnet, Wais, Whois, etc.
+DeleGate is a general purpose protocol proxy system for protocols that use
+TCP/IP.  This software includes support for HTTP, Gopher, FTP, SMTP, NNTP,
+POP, Telnet, Wais, Whois, etc.
 
 WWW: http://www.delegate.org/delegate/