From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 25 18:10:13 2012 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 B8B12106566B for ; Wed, 25 Jul 2012 18:10:13 +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 938778FC25 for ; Wed, 25 Jul 2012 18:10:13 +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 q6PIAC7l060780 for ; Wed, 25 Jul 2012 18:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6PIACOq060779; Wed, 25 Jul 2012 18:10:12 GMT (envelope-from gnats) Resent-Date: Wed, 25 Jul 2012 18:10:12 GMT Resent-Message-Id: <201207251810.q6PIACOq060779@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DD336106567D for ; Wed, 25 Jul 2012 18:01:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 45CE78FC21 for ; Wed, 25 Jul 2012 18:01:49 +0000 (UTC) Received: from localhost.localdomain (ZT029177.ppp.dion.ne.jp [59.128.29.177]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 974F650036 for ; Thu, 26 Jul 2012 03:01:43 +0900 (JST) Message-Id: <20120726024321.f5d5ac5fd5eeb9ed86b18a61@yahoo.com> Date: Thu, 26 Jul 2012 02:43:21 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/170150: games/uhexen2: Update to version 1.5.3 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, 25 Jul 2012 18:10:13 -0000 >Number: 170150 >Category: ports >Synopsis: games/uhexen2: Update to version 1.5.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 25 18:10:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p9 i386 >Organization: >Environment: >Description: - Update to version 1.5.3 Remove file: files/patch-scripts__makefile.inc >How-To-Repeat: >Fix: diff -urN /usr/ports/games/uhexen2/Makefile games/uhexen2/Makefile --- /usr/ports/games/uhexen2/Makefile 2012-06-14 06:22:14.000000000 +0900 +++ games/uhexen2/Makefile 2012-07-08 04:42:57.000000000 +0900 @@ -6,61 +6,46 @@ # PORTNAME= uhexen2 -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.5.4 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Source +MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Source \ + SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.26:data DISTNAME= hexen2source-${PORTVERSION} EXTRACT_SUFX= .tgz -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + gamedata-all-1.26${EXTRACT_SUFX}:data DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Hexen II source port supporting Linux/FreeBSD/Unix/Windows -LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad +LICENSE= GPLv2 # (or later) -LICENSE_= GPLv2 GPLv3 -LICENSE_COMB= dual +LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad \ + vorbis:${PORTSDIR}/audio/libvorbis -USE_GMAKE= yes -USE_GL= yes -USE_SDL= sdl mixer -WANT_GNOME= yes -MAKE_JOBS_UNSAFE= yes - -OPTIONS_MULTI= BIN +OPTIONS_MULTI= BIN OPTIONS_MULTI_BIN= HEXEN2 HW -OPTIONS_DEFINE= DEMO LAUNCHER_GTK1 LAUNCHER_GTK2 X86_ASM DOCS -OPTIONS_DEFAULT= HEXEN2 HW LAUNCHER_GTK1 X86_ASM -DEMO_DESC= Install demo version of the game data -HEXEN2_DESC= Build Hexen II clients and servers -HW_DESC= Build HexenWorld clients and servers +OPTIONS_DEFINE= LAUNCHER_GTK1 LAUNCHER_GTK2 LAUNCHER_GTK3 X86_ASM DOCS +OPTIONS_DEFAULT= HEXEN2 HW LAUNCHER_GTK2 X86_ASM +HEXEN2_DESC= Build Hexen II clients and servers +HW_DESC= Build HexenWorld clients and servers LAUNCHER_GTK1_DESC= Build graphical (GTK1) game launcher LAUNCHER_GTK2_DESC= Build graphical (GTK2) game launcher -X86_ASM_DESC= Enable use of optimized x86 assembly code +LAUNCHER_GTK3_DESC= Build graphical (GTK3) game launcher +X86_ASM_DESC= Use optimized assembly code (x86 only) -PORTSCOUT= skipb:yes +USE_SDL= sdl +USE_GL= gl +USE_GMAKE= yes +MAKE_ENV= X11BASE="${LOCALBASE}" +MAKE_JOBS_UNSAFE=yes -.include +SUB_FILES= pkg-message -.if ${PORT_OPTIONS:MDEMO} -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.20:data -DISTFILES+= gamedata-all-1.20${EXTRACT_SUFX}:data -PLIST_SUB+= DEMO="@comment " \ - FULL="" -SUB_FILES+= pkg-message -UH2_DATA= default.cfg hexen.rc progs.dat progs2.dat strings.txt -UH2_DATADIR= ${WRKDIR} -.endif +PORTSCOUT= skipb:yes + +.include .if ${PORT_OPTIONS:MHEXEN2} MAKE_ENV+= BUILD_HEXEN2=yes @@ -72,15 +57,14 @@ .endif .if ${PORT_OPTIONS:MHW} -. if empty(PORT_OPTIONS:MDEMO) MASTER_SITES+= SF/${PORTNAME}/Hexen2%20GameData/hexenworld-pakfiles:hw DISTFILES+= hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw -. endif MAKE_ENV+= BUILD_HW=yes PLIST_SUB+= HW="" UH2_BIN+= engine/hexenworld/client/glhwcl \ + engine/hexenworld/client/hwcl \ engine/hexenworld/server/hwsv \ - engine/hexenworld/client/hwcl + hw_utils/hwmaster/hwmaster .else PLIST_SUB+= HW="@comment " .endif @@ -101,29 +85,59 @@ PLIST_SUB+= LAUNCHER_GTK2="@comment " .endif +.if ${PORT_OPTIONS:MLAUNCHER_GTK3} +USE_GNOME+= gtk30 +MAKE_ENV+= BUILD_LAUNCHER_GTK3=yes +PLIST_SUB+= LAUNCHER_GTK3="" +.else +PLIST_SUB+= LAUNCHER_GTK3="@comment " +.endif + +.include + .if ${PORT_OPTIONS:MX86_ASM} && ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= USE_X86_ASM=yes +.else +MAKE_ENV+= USE_X86_ASM=no .endif post-extract: @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} +post-patch: +.for f in engine/hexen2/Makefile engine/hexenworld/client/Makefile \ + engine/hexenworld/server/Makefile hw_utils/hwmaster/Makefile \ + launcher/Makefile libs/timidity/Makefile + @${REINPLACE_CMD} -e \ + '/^USE_X86_ASM/s|^|#| ; \ + /^CPU_X86/s|^|#| ; \ + /^CFLAGS/s| -g | | ; \ + /^CFLAGS/s| -O2 | | ; \ + /^PTHREAD_LIBS/s|-lpthread|${PTHREAD_LIBS} |' ${WRKSRC}/${f} +.endfor +.for f in engine/h2shared/cd_bsd.c + @${REINPLACE_CMD} -e \ + 's|"acd0"|"cd0"|' ${WRKSRC}/${f} +.endfor +.for f in engine/hexen2/sys_unix.c engine/hexenworld/client/sys_unix.c + @${REINPLACE_CMD} -e \ + '/parms.basedir/s|= cwd;|= "${DATADIR}";|' ${WRKSRC}/${f} +.endfor + do-install: .for f in ${UH2_BIN} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor ${MKDIR} ${DATADIR}/data1 -.for f in ${UH2_DATA} - ${INSTALL_DATA} ${UH2_DATADIR}/data1/${f} ${DATADIR}/data1 +.for f in default.cfg hexen.rc progs.dat progs2.dat strings.txt + ${INSTALL_DATA} ${WRKDIR}/data1/${f} ${DATADIR}/data1 .endfor -.if empty(PORT_OPTIONS:MDEMO) ${INSTALL_DATA} ${WRKDIR}/patchdat/data1/* ${DATADIR}/data1 - ${CP} -R ${WRKDIR}/portals ${DATADIR} -.endif + @(cd ${WRKDIR} && ${COPYTREE_SHARE} portals ${DATADIR}) .if ${PORT_OPTIONS:MHW} ${MKDIR} ${DATADIR}/hw - ${INSTALL_DATA} ${UH2_DATADIR}/hw/* ${DATADIR}/hw + ${INSTALL_DATA} ${WRKDIR}/hw/* ${DATADIR}/hw .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK1} ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk1 ${PREFIX}/bin @@ -131,16 +145,17 @@ .if ${PORT_OPTIONS:MLAUNCHER_GTK2} ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk2 ${PREFIX}/bin .endif +.if ${PORT_OPTIONS:MLAUNCHER_GTK3} + ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk3 ${PREFIX}/bin +.endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} .endif -.if empty(PORT_OPTIONS:MDEMO) post-install: @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.endif .include diff -urN /usr/ports/games/uhexen2/distinfo games/uhexen2/distinfo --- /usr/ports/games/uhexen2/distinfo 2012-01-28 02:49:05.000000000 +0900 +++ games/uhexen2/distinfo 2012-07-08 04:25:46.000000000 +0900 @@ -1,8 +1,6 @@ -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/hexen2source-1.5.4.tgz) = f8aa8309d0f84143cc88f2101ee578a4a328a4221bd5198530e868b06137df10 +SIZE (uhexen2/hexen2source-1.5.4.tgz) = 2196923 +SHA256 (uhexen2/gamedata-all-1.26.tgz) = 5b01b49294c2158b7fdafda60dd370e60f37ddb1840f8056bee1ee7d15271a8d +SIZE (uhexen2/gamedata-all-1.26.tgz) = 3807789 SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9 SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641 -SHA256 (uhexen2/hexen2demo-1.5.1-linux-i586.tgz) = 3a86f0cdeed6ec8a1be2565db418941ac9af450c1f95d475c340338b2035f737 -SIZE (uhexen2/hexen2demo-1.5.1-linux-i586.tgz) = 19516960 diff -urN /usr/ports/games/uhexen2/files/Makefile games/uhexen2/files/Makefile --- /usr/ports/games/uhexen2/files/Makefile 2012-01-28 02:49:05.000000000 +0900 +++ games/uhexen2/files/Makefile 2012-06-30 23:10:39.000000000 +0900 @@ -10,7 +10,10 @@ $(MAKE) -C engine/hexen2 glh2 clean endif ifeq ($(BUILD_HW),yes) - cd engine/hexenworld && ./build.sh + $(MAKE) -C engine/hexenworld/server hwsv clean + $(MAKE) -C engine/hexenworld/client hw localclean + $(MAKE) -C engine/hexenworld/client glhw localclean + $(MAKE) -C hw_utils/hwmaster hwmaster clean endif ifeq ($(BUILD_LAUNCHER_GTK1),yes) $(MAKE) -C launcher GTK1=yes @@ -22,3 +25,8 @@ cd launcher && mv h2launcher h2launcher.gtk2 $(MAKE) -C launcher clean endif +ifeq ($(BUILD_LAUNCHER_GTK3),yes) + $(MAKE) -C launcher GTK3=yes + cd launcher && mv h2launcher h2launcher.gtk3 + $(MAKE) -C launcher clean +endif diff -urN /usr/ports/games/uhexen2/files/patch-scripts__makefile.inc games/uhexen2/files/patch-scripts__makefile.inc --- /usr/ports/games/uhexen2/files/patch-scripts__makefile.inc 2008-04-22 06:00:24.000000000 +0900 +++ games/uhexen2/files/patch-scripts__makefile.inc 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- scripts/makefile.inc.orig 2008-04-02 14:55:23.000000000 -0300 -+++ scripts/makefile.inc 2008-04-21 15:18:12.000000000 -0300 -@@ -29,7 +29,7 @@ - # Common paths: - - # X directory --X11BASE ?=/usr/X11R6 -+X11BASE ?=/usr/local - - # Local w32stuff directory: - W32STUFF :=$(UHEXEN2_TOP)/w32stuff diff -urN /usr/ports/games/uhexen2/pkg-plist games/uhexen2/pkg-plist --- /usr/ports/games/uhexen2/pkg-plist 2012-01-28 02:49:05.000000000 +0900 +++ games/uhexen2/pkg-plist 2012-07-08 04:39:59.000000000 +0900 @@ -2,10 +2,13 @@ %%HW%%bin/glhwcl %%LAUNCHER_GTK1%%bin/h2launcher.gtk1 %%LAUNCHER_GTK2%%bin/h2launcher.gtk2 +%%LAUNCHER_GTK3%%bin/h2launcher.gtk3 %%HEXEN2%%bin/hexen2 %%HW%%bin/hwcl +%%HW%%bin/hwmaster %%HW%%bin/hwsv %%PORTDOCS%%%%DOCSDIR%%/ABOUT +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CHANGES.old @@ -15,7 +18,6 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.3dfx %%PORTDOCS%%%%DOCSDIR%%/README.AoT -%%PORTDOCS%%%%DOCSDIR%%/README.demo %%PORTDOCS%%%%DOCSDIR%%/README.dos %%PORTDOCS%%%%DOCSDIR%%/README.hwcl %%PORTDOCS%%%%DOCSDIR%%/README.hwmaster @@ -23,46 +25,38 @@ %%PORTDOCS%%%%DOCSDIR%%/README.launcher %%PORTDOCS%%%%DOCSDIR%%/README.music %%PORTDOCS%%%%DOCSDIR%%/README.win32 -%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.2.3 -%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.2.4a -%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.3.0 -%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.0 -%%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%%/ReleaseNotes +%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.old %%PORTDOCS%%%%DOCSDIR%%/SrcNotes.txt %%PORTDOCS%%%%DOCSDIR%%/TODO +%%DATADIR%%/data1/data1pk0.xd3 +%%DATADIR%%/data1/data1pk1.xd3 %%DATADIR%%/data1/default.cfg %%DATADIR%%/data1/hexen.rc -%%DEMO%%%%DATADIR%%/data1/pak0.pak -%%FULL%%%%DATADIR%%/data1/data1pk0.xd3 -%%FULL%%%%DATADIR%%/data1/data1pk1.xd3 %%DATADIR%%/data1/progs.dat -%%FULL%%%%DATADIR%%/data1/progs2.dat -%%FULL%%%%DATADIR%%/data1/strings.txt +%%DATADIR%%/data1/progs2.dat +%%DATADIR%%/data1/strings.txt %%HW%%%%DATADIR%%/hw/default.cfg %%HW%%%%DATADIR%%/hw/hwprogs.dat %%HW%%%%DATADIR%%/hw/pak4.pak -%%FULL%%%%HW%%%%DATADIR%%/hw/pak4_readme.txt +%%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 -%%FULL%%%%DATADIR%%/portals/maplist.txt -%%FULL%%%%DATADIR%%/portals/progs.dat -%%FULL%%%%DATADIR%%/portals/puzzles.txt -%%FULL%%%%DATADIR%%/portals/strings.txt -%%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%%%%DATADIR%%/hw/strings.txt.demo +%%DATADIR%%/portals/default.cfg +%%DATADIR%%/portals/hexen.rc +%%DATADIR%%/portals/infolist.txt +%%DATADIR%%/portals/maplist.txt +%%DATADIR%%/portals/maps/README.txt +%%DATADIR%%/portals/maps/tibet2.ent +%%DATADIR%%/portals/maps/tibet2.txt +%%DATADIR%%/portals/maps/tibet9.ent +%%DATADIR%%/portals/maps/tibet9.txt +%%DATADIR%%/portals/progs.dat +%%DATADIR%%/portals/puzzles.txt +%%DATADIR%%/portals/strings.txt +@dirrm %%DATADIR%%/portals/maps +@dirrm %%DATADIR%%/portals %%HW%%@dirrm %%DATADIR%%/hw @dirrm %%DATADIR%%/data1 @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: