ports/170150: games/uhexen2: Update to version 1.5.3

KATO Tsuguru tkato432 at yahoo.com
Mon Jan 14 18:40:02 UTC 2013 

The following reply was made to PR ports/170150; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/170150: games/uhexen2: Update to version 1.5.3
Date: Tue, 15 Jan 2013 03:27:48 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__15_Jan_2013_03_27_48_+0900_YdF/6RahpGJtDRXH
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Version 1.5.5 has been released.
 
 --Multipart=_Tue__15_Jan_2013_03_27_48_+0900_YdF/6RahpGJtDRXH
 Content-Type: text/x-diff;
  name="games_uhexen2.diff"
 Content-Disposition: attachment;
  filename="games_uhexen2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/games/uhexen2/Makefile games/uhexen2/Makefile
 --- /usr/ports/games/uhexen2/Makefile	2012-11-08 07:21:21.000000000 +0900
 +++ games/uhexen2/Makefile	2013-01-14 21:01:26.000000000 +0900
 @@ -1,66 +1,49 @@
 -# New ports collection makefile for:	uhexen2
 -# Date created:				2006-12-30
 -# Whom:					alepulver
 -#
 +# Created by: alepulver
  # $FreeBSD: head/games/uhexen2/Makefile 300896 2012-07-14 13:54:48Z beat $
 -#
  
  PORTNAME=	uhexen2
 -PORTVERSION=	1.5.1
 -PORTREVISION=	1
 +PORTVERSION=	1.5.5
  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.27:data
  DISTNAME=	hexen2source-${PORTVERSION}
  EXTRACT_SUFX=	.tgz
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 +DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +		gamedata-all-1.27${EXTRACT_SUFX}:data
  DIST_SUBDIR=	${PORTNAME}
  
  MAINTAINER=	ports at 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
 -
 -USE_GMAKE=	yes
 -USE_GL=		yes
 -USE_SDL=	sdl mixer
 -WANT_GNOME=	yes
 -MAKE_JOBS_UNSAFE=	yes
 +LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
 +		vorbis:${PORTSDIR}/audio/libvorbis
  
  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 DOCS
 +OPTIONS_DEFAULT=	HEXEN2 HW LAUNCHER_GTK2
 +OPTIONS_DEFINE_i386=	ASM
 +OPTIONS_DEFAULT_i386=	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
  
 -PORTSCOUT=	skipb:yes
 +USE_SDL=	sdl
 +USE_GL=		gl
 +USE_GMAKE=	yes
 +MAKE_ENV=	X11BASE="${LOCALBASE}"
 +MAKE_JOBS_UNSAFE=yes
  
 -.include <bsd.port.pre.mk>
 +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 <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MHEXEN2}
  MAKE_ENV+=	BUILD_HEXEN2=yes
 @@ -72,15 +55,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 +83,57 @@
  PLIST_SUB+=	LAUNCHER_GTK2="@comment "
  .endif
  
 -.if ${PORT_OPTIONS:MX86_ASM} && ${ARCH} == "i386"
 +.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
 +
 +.if ${PORT_OPTIONS:MASM}
  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 +141,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 <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/games/uhexen2/distinfo games/uhexen2/distinfo
 --- /usr/ports/games/uhexen2/distinfo	2012-11-08 07:21:21.000000000 +0900
 +++ games/uhexen2/distinfo	2013-01-13 04:44:21.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.5.tgz) = c3eeecb97f196c2803ba093cccb0cf0d9638b09b0c9614479777aaedb5643de5
 +SIZE (uhexen2/hexen2source-1.5.5.tgz) = 2271835
 +SHA256 (uhexen2/gamedata-all-1.27.tgz) = 36e660f04eaf9b732e6a0c66b0c87ebd0d3bca867b015125c0a90491a8bdf9c9
 +SIZE (uhexen2/gamedata-all-1.27.tgz) = 3805914
  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-11-08 07:21:20.000000000 +0900
 +++ games/uhexen2/files/Makefile	2013-01-14 20:58:56.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	2012-11-08 07:21:20.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-11-08 07:21:21.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
 + at dirrm %%DATADIR%%/portals/maps
 + at dirrm %%DATADIR%%/portals
  %%HW%%@dirrm %%DATADIR%%/hw
  @dirrm %%DATADIR%%/data1
  @dirrm %%DATADIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Tue__15_Jan_2013_03_27_48_+0900_YdF/6RahpGJtDRXH--

More information about the freebsd-ports-bugs mailing list