4 files changed, 13 insertions, 14 deletions

diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
index cd803b472c2e..efa34a227a0b 100644
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	pvpgn
-PORTVERSION=	1.7.9
+PORTVERSION=	1.8.0
 CATEGORIES=	games
-MASTER_SITES=	http://download.berlios.de/pvpgn/
+MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITE_SUBDIR=	pvpgn
 DISTFILES=	${EXTRACT_ONLY} pvpgn-support-1.0.tar.gz
 DIST_SUBDIR=	pvpgn
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -22,11 +23,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
 
-USE_RC_SUBR=	yes
 RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
-SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
+SED_SCRIPT+=	-e 's|%%RC_DIR%%|${RC_DIR}|g' \
 		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
 
 PLIST_SUB+=	RC_SUFX=${RC_SUFX}
@@ -35,7 +34,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/pvpgn \
-		--localstatedir=${DATADIR}
+		--localstatedir=${DATADIR} --with-libraries=${LOCALBASE}/lib
+
+USE_RC_SUBR=	bnetd.sh
 
 MAN1=		bnbot.1 bnchat.1 bnetd.1 bnftp.1 bni2tga.1 bnibuild.1 \
 		bniextract.1 bnilist.1 bnpass.1 bnstat.1 bntrackd.1 tgainfo.1
@@ -59,7 +60,7 @@ CONFIGURE_ARGS+=--with-pgsql
 .endif
 
 .if defined(WITH_SQLITE3)
-USE_SQLITE=	yes
+USE_SQLITE=	3
 CONFIGURE_ARGS+=--with-sqlite3
 .endif
 
@@ -80,12 +81,10 @@ post-extract:
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SUPPORT_FILES}${SUPPORT_SUFFX}
 
 post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/bnetd.sh > ${WRKSRC}/bnetd.sh
 	@${SED} "s|%%PVPGN_DIR%%|${DATADIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install
 	@${SED} "s|%%PVPGN_DIR%%|${DATADIR}|g" ${PKGDIR}/pkg-deinstall > ${WRKDIR}/pkg-deinstall
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/bnetd.sh ${PREFIX}/etc/rc.d/bnetd${RC_SUFX}
 	@${ECHO_MSG} ">>>   installing support files ..."
 .for i in IX86ver1.mpq PMACver1.mpq WAR3IX86.mpq XMACver1.mpq \
 		bnserver-D2DV.ini bnserver-D2XP.ini bnserver-WAR3.ini bnserver.ini \
diff --git a/games/pvpgn/distinfo b/games/pvpgn/distinfo
index 24bc004f7850..0b92baa99d83 100644
--- a/games/pvpgn/distinfo
+++ b/games/pvpgn/distinfo
@@ -1,6 +1,6 @@
-MD5 (pvpgn/pvpgn-1.7.9.tar.bz2) = 08d61ec6d5a791fd631af5ba8431b868
-SHA256 (pvpgn/pvpgn-1.7.9.tar.bz2) = 2e8f87391708c3233ddde3a10ebfb1d52fc96762730b0667adcb6a6bd469ae9e
-SIZE (pvpgn/pvpgn-1.7.9.tar.bz2) = 992419
+MD5 (pvpgn/pvpgn-1.8.0.tar.bz2) = 575e2ebd66a7093f76e620b5f6e27d9b
+SHA256 (pvpgn/pvpgn-1.8.0.tar.bz2) = 9eb713c8f9ccb297674ab1497f9768c1e623fccce4dbd9758b7aed2f35ffd42d
+SIZE (pvpgn/pvpgn-1.8.0.tar.bz2) = 999543
 MD5 (pvpgn/pvpgn-support-1.0.tar.gz) = 8ba36144ea3a7efe200536c142bb7886
 SHA256 (pvpgn/pvpgn-support-1.0.tar.gz) = f2f832fd6265ae20239fdaa70498ee6bf922020172f47389520e656a3babff2d
 SIZE (pvpgn/pvpgn-support-1.0.tar.gz) = 126047
diff --git a/games/pvpgn/files/bnetd.sh b/games/pvpgn/files/bnetd.sh.in
index 99d4e1d53f66..6a708286f38c 100644
--- a/games/pvpgn/files/bnetd.sh
+++ b/games/pvpgn/files/bnetd.sh.in
@@ -11,7 +11,7 @@
 #
 # Add the following lines to /etc/rc.conf to enable bnetd:
 #
-#bnetd_enable="YES"
+# bnetd_enable="YES"
 #
 # See bnetd(1) for flags
 #
diff --git a/games/pvpgn/pkg-plist b/games/pvpgn/pkg-plist
index d3e9405d1f02..12aad2f8a79e 100644
--- a/games/pvpgn/pkg-plist
+++ b/games/pvpgn/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %D/etc/rc.d/bnetd.sh stop > /dev/null 2>&1 || true
 bin/bnbot
 bin/bncdb
 bin/bnchat
@@ -42,7 +43,6 @@ etc/pvpgn/supportfile.conf-sample
 etc/pvpgn/topics.conf-sample
 etc/pvpgn/tournament.conf-sample
 etc/pvpgn/versioncheck.conf-sample
-etc/rc.d/bnetd%%RC_SUFX%%
 sbin/bnetd
 sbin/bntrackd
 %%WITH_D2%%sbin/d2cs