From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 28 07:30:17 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88FB5106566B for ; Wed, 28 Dec 2011 07:30:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5F1AF8FC08 for ; Wed, 28 Dec 2011 07:30:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pBS7UH6Z036798 for ; Wed, 28 Dec 2011 07:30:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pBS7UH8K036793; Wed, 28 Dec 2011 07:30:17 GMT (envelope-from gnats) Resent-Date: Wed, 28 Dec 2011 07:30:17 GMT Resent-Message-Id: <201112280730.pBS7UH8K036793@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, Armin Pirkovitsch Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E1DB1065670 for ; Wed, 28 Dec 2011 07:21:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id F29E38FC14 for ; Wed, 28 Dec 2011 07:21:31 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pBS7LV10086188 for ; Wed, 28 Dec 2011 07:21:31 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pBS7LVno086184; Wed, 28 Dec 2011 07:21:31 GMT (envelope-from nobody) Message-Id: <201112280721.pBS7LVno086184@red.freebsd.org> Date: Wed, 28 Dec 2011 07:21:31 GMT From: Armin Pirkovitsch To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163657: [PATCH] games/uhexen2 update to 1.5.1 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: Wed, 28 Dec 2011 07:30:17 -0000 >Number: 163657 >Category: ports >Synopsis: [PATCH] games/uhexen2 update to 1.5.1 >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: Wed Dec 28 07:30:17 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Armin Pirkovitsch >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: Index: games/uhexen2/Makefile =================================================================== RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/games/uhexen2/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- games/uhexen2/Makefile 9 Aug 2011 13:19:48 -0000 1.11 +++ games/uhexen2/Makefile 12 Dec 2011 19:01:01 -0000 @@ -6,10 +6,9 @@ # PORTNAME= uhexen2 -PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTVERSION= 1.5.1 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Source DISTNAME= hexen2source-${PORTVERSION} EXTRACT_SUFX= .tgz DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -18,6 +17,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Hexen II source port supporting Linux/FreeBSD/Unix/Windows +LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad + LICENSE_= GPLv2 GPLv3 LICENSE_COMB= dual @@ -30,7 +31,7 @@ OPTIONS= DEMO "Install demo version of the game data" off \ HEXEN2 "Build Hexen II clients and servers" on \ HW "Build HexenWorld clients and servers" on \ - LAUNCHER_GTK1 "Build graphical (GTK1) game launcher" off \ + LAUNCHER_GTK1 "Build graphical (GTK1) game launcher" on \ LAUNCHER_GTK2 "Build graphical (GTK2) game launcher" off \ X86_ASM "Enable use of optimized x86 assembly code" on @@ -43,15 +44,16 @@ .endif .if defined(WITH_DEMO) -DISTFILES+= hexen2demo-${PORTVERSION}-linux-i586${EXTRACT_SUFX} +MASTER_SITES+= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Linux-demo-version:demo +DISTFILES+= hexen2demo-${PORTVERSION}-linux-i586${EXTRACT_SUFX}:demo MAKE_ENV+= DEMO=yes PLIST_SUB+= DEMO="" \ FULL="@comment " UH2_DATA= default.cfg hexen.rc pak0.pak progs.dat UH2_DATADIR= ${WRKDIR}/hexen2demo-${PORTVERSION} .else -MASTER_SITES+= SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.19a:data -DISTFILES+= gamedata-all-1.19a${EXTRACT_SUFX}:data +MASTER_SITES+= SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.20:data +DISTFILES+= gamedata-all-1.20${EXTRACT_SUFX}:data PLIST_SUB+= DEMO="@comment " \ FULL="" SUB_FILES+= pkg-message @@ -62,8 +64,8 @@ .if defined(WITH_HEXEN2) MAKE_ENV+= BUILD_HEXEN2=yes PLIST_SUB+= HEXEN2="" -UH2_BIN+= hexen2/glhexen2 \ - hexen2/hexen2 +UH2_BIN+= engine/hexen2/glhexen2 \ + engine/hexen2/hexen2 .else PLIST_SUB+= HEXEN2="@comment " .endif @@ -75,9 +77,9 @@ . endif MAKE_ENV+= BUILD_HW=yes PLIST_SUB+= HW="" -UH2_BIN+= hexenworld/Client/glhwcl hexenworld/Master/hwmaster \ - hexenworld/Server/hwsv \ - hexenworld/Client/hwcl +UH2_BIN+= engine/hexenworld/client/glhwcl \ + engine/hexenworld/server/hwsv \ + engine/hexenworld/client/hwcl .else PLIST_SUB+= HW="@comment " .endif @@ -106,12 +108,6 @@ post-extract: @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} -post-patch: -.for f in hexen2/common.c hexenworld/Client/common.c - @${REINPLACE_CMD} -e 's|host_parms\.basedir|"${DATADIR}"|' \ - ${WRKSRC}/${f} -.endfor - do-install: .for f in ${UH2_BIN} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin @@ -121,8 +117,7 @@ ${INSTALL_DATA} ${UH2_DATADIR}/data1/${f} ${DATADIR}/data1 .endfor .if !defined(WITH_DEMO) - ${INSTALL_DATA} ${WRKDIR}/patchdata/data1/* ${DATADIR}/data1 - ${INSTALL_DATA} ${WRKDIR}/update_* ${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/patchdat/data1/* ${DATADIR}/data1 ${CP} -R ${WRKDIR}/portals ${DATADIR} .endif .if defined(WITH_HW) Index: games/uhexen2/distinfo =================================================================== RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/games/uhexen2/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- games/uhexen2/distinfo 3 Jul 2011 14:25:11 -0000 1.4 +++ games/uhexen2/distinfo 12 Dec 2011 18:09:33 -0000 @@ -1,8 +1,8 @@ -SHA256 (uhexen2/hexen2source-1.4.3.tgz) = bbb9ffb5380b57be7dd7fecbbd9bba71846f2f17d5614b670e1df13710f7af0d -SIZE (uhexen2/hexen2source-1.4.3.tgz) = 2173736 -SHA256 (uhexen2/gamedata-all-1.19a.tgz) = b9b9561b4155bfe3f8005315a7f8f95a567c2ebbcb2a950ad05dcb1702ac68de -SIZE (uhexen2/gamedata-all-1.19a.tgz) = 3703488 +SHA256 (uhexen2/hexen2source-1.5.1.tgz) = da805bb45d54bb0a65df36cbbeba494c055ff7dbfbbdb3f2acd835778c0ccc0b +SIZE (uhexen2/hexen2source-1.5.1.tgz) = 2133252 +SHA256 (uhexen2/gamedata-all-1.20.tgz) = aabc82d364c0f6fd89a51262db1dc2d76e7d1066bd79b2eb76909a55e4d99e73 +SIZE (uhexen2/gamedata-all-1.20.tgz) = 3807819 SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9 SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641 -SHA256 (uhexen2/hexen2demo-1.4.3-linux-i586.tgz) = d0e07793524a16675f42a973536a19b3baf15ace2abbbbd979e2870c3e99e192 -SIZE (uhexen2/hexen2demo-1.4.3-linux-i586.tgz) = 18830708 +SHA256 (uhexen2/hexen2demo-1.5.1-linux-i586.tgz) = 3a86f0cdeed6ec8a1be2565db418941ac9af450c1f95d475c340338b2035f737 +SIZE (uhexen2/hexen2demo-1.5.1-linux-i586.tgz) = 19516960 Index: games/uhexen2/pkg-plist =================================================================== RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/games/uhexen2/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- games/uhexen2/pkg-plist 21 Apr 2008 21:00:24 -0000 1.3 +++ games/uhexen2/pkg-plist 12 Dec 2011 17:58:42 -0000 @@ -4,11 +4,11 @@ %%LAUNCHER_GTK2%%bin/h2launcher.gtk2 %%HEXEN2%%bin/hexen2 %%HW%%bin/hwcl -%%HW%%bin/hwmaster %%HW%%bin/hwsv %%PORTDOCS%%%%DOCSDIR%%/ABOUT %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/CHANGES.old %%PORTDOCS%%%%DOCSDIR%%/COMPILE %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/Features @@ -16,10 +16,12 @@ %%PORTDOCS%%%%DOCSDIR%%/README.3dfx %%PORTDOCS%%%%DOCSDIR%%/README.AoT %%PORTDOCS%%%%DOCSDIR%%/README.demo +%%PORTDOCS%%%%DOCSDIR%%/README.dos %%PORTDOCS%%%%DOCSDIR%%/README.hwcl %%PORTDOCS%%%%DOCSDIR%%/README.hwmaster %%PORTDOCS%%%%DOCSDIR%%/README.hwsv %%PORTDOCS%%%%DOCSDIR%%/README.launcher +%%PORTDOCS%%%%DOCSDIR%%/README.music %%PORTDOCS%%%%DOCSDIR%%/README.win32 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.2.3 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.2.4a @@ -28,13 +30,15 @@ %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.1 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.2 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.3 +%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.5.0 +%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.5.1 %%PORTDOCS%%%%DOCSDIR%%/SrcNotes.txt %%PORTDOCS%%%%DOCSDIR%%/TODO %%DATADIR%%/data1/default.cfg %%DATADIR%%/data1/hexen.rc %%DEMO%%%%DATADIR%%/data1/pak0.pak -%%FULL%%%%DATADIR%%/data1/data1pak0.xd -%%FULL%%%%DATADIR%%/data1/data1pak1.xd +%%FULL%%%%DATADIR%%/data1/data1pk0.xd3 +%%FULL%%%%DATADIR%%/data1/data1pk1.xd3 %%DATADIR%%/data1/progs.dat %%FULL%%%%DATADIR%%/data1/progs2.dat %%FULL%%%%DATADIR%%/data1/strings.txt @@ -43,6 +47,7 @@ %%HW%%%%DATADIR%%/hw/pak4.pak %%FULL%%%%HW%%%%DATADIR%%/hw/pak4_readme.txt %%HW%%%%DATADIR%%/hw/strings.txt +%%FULL%%%%HW%%%%DATADIR%%/hw/strings.txt.demo %%FULL%%%%DATADIR%%/portals/default.cfg %%FULL%%%%DATADIR%%/portals/hexen.rc %%FULL%%%%DATADIR%%/portals/infolist.txt @@ -50,10 +55,13 @@ %%FULL%%%%DATADIR%%/portals/progs.dat %%FULL%%%%DATADIR%%/portals/puzzles.txt %%FULL%%%%DATADIR%%/portals/strings.txt -%%FULL%%%%DATADIR%%/update_loki.dat -%%FULL%%%%DATADIR%%/update_loki.sh -%%FULL%%%%DATADIR%%/update_xdelta.sh +%%FULL%%%%DATADIR%%/portals/maps/README.txt +%%FULL%%%%DATADIR%%/portals/maps/tibet2.ent +%%FULL%%%%DATADIR%%/portals/maps/tibet2.txt +%%FULL%%%%DATADIR%%/portals/maps/tibet9.ent +%%FULL%%%%DATADIR%%/portals/maps/tibet9.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%FULL%%@dirrm %%DATADIR%%/portals/maps %%FULL%%@dirrm %%DATADIR%%/portals %%HW%%@dirrm %%DATADIR%%/hw @dirrm %%DATADIR%%/data1 Index: games/uhexen2/files/Makefile =================================================================== RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/games/uhexen2/files/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- games/uhexen2/files/Makefile 23 Apr 2008 03:08:51 -0000 1.3 +++ games/uhexen2/files/Makefile 11 Dec 2011 13:35:27 -0000 @@ -6,11 +6,11 @@ all: ifeq ($(BUILD_HEXEN2),yes) - $(MAKE) -C hexen2 h2 clean - $(MAKE) -C hexen2 glh2 clean + $(MAKE) -C engine/hexen2 h2 clean + $(MAKE) -C engine/hexen2 glh2 clean endif ifeq ($(BUILD_HW),yes) - cd hexenworld && ./build.sh + cd engine/hexenworld && ./build.sh endif ifeq ($(BUILD_LAUNCHER_GTK1),yes) $(MAKE) -C launcher GTK1=yes Index: games/uhexen2/files/patch-hexen2__Makefile =================================================================== RCS file: games/uhexen2/files/patch-hexen2__Makefile diff -N games/uhexen2/files/patch-hexen2__Makefile --- games/uhexen2/files/patch-hexen2__Makefile 21 Apr 2008 21:00:24 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ ---- ./hexen2/Makefile.orig 2008-04-03 20:37:23.000000000 -0300 -+++ ./hexen2/Makefile 2008-04-21 15:15:19.000000000 -0300 -@@ -120,13 +120,13 @@ - USE_SDLAUDIO=yes - USE_MIDI=yes - USE_CDAUDIO=yes --USE_SDLCD=no -+USE_SDLCD=yes - WITH_SPLASHES=yes - LINK_DIRECTX=no - OPT_EXTRA=yes - LINK_GL_LIBS=no - USE_3DFXGAMMA=yes --USE_X86_ASM=yes -+USE_X86_ASM?=no - COMPILE_32BITS=no - - # include the common dirty stuff -@@ -179,7 +179,7 @@ - - else - --CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations -+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations - - ifdef NO_UNIT_AT_A_TIME - CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) Index: games/uhexen2/files/patch-hexenworld__Client__Makefile =================================================================== RCS file: games/uhexen2/files/patch-hexenworld__Client__Makefile diff -N games/uhexen2/files/patch-hexenworld__Client__Makefile --- games/uhexen2/files/patch-hexenworld__Client__Makefile 21 Apr 2008 21:00:24 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ ---- ./hexenworld/Client/Makefile.orig 2008-04-03 20:37:25.000000000 -0300 -+++ ./hexenworld/Client/Makefile 2008-04-21 15:15:19.000000000 -0300 -@@ -115,13 +115,13 @@ - USE_SDLAUDIO=yes - USE_MIDI=yes - USE_CDAUDIO=yes --USE_SDLCD=no -+USE_SDLCD=yes - WITH_SPLASHES=yes - LINK_DIRECTX=no - OPT_EXTRA=yes - LINK_GL_LIBS=no - USE_3DFXGAMMA=yes --USE_X86_ASM=yes -+USE_X86_ASM?=no - COMPILE_32BITS=no - - # include the common dirty stuff -@@ -167,7 +167,7 @@ - - else - --CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations -+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations - - ifdef NO_UNIT_AT_A_TIME - CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) Index: games/uhexen2/files/patch-hexenworld__Master__Makefile =================================================================== RCS file: games/uhexen2/files/patch-hexenworld__Master__Makefile diff -N games/uhexen2/files/patch-hexenworld__Master__Makefile --- games/uhexen2/files/patch-hexenworld__Master__Makefile 21 Oct 2007 17:51:02 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- hexenworld/Master/Makefile.orig Thu Jul 12 14:41:20 2007 -+++ hexenworld/Master/Makefile Mon Oct 8 15:58:40 2007 -@@ -41,7 +41,7 @@ - - else - --CFLAGS := $(CPUFLAGS) -O2 -Wall -+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall - - ifdef NO_UNIT_AT_A_TIME - CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) Index: games/uhexen2/files/patch-hexenworld__Server__Makefile =================================================================== RCS file: games/uhexen2/files/patch-hexenworld__Server__Makefile diff -N games/uhexen2/files/patch-hexenworld__Server__Makefile --- games/uhexen2/files/patch-hexenworld__Server__Makefile 21 Oct 2007 17:51:02 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- hexenworld/Server/Makefile.orig Thu Jul 12 14:41:20 2007 -+++ hexenworld/Server/Makefile Mon Oct 8 16:01:34 2007 -@@ -64,7 +64,7 @@ - - else - --CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations -+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations - - ifdef NO_UNIT_AT_A_TIME - CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) Index: games/uhexen2/files/patch-hexenworld__build.sh =================================================================== RCS file: games/uhexen2/files/patch-hexenworld__build.sh diff -N games/uhexen2/files/patch-hexenworld__build.sh --- games/uhexen2/files/patch-hexenworld__build.sh 23 Apr 2008 03:08:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- hexenworld/build.sh.orig 2007-10-18 13:55:49.000000000 -0300 -+++ hexenworld/build.sh 2008-04-22 22:52:13.000000000 -0300 -@@ -41,8 +41,9 @@ - - echo "" && echo "Building hexenworld client (software renderer)" - $MAKE_CMD -C Client hw || exit 1 -+$MAKE_CMD -s -C Client clean - - echo "" && echo "Building hexenworld client (opengl renderer)" --$MAKE_CMD -s -C Client clean - $MAKE_CMD -C Client glhw || exit 1 -+$MAKE_CMD -s -C Client clean - Index: games/uhexen2/files/patch-launcher__Makefile =================================================================== RCS file: games/uhexen2/files/patch-launcher__Makefile diff -N games/uhexen2/files/patch-launcher__Makefile --- games/uhexen2/files/patch-launcher__Makefile 21 Apr 2008 21:00:24 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- launcher/Makefile.orig 2007-10-25 06:06:52.000000000 -0300 -+++ launcher/Makefile 2008-04-21 17:28:38.000000000 -0300 -@@ -116,7 +116,7 @@ - ALL_OBJECTS := $(LAUNCHER_OBJS) $(GUI_OBJS) $(XPATCH_OBJS) \ - $(LIBXDELTA_OBJS) $(LIBEDSIO_OBJS) $(LAUNCHER_MAIN) - --$(BINARY): $(LAUNCHER_OBJS) $(LAUNCHER_MAIN) $(GUI_OBJS) $(XPATCH_OBJS) -+$(BINARY): $(ALL_OBJECTS) - @rm -f $(BINARY) - $(LINKER) -o $(BINARY) $(ALL_OBJECTS) $(LDFLAGS) - >Release-Note: >Audit-Trail: >Unformatted: