Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Dec 2006 23:43:09 +0200
From:      "Max E. Kuznecov" <mek@mek.uz.ua>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/106791: Update port: games/pvpgn Update to 1.8.0
Message-ID:  <1166218989.96224@syhpoon-hq.ein.uz.ua>
Resent-Message-ID: <200612152150.kBFLoFXb083803@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106791
>Category:       ports
>Synopsis:       Update port: games/pvpgn Update to 1.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 15 21:50:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Max E. Kuznecov
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
None
>Environment:
System: FreeBSD syhpoon-hq.ein.uz.ua 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #1: Fri Aug 4 23:36:08 EEST 2006 syhpoon@syhpoon-hq.ein.uz.ua:/usr/src/sys/i386/compile/DOM i386


>Description:
	Update to 1.8.0
	Switch to a modern USE_RC_SUBR (moved file: files/bnetd.sh -> files/bnetd.sh.in)
>How-To-Repeat:
	--
>Fix:

--- pvpgn-1.7.9-1.8.0.patch begins here ---
diff -ruN pvpgn.old/Makefile pvpgn/Makefile
--- pvpgn.old/Makefile	Tue Nov  7 23:53:31 2006
+++ pvpgn/Makefile	Fri Dec 15 22:59:06 2006
@@ -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_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 @@
 
 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 @@
 .endif
 
 .if defined(WITH_SQLITE3)
-USE_SQLITE=	yes
+USE_SQLITE=	3
 CONFIGURE_ARGS+=--with-sqlite3
 .endif
 
@@ -80,12 +81,10 @@
 	@${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 -ruN pvpgn.old/distinfo pvpgn/distinfo
--- pvpgn.old/distinfo	Tue Nov  7 23:53:31 2006
+++ pvpgn/distinfo	Fri Nov 24 23:52:57 2006
@@ -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 -ruN pvpgn.old/files/bnetd.sh pvpgn/files/bnetd.sh
--- pvpgn.old/files/bnetd.sh	Tue Nov  7 23:53:31 2006
+++ pvpgn/files/bnetd.sh	Thu Jan  1 03:00:00 1970
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/games/pvpgn/files/bnetd.sh,v 1.2 2006/02/20 20:47:02 dougb Exp $
-#
-
-# PROVIDE: bnetd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable bnetd:
-#
-#bnetd_enable="YES"
-#
-# See bnetd(1) for flags
-#
-
-. %%RC_SUBR%%
-
-name=bnetd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/bnetd
-pidfile=/var/run/pvpgn/bnetd.pid
-required_files=%%PREFIX%%/etc/pvpgn/bnetd.conf
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# set defaults
-
-bnetd_enable=${bnetd_enable:-"NO"}
-bnetd_flags=${bnetd_flags:-""}
-
-load_rc_config $name
-run_rc_command "$1"
diff -ruN pvpgn.old/files/bnetd.sh.in pvpgn/files/bnetd.sh.in
--- pvpgn.old/files/bnetd.sh.in	Thu Jan  1 03:00:00 1970
+++ pvpgn/files/bnetd.sh.in	Fri Dec 15 22:10:59 2006
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/games/pvpgn/files/bnetd.sh,v 1.2 2006/02/20 20:47:02 dougb Exp $
+#
+
+# PROVIDE: bnetd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable bnetd:
+#
+# bnetd_enable="YES"
+#
+# See bnetd(1) for flags
+#
+
+. %%RC_SUBR%%
+
+name=bnetd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/bnetd
+pidfile=/var/run/pvpgn/bnetd.pid
+required_files=%%PREFIX%%/etc/pvpgn/bnetd.conf
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+bnetd_enable=${bnetd_enable:-"NO"}
+bnetd_flags=${bnetd_flags:-""}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN pvpgn.old/pkg-plist pvpgn/pkg-plist
--- pvpgn.old/pkg-plist	Tue Nov  7 23:53:31 2006
+++ pvpgn/pkg-plist	Fri Dec 15 23:01:19 2006
@@ -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/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
--- pvpgn-1.7.9-1.8.0.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1166218989.96224>