- Update to 8.9.1

- Remove all security warning

While I'm here:
- use PORTSDOCS, ${DOCSDIR}
- kill pkg-plist

PR:             62924
Submitted by:   NAKAMURA Takeshi <1yen@sh.rim.or.jp>

4 files changed, 11 insertions, 50 deletions

diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 5febc9223fcd..4bfdb987275e 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	delegate
-PORTVERSION=	8.7.8
+PORTVERSION=	8.9.1
 CATEGORIES=	net www
 MASTER_SITES=	ftp://www.delegate.org/pub/DeleGate/ \
 		ftp://ftp.delegate.org/pub/DeleGate/
@@ -15,43 +15,19 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose TCP/IP proxy system
 
-NO_PACKAGE=	"Insecure program."
+USE_BZIP2=      yes
 IS_INTERACTIVE=	YES
-
-pre-everything::
-.if !defined(FORCE_BUILD) || ${FORCE_BUILD}!="YES"
-	@${ECHO_MSG} "*********************************************************************"
-	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO_MSG} "* This program has known security problems which may allow a remote *"
-	@${ECHO_MSG} "* attacker to take control of your machine.                         *"
-	@${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO_MSG} "*                                                                   *"
-	@${ECHO_MSG} "* It is strongly recommended that you avoid using this program.     *"
-	@${ECHO_MSG} "*                                                                   *"
-	@${ECHO_MSG} "* If you would like to use this program despite the danger, run     *"
-	@${ECHO_MSG} "* make with \`\`FORCE_BUILD=YES''                                     *"
-	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO_MSG} "*********************************************************************"
-	@${FALSE}
-.else
-	@${ECHO_MSG} "*********************************************************************"
-	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO_MSG} "* You have chosen to build an insecure program.                     *"
-	@${ECHO_MSG} "* This program has known security problems which may allow a remote *"
-	@${ECHO_MSG} "* attacker to take control of your machine.                         *"
-	@${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO_MSG} "*********************************************************************"
-.endif
+PORTDOCS=	Manual.htm tutor-jp.htm tutor-en.htm
+PLIST_FILES=	sbin/delegated etc/rc.d/delegated.sh-dist
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
-	@${MKDIR} ${PREFIX}/share/examples/delegate
-	${INSTALL_DATA} ${FILESDIR}/delegated.sh \
-	   ${PREFIX}/share/examples/delegate
+	${INSTALL_SCRIPT} ${FILESDIR}/delegated.sh \
+	   ${PREFIX}/etc/rc.d/delegated.sh-dist 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/delegate
-.for f in Manual.htm tutor-jp.htm tutor-en.htm
-	${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/delegate
+	@${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/$f ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/delegate/distinfo b/net/delegate/distinfo
index 26952d56ae15..51955b8a0719 100644
--- a/net/delegate/distinfo
+++ b/net/delegate/distinfo
@@ -1 +1,2 @@
-MD5 (delegate8.7.8.tar.gz) = a151b22ed1b59b3fff197055b90f0d2d
+MD5 (delegate8.9.1.tar.bz2) = 1ea9c8cc6e6ca23affded6968017c48b
+SIZE (delegate8.9.1.tar.bz2) = 961779
diff --git a/net/delegate/pkg-message b/net/delegate/pkg-message
index 77c73d35398a..45e96402731b 100644
--- a/net/delegate/pkg-message
+++ b/net/delegate/pkg-message
@@ -1,12 +1,3 @@
-*********************************************************************
-*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *
-* You have installed an insecure program.                           *
-* This program has known security problems which may allow a remote  *
-* attacker to take control of your machine.                         *
-* Use with great caution!                                           *
-* See FreeBSD security advisory 00:04 for more information.         *
-*********************************************************************
-
 ----------------------------------------------------------------------
 Now, edit the sample script in /usr/local/share/examples/delegate directory
 and copy it into /usr/local/etc/rc.d.
diff --git a/net/delegate/pkg-plist b/net/delegate/pkg-plist
deleted file mode 100644
index cadd81d40ab0..000000000000
--- a/net/delegate/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-sbin/delegated
-share/examples/delegate/delegated.sh
-%%PORTDOCS%%share/doc/delegate/Manual.htm
-%%PORTDOCS%%share/doc/delegate/tutor-jp.htm
-%%PORTDOCS%%share/doc/delegate/tutor-en.htm
-%%PORTDOCS%%@dirrm share/doc/delegate
-@dirrm share/examples/delegate