From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 6 18:50:13 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0860016A41F for ; Sat, 6 Aug 2005 18:50:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69F4943D45 for ; Sat, 6 Aug 2005 18:50:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j76IoCph079120 for ; Sat, 6 Aug 2005 18:50:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j76IoCYv079119; Sat, 6 Aug 2005 18:50:12 GMT (envelope-from gnats) Resent-Date: Sat, 6 Aug 2005 18:50:12 GMT Resent-Message-Id: <200508061850.j76IoCYv079119@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD09416A41F for ; Sat, 6 Aug 2005 18:45:37 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay03.pair.com (relay03.pair.com [209.68.5.17]) by mx1.FreeBSD.org (Postfix) with SMTP id 44CF743D53 for ; Sat, 6 Aug 2005 18:45:37 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 79589 invoked from network); 6 Aug 2005 18:45:35 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 6 Aug 2005 18:45:35 -0000 Message-Id: <1123353944.0@phobos.mars.bsd> Date: Sat, 6 Aug 2005 15:45:44 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/84626: [UPDATE] games/asc: update to version 1.16.1, clean-up, use DATADIR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2005 18:50:13 -0000 >Number: 84626 >Category: ports >Synopsis: [UPDATE] games/asc: update to version 1.16.1, clean-up, use DATADIR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 06 18:50:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: * Update to version 1.16.1. * Source uses tar/bzip2. * Use libtool 15 instead of 13. * Remove SDL flags from CONFIGURE_ENV. * Install game data in DATADIR, and respect the variable (if it changes, the packaging list and the game will behave as expected) * Remove CONFIGURE_ARGS to disable the paragui test program. >How-To-Repeat: >Fix: --- asc.diff begins here --- diff -urN /usr/ports/games/asc/Makefile asc/Makefile --- /usr/ports/games/asc/Makefile Fri Mar 11 19:14:26 2005 +++ asc/Makefile Sat Aug 6 15:37:55 2005 @@ -6,10 +6,10 @@ # PORTNAME= asc -PORTVERSION= 1.15.3.0 +PORTVERSION= 1.16.1.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= asc-hq +MASTER_SITE_SUBDIR= ${PORTNAME}-hq DISTNAME= ${PORTNAME}-source-${PORTVERSION} MAINTAINER= yinjieh@csie.nctu.edu.tw @@ -20,46 +20,48 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_SDL= image mm mixer sdl +USE_BZIP2= yes USE_GMAKE= yes USE_PERL5_BUILD=yes USE_REINPLACE= yes -USE_LIBTOOL_VER=13 -USE_GETOPT_LONG= yes -CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \ - CXXFLAGS="-D_UNICODE_BROKEN_" \ - LIBS="`${SDL_CONFIG} --libs` -lm" +USE_GETOPT_LONG=yes +USE_SDL= image mm mixer sdl -CONFIGURE_ARGS= --disable-paraguitest +USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --datadir=${DATADIR} OPTIONS= MUSIC "Install extra music files" off -MAN6= asc.6 asc_demount.6 asc_mount.6 asc_mapedit.6 asc_makegfx.6 asc_weaponguide.6 +MAN6= asc.6 asc_demount.6 asc_mount.6 asc_mapedit.6 asc_makegfx.6 \ + asc_weaponguide.6 .include .if defined(WITH_MUSIC) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} frontiers.mp3 time_to_strike.mp3 machine_wars.mp3 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + frontiers.mp3 time_to_strike.mp3 machine_wars.mp3 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PLIST_SUB+= MUSIC:="" +PLIST_SUB+= MUSIC="" .else -PLIST_SUB+= MUSIC:="@comment " +PLIST_SUB+= MUSIC="@comment " .endif -pre-configure: +post-extract: .if defined(WITH_MUSIC) - ${CP} ${DISTDIR}/frontiers.mp3 ${WRKSRC}/data/music - ${CP} ${DISTDIR}/time_to_strike.mp3 ${WRKSRC}/data/music - ${CP} ${DISTDIR}/machine_wars.mp3 ${WRKSRC}/data/music +. for f in ${DISTFILES:S/${EXTRACT_ONLY}//} + @${CP} ${DISTDIR}/${f} ${WRKSRC}/data/music +. endfor .endif -pre-build: - @${FIND} ${WRKSRC}/source -name \*.cpp | ${XARGS} ${REINPLACE_CMD} \ - -e 's|||' - @${FIND} ${WRKSRC}/source -name \*.h | ${XARGS} ${REINPLACE_CMD} \ - -e 's|||' +post-patch: +.for f in *.cpp *.h + @${FIND} ${WRKSRC}/source -name "${f}" | \ + ${XARGS} ${REINPLACE_CMD} -e 's|||' +.endfor post-install: + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .include diff -urN /usr/ports/games/asc/distinfo asc/distinfo --- /usr/ports/games/asc/distinfo Fri Mar 11 19:14:26 2005 +++ asc/distinfo Sat Aug 6 11:05:08 2005 @@ -1,5 +1,5 @@ -MD5 (asc-source-1.15.3.0.tar.gz) = 5b1259915e48dfd9a44d5ac72ceaea6c -SIZE (asc-source-1.15.3.0.tar.gz) = 12034077 +MD5 (asc-source-1.16.1.0.tar.bz2) = cf9dce7df8c4fba7cc2a3c9439cb376c +SIZE (asc-source-1.16.1.0.tar.bz2) = 8528469 MD5 (frontiers.mp3) = 560f5783836b309906e57e77417f3864 SIZE (frontiers.mp3) = 4407769 MD5 (time_to_strike.mp3) = f0ab3c633f51430af0445ecaa02e3197 diff -urN /usr/ports/games/asc/files/patch-configure asc/files/patch-configure --- /usr/ports/games/asc/files/patch-configure Wed Dec 31 21:00:00 1969 +++ asc/files/patch-configure Sat Aug 6 12:07:43 2005 @@ -0,0 +1,11 @@ +--- configure.orig Sun May 29 14:07:52 2005 ++++ configure Sat Aug 6 12:07:29 2005 +@@ -22962,7 +22962,7 @@ + + + +- game_datadir="$datadir/games/$PACKAGE" ++ game_datadir="$datadir/$PACKAGE" + game_datadir=`( + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" diff -urN /usr/ports/games/asc/files/patch-data-Makefile.in asc/files/patch-data-Makefile.in --- /usr/ports/games/asc/files/patch-data-Makefile.in Wed Dec 31 21:00:00 1969 +++ asc/files/patch-data-Makefile.in Sat Aug 6 12:22:28 2005 @@ -0,0 +1,11 @@ +--- data/Makefile.in.orig Sun Jun 12 04:29:27 2005 ++++ data/Makefile.in Sat Aug 6 12:21:26 2005 +@@ -66,7 +66,7 @@ + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@ + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ diff -urN /usr/ports/games/asc/files/patch-data-dialog-Makefile.in asc/files/patch-data-dialog-Makefile.in --- /usr/ports/games/asc/files/patch-data-dialog-Makefile.in Wed Dec 31 21:00:00 1969 +++ asc/files/patch-data-dialog-Makefile.in Sat Aug 6 12:23:03 2005 @@ -0,0 +1,11 @@ +--- data/dialog/Makefile.in.orig Sun Jun 12 04:29:27 2005 ++++ data/dialog/Makefile.in Sat Aug 6 12:22:03 2005 +@@ -57,7 +57,7 @@ + pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@ + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ diff -urN /usr/ports/games/asc/files/patch-data-music-Makefile.in asc/files/patch-data-music-Makefile.in --- /usr/ports/games/asc/files/patch-data-music-Makefile.in Wed Dec 31 21:00:00 1969 +++ asc/files/patch-data-music-Makefile.in Sat Aug 6 12:22:46 2005 @@ -0,0 +1,11 @@ +--- data/music/Makefile.in.orig Sun Jun 12 04:29:27 2005 ++++ data/music/Makefile.in Sat Aug 6 12:21:45 2005 +@@ -57,7 +57,7 @@ + pkgdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgdata_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkgdatadir = $(datadir)/games/@PACKAGE@/music ++pkgdatadir = $(datadir)/@PACKAGE@/music + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ diff -urN /usr/ports/games/asc/files/patch-tools-groupfile.cpp asc/files/patch-tools-groupfile.cpp --- /usr/ports/games/asc/files/patch-tools-groupfile.cpp Sun Nov 14 13:57:05 2004 +++ asc/files/patch-tools-groupfile.cpp Wed Dec 31 21:00:00 1969 @@ -1,10 +0,0 @@ ---- source/tools/groupfile.cpp.orig Sat Oct 30 21:00:02 2004 -+++ source/tools/groupfile.cpp Sat Oct 30 21:14:57 2004 -@@ -15,6 +15,7 @@ - * * - ***************************************************************************/ - #include "groupfile.h" -+#include - - - bool lessCat(AbstractEntry const * a, AbstractEntry const * b) { diff -urN /usr/ports/games/asc/pkg-plist asc/pkg-plist --- /usr/ports/games/asc/pkg-plist Fri Sep 24 02:22:13 2004 +++ asc/pkg-plist Sat Aug 6 12:34:29 2005 @@ -4,17 +4,16 @@ bin/asc_mapedit bin/asc_mount bin/asc_weaponguide -share/games/asc/asc.gfx -share/games/asc/asc_dlg.zip -share/games/asc/buildings.con -share/games/asc/main.con -share/games/asc/mk1.con -share/games/asc/trrobj.con -share/games/asc/trrobj2.con -share/games/asc/units-mk3.con -%%MUSIC:%%share/games/asc/music/frontiers.mp3 -%%MUSIC:%%share/games/asc/music/time_to_strike.mp3 -%%MUSIC:%%share/games/asc/music/machine_wars.mp3 -%%MUSIC:%%@dirrm share/games/asc/music -@dirrm share/games/asc -@dirrm share/games +%%DATADIR%%/asc.gfx +%%DATADIR%%/asc_dlg.zip +%%DATADIR%%/buildings.con +%%DATADIR%%/main.con +%%DATADIR%%/mk1.con +%%MUSIC%%%%DATADIR%%/music/frontiers.mp3 +%%MUSIC%%%%DATADIR%%/music/machine_wars.mp3 +%%MUSIC%%%%DATADIR%%/music/time_to_strike.mp3 +%%DATADIR%%/trrobj.con +%%DATADIR%%/trrobj2.con +%%DATADIR%%/units-mk3.con +@dirrm %%DATADIR%%/music +@dirrm %%DATADIR%% --- asc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: