upgrade to 0.4.25p3

5 files changed, 69 insertions, 24 deletions

diff --git a/games/bnetd/Makefile b/games/bnetd/Makefile
index a278c81e1a9a..d047ef5a1c32 100644
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
 # New ports collection makefile for:	bnetd
 # Date created:		24 April 1999
 # Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
@@ -6,30 +7,30 @@
 #
 
 PORTNAME=	bnetd
-PORTVERSION=	0.4.21
+PORTVERSION=	0.4.25p3
 CATEGORIES=	games net
-MASTER_SITES=	http://www.bnetd.org/files/
+MASTER_SITES=	ftp://ftp.bnetd.org/pub/source/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/pre/}
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-MAN1=		bnchat.1 bnetd.1 bnftp.1 bnpass.1
-MAN5=		bnetd.conf.5 bntext.5
-MLINKS=		bntext.5 bnmotd.txt.5 bntext.5 bnnews.txt.5
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-bits --sysconfdir=${PREFIX}/etc/bnetd \
+		--localstatedir=${PREFIX}/share/bnetd
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-do-configure:
-	@(cd ${WRKSRC}/src; ${SETENV} CFLAGS="${CFLAGS}" \
-	    ./configure --with-warn --with-bits --prefix=${PREFIX} ${CONFIGURE_TARGET})
-
-do-build:
-	@(cd ${WRKSRC}/src; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-
-do-install:
-	cd ${WRKSRC}/bin; ${INSTALL_PROGRAM} * ${PREFIX}/bin
-	cd ${WRKSRC}/sbin; ${INSTALL_PROGRAM} * ${PREFIX}/sbin
-	cd ${WRKSRC}/man; ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1; ${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5
-	${MKDIR} ${PREFIX}/bnetd; ${CP} -R ${WRKSRC}/files ${WRKSRC}/users ${WRKSRC}/conf ${WRKSRC}/reports ${PREFIX}/bnetd
+MAN1=	bnbot.1 bnchat.1 bnetd.1 bnftp.1 bni2tga.1 bnibuild.1 bniextract.1 \
+	bnilist.1 bnpass.1 bnproxy.1 bnstat.1 bntrackd.1 tgainfo.1
+MAN5=	bnetd.conf.5 bntext.5
+MLINKS=	bntext.5 bnmotd.txt.5 bntext.5 bnnews.txt.5 bntext.5 bnissue.5
 
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/bnetd
+	${CP} -R ${WRKSRC}/../docs/ ${PREFIX}/share/doc/bnetd
+.endif
 	@if [ ! -f ${PREFIX}/etc/rc.d/bnetd.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/bnetd.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/bnetd.sh \
diff --git a/games/bnetd/distinfo b/games/bnetd/distinfo
index 83d9f4b2b6df..c4df7d0b64b9 100644
--- a/games/bnetd/distinfo
+++ b/games/bnetd/distinfo
@@ -1 +1 @@
-MD5 (bnetd-0.4.21.tar.gz) = b8631bd7126e98fa3eb67dd102ae2eec
+MD5 (bnetd-0.4.25pre3.tar.gz) = e7333742d1de17324c20593b8f89499c
diff --git a/games/bnetd/pkg-comment b/games/bnetd/pkg-comment
index fa95815de3c2..6e65f5a962ee 100644
--- a/games/bnetd/pkg-comment
+++ b/games/bnetd/pkg-comment
@@ -1 +1 @@
-A game server for StarCraft
+A program that attempts to emulate Blizzard's Battle.net service
diff --git a/games/bnetd/pkg-descr b/games/bnetd/pkg-descr
index 6211cff3d18e..181af9bf0544 100644
--- a/games/bnetd/pkg-descr
+++ b/games/bnetd/pkg-descr
@@ -1,7 +1,13 @@
-Bnetd is a program that will eventually emulate a Blizzard Entertainment's
-Battle.net(r) server. It started on the linux platform, but has since been
-reported to work on *BSD, Solaris, AIX and HP-UX. It should compile and run
-on any standards-based *nix.
+The project is a collaboration focusing on development of the bnetd server.
+This is a program that attempts to emulate Blizzard's Battle.net service.
+
+A major part of the effort is supporting all Blizzard's Battle.net compatible
+games. The server may eventually support some non-Blizzard clients as well,
+but no work is currently being put into that. Certain software in addition to
+the bnetd server should also be considered part of the bnetd project. This
+includes BNS (BNetd Selector), bnchat (a text-based chat client), the BNI
+utilities, and bntrackd (BNetd TRACKing Daemon). The bnetd team also produces
+documentation about these programs and the Battle.net protocol. 
 
 WWW: http://www.bnetd.org/
 
diff --git a/games/bnetd/pkg-plist b/games/bnetd/pkg-plist
index c997c22c8fa8..59410d7c3626 100644
--- a/games/bnetd/pkg-plist
+++ b/games/bnetd/pkg-plist
@@ -1,9 +1,47 @@
 bin/bnbot
 bin/bnchat
 bin/bnftp
+bin/bni2tga
+bin/bnibuild
+bin/bniextract
+bin/bnilist
 bin/bnpass
 bin/bnstat
+bin/tgainfo
 sbin/bnetd
 sbin/bnproxy
+sbin/bntrackd
 etc/rc.d/bnetd.sh
-@unexec rm -rf %D/bnetd 2>/dev/null || true
+etc/bnetd/ad.list
+etc/bnetd/bnetd.conf
+etc/bnetd/bnetd_default_user
+etc/bnetd/bnmotd.txt
+etc/bnetd/bnissue.txt
+etc/bnetd/channel.list
+etc/bnetd/news.txt
+etc/bnetd/bnban
+etc/bnetd/bnhelp
+etc/bnetd/gametrans
+etc/bnetd/autoupdate
+etc/bnetd/realm.list
+share/bnetd/files/ad000001.pcx
+share/bnetd/files/icons.bni
+share/bnetd/files/tos.txt
+@dirrm etc/bnetd
+@unexec rm -rf %D/share/bnetd 2>/dev/null || true
+%%PORTDOCS%%share/doc/bnetd/CHANGES_BNIUTILS
+%%PORTDOCS%%share/doc/bnetd/CHANGE_BUCKY
+%%PORTDOCS%%share/doc/bnetd/CHANGE_VAP
+%%PORTDOCS%%share/doc/bnetd/FAQ.html
+%%PORTDOCS%%share/doc/bnetd/README.BORLAND
+%%PORTDOCS%%share/doc/bnetd/README.adbanner
+%%PORTDOCS%%share/doc/bnetd/README.bits
+%%PORTDOCS%%share/doc/bnetd/README.bni
+%%PORTDOCS%%share/doc/bnetd/README.debugging
+%%PORTDOCS%%share/doc/bnetd/README.diablo108
+%%PORTDOCS%%share/doc/bnetd/README.ladder
+%%PORTDOCS%%share/doc/bnetd/README.registry
+%%PORTDOCS%%share/doc/bnetd/TODO_BUCKY
+%%PORTDOCS%%share/doc/bnetd/TODO_VAP
+%%PORTDOCS%%share/doc/bnetd/bniheader.txt
+%%PORTDOCS%%@dirrm share/doc/bnetd