Date: Tue, 8 Mar 2016 16:05:46 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410630 - in head/games/uhexen2: . files Message-ID: <201603081605.u28G5k8c026609@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Mar 8 16:05:46 2016 New Revision: 410630 URL: https://svnweb.freebsd.org/changeset/ports/410630 Log: Update to 1.5.7 PR: 207161 Submitted by: tkato432 yahoo com Sponsored by: Absolight Modified: head/games/uhexen2/Makefile head/games/uhexen2/distinfo head/games/uhexen2/files/Makefile head/games/uhexen2/pkg-descr head/games/uhexen2/pkg-plist Modified: head/games/uhexen2/Makefile ============================================================================== --- head/games/uhexen2/Makefile Tue Mar 8 16:04:23 2016 (r410629) +++ head/games/uhexen2/Makefile Tue Mar 8 16:05:46 2016 (r410630) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= uhexen2 -PORTVERSION= 1.5.6 -PORTREVISION= 2 +PORTVERSION= 1.5.7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Source \ - SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.28:data + SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.29:data \ + SF/${PORTNAME}/Hexen2%20GameData/hexenworld-pakfiles:hw DISTNAME= hexen2source-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - gamedata-all-1.28${EXTRACT_SUFX}:data + gamedata-all-1.29${EXTRACT_SUFX}:data DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org @@ -18,85 +18,64 @@ COMMENT= Hexen II source port supporting LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad \ - libvorbis.so:${PORTSDIR}/audio/libvorbis - -OPTIONS_MULTI= BIN -OPTIONS_MULTI_BIN= HEXEN2 HW -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 -LAUNCHER_GTK3_DESC= Build graphical (GTK3) game launcher - USES= gmake pkgconfig tar:tgz -USE_SDL= sdl USE_GL= gl -MAKE_ENV= X11BASE="${LOCALBASE}" -MAKE_JOBS_UNSAFE=yes +USE_SDL= sdl +MAKE_ARGS= X11BASE="${LOCALBASE}" +MAKE_JOBS_UNSAFE= yes SUB_FILES= pkg-message PORTSCOUT= skipb:yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MHEXEN2} -MAKE_ENV+= BUILD_HEXEN2=yes -PLIST_SUB+= HEXEN2="" -UH2_BIN+= engine/hexen2/glhexen2 \ - engine/hexen2/hexen2 -.else -PLIST_SUB+= HEXEN2="@comment " -.endif - -.if ${PORT_OPTIONS:MHW} -MASTER_SITES+= SF/${PORTNAME}/Hexen2%20GameData/hexenworld-pakfiles:hw -DISTFILES+= hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw -MAKE_ENV+= BUILD_HW=yes -PLIST_SUB+= HW="" -UH2_BIN+= engine/hexenworld/client/glhwcl \ - engine/hexenworld/client/hwcl \ - engine/hexenworld/server/hwsv \ - hw_utils/hwmaster/hwmaster -.else -PLIST_SUB+= HW="@comment " -.endif +OPTIONS_DEFINE= DOCS FLAC MIKMOD OGG OPUS +OPTIONS_MULTI= BIN +OPTIONS_MULTI_BIN= HEXEN2 HW +OPTIONS_RADIO= MP3LIB VORBISLIB +OPTIONS_RADIO_MP3LIB= MAD MPG123 +OPTIONS_RADIO_VORBISLIB= TREMOR VORBIS +OPTIONS_DEFAULT= HEXEN2 HW MAD OGG VORBIS +OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFAULT_i386= ASM +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MLAUNCHER_GTK1} -USE_GNOME+= gtk12 -MAKE_ENV+= BUILD_LAUNCHER_GTK1=yes -PLIST_SUB+= LAUNCHER_GTK1="" -.else -PLIST_SUB+= LAUNCHER_GTK1="@comment " -.endif +ASM_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +ASM_MAKE_ARGS_OFF= USE_X86_ASM=no +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_MAKE_ARGS= USE_CODEC_FLAC=yes +HEXEN2_DESC= Build Hexen II clients and servers +HEXEN2_MAKE_ARGS= BUILD_HEXEN2=yes +HW_DESC= Build HexenWorld clients and servers +HW_DISTFILES= hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw +HW_MAKE_ARGS= BUILD_HW=yes +MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad +MAD_MAKE_ARGS= MP3LIB=mad +MIKMOD_LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod +MIDMOD_MAKE_ARGS= USE_CODEC_MIKMOD=yes +MP3LIB_DESC= MP3 audio codec +MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 +MPG123_MAKE_ARGS= MP3LIB=mpg123 +OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +OGG_MAKE_ARGS_OFF= USE_CODEC_OGG=no +OPUS_LIB_DEPENDS= libopusfile.so:${PORTSDIR}/audio/opusfile +OPUS_MAKE_ARGS= USE_CODEC_OPUS=yes +OPUS_IMPLIES= OGG +TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor +TREMOR_MAKE_ARGS= VORBISLIB=tremor +TREMOR_IMPLIES= OGG +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +VORBIS_MAKE_ARGS= VORBISLIB=vorbis +VORBIS_IMPLIES= OGG +VORBISLIB_DESC= Vorbis audio codec -.if ${PORT_OPTIONS:MLAUNCHER_GTK2} -USE_GNOME+= gtk20 -MAKE_ENV+= BUILD_LAUNCHER_GTK2=yes -PLIST_SUB+= LAUNCHER_GTK2="" -.else -PLIST_SUB+= LAUNCHER_GTK2="@comment " -.endif +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MLAUNCHER_GTK3} -USE_GNOME+= gtk30 -MAKE_ENV+= BUILD_LAUNCHER_GTK3=yes -PLIST_SUB+= LAUNCHER_GTK3="" -.else -PLIST_SUB+= LAUNCHER_GTK3="@comment " +.if !${PORT_OPTIONS:MMAD} && !${PORT_OPTIONS:MMPG123} +MAKE_ARGS+= USE_CODEC_MP3=no .endif -.if ${PORT_OPTIONS:MASM} -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm -MAKE_ENV+= USE_X86_ASM=yes -.else -MAKE_ENV+= USE_X86_ASM=no +.if !${PORT_OPTIONS:MTREMOR} && !${PORT_OPTIONS:MVORBIS} +MAKE_ARGS+= USE_CODEC_VORBIS=no .endif post-extract: @@ -105,10 +84,9 @@ post-extract: 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 + libs/timidity/Makefile @${REINPLACE_CMD} -e \ - '/^USE_X86_ASM/s|^|#| ; \ - /^CPU_X86/s|^|#| ; \ + '/^CPU_X86/s|=.*|=| ; \ /^CFLAGS/s| -g | | ; \ /^CFLAGS/s| -O2 | | ;' ${WRKSRC}/${f} .endfor @@ -122,31 +100,26 @@ post-patch: .endfor do-install: -.for f in ${UH2_BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin -.endfor - ${MKDIR} ${STAGEDIR}${DATADIR}/data1 + @${MKDIR} ${STAGEDIR}${DATADIR}/data1 .for f in default.cfg hexen.rc progs.dat progs2.dat strings.txt ${INSTALL_DATA} ${WRKDIR}/data1/${f} ${STAGEDIR}${DATADIR}/data1 .endfor ${INSTALL_DATA} ${WRKDIR}/patchdat/data1/* ${STAGEDIR}${DATADIR}/data1 - @(cd ${WRKDIR} && ${COPYTREE_SHARE} portals ${STAGEDIR}${DATADIR}) -.if ${PORT_OPTIONS:MHW} + (cd ${WRKDIR} && ${COPYTREE_SHARE} portals ${STAGEDIR}${DATADIR}) + +post-install-HW-on: + ${INSTALL_PROGRAM} ${WRKSRC}/engine/hexenworld/client/glhwcl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/engine/hexenworld/client/hwcl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/engine/hexenworld/server/hwsv ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/hw_utils/hwmaster/hwmaster ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/hw ${INSTALL_DATA} ${WRKDIR}/hw/* ${STAGEDIR}${DATADIR}/hw -.endif -.if ${PORT_OPTIONS:MLAUNCHER_GTK1} - ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk1 \ - ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MLAUNCHER_GTK2} - ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk2 \ - ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MLAUNCHER_GTK3} - ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk3 \ - ${STAGEDIR}${PREFIX}/bin -.endif + +post-install-HEXEN2-on: + ${INSTALL_PROGRAM} ${WRKSRC}/engine/hexen2/glhexen2 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/engine/hexen2/hexen2 ${STAGEDIR}${PREFIX}/bin + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} Modified: head/games/uhexen2/distinfo ============================================================================== --- head/games/uhexen2/distinfo Tue Mar 8 16:04:23 2016 (r410629) +++ head/games/uhexen2/distinfo Tue Mar 8 16:05:46 2016 (r410630) @@ -1,6 +1,6 @@ -SHA256 (uhexen2/hexen2source-1.5.6.tgz) = 4cf9a32aeb521076c2a6ee0d6a14d98ba27706403360a01e93b4754eb9d7619d -SIZE (uhexen2/hexen2source-1.5.6.tgz) = 2357833 -SHA256 (uhexen2/gamedata-all-1.28.tgz) = ad40848ce4d009a9be1db551ee0e4cfbe2335ffea95bb2eccaf69314f4b8d571 -SIZE (uhexen2/gamedata-all-1.28.tgz) = 3805780 +SHA256 (uhexen2/hexen2source-1.5.7.tgz) = cdba2b9f0c24260bb06cfead8dfd3a01d9fa924b55bfaa84f79cd874bb69bbd0 +SIZE (uhexen2/hexen2source-1.5.7.tgz) = 2388892 +SHA256 (uhexen2/gamedata-all-1.29.tgz) = 5bdd2cf2fd7b96147675af3ae6cfba4f1ee7f916c95b2196e9666882cd271f89 +SIZE (uhexen2/gamedata-all-1.29.tgz) = 3703102 SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9 SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641 Modified: head/games/uhexen2/files/Makefile ============================================================================== --- head/games/uhexen2/files/Makefile Tue Mar 8 16:04:23 2016 (r410629) +++ head/games/uhexen2/files/Makefile Tue Mar 8 16:05:46 2016 (r410630) @@ -15,18 +15,3 @@ ifeq ($(BUILD_HW),yes) $(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 - cd launcher && mv h2launcher h2launcher.gtk1 - $(MAKE) -C launcher clean -endif -ifeq ($(BUILD_LAUNCHER_GTK2),yes) - $(MAKE) -C launcher - 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 Modified: head/games/uhexen2/pkg-descr ============================================================================== --- head/games/uhexen2/pkg-descr Tue Mar 8 16:04:23 2016 (r410629) +++ head/games/uhexen2/pkg-descr Tue Mar 8 16:05:46 2016 (r410630) @@ -1,15 +1,15 @@ -In 2000, Raven Software released the source code to their class based shooter -game Hexen II and its multiplayer extension HexenWorld. +In 2000, Raven Software released the source code to their class based +shooter game Hexen II and its multiplayer extension HexenWorld. -Since then, there has been some source ports of this game, most notably the -now neglected Anvil of Thyrion project. But nothing has been done for Linux -since the beginning of 2002. +Since then, there has been some source ports of this game, most notably +the now neglected Anvil of Thyrion project. But nothing has been done +for Linux since the beginning of 2002. -The Hammer of Thyrion project continues the development for Linux and BSD -people, with continued support for Windows users as well. Many bugs are fixed -and even new features are added: +The Hammer of Thyrion project continues the development for Linux and +BSD people, with continued support for Windows users as well. Many bugs +are fixed and even new features are added: -New sound modes, improved mouse handling, improved video modes, OpenGL glows -and more. +New sound modes, improved mouse handling, improved video modes, OpenGL +glows and more. WWW: http://uhexen2.sourceforge.net/ Modified: head/games/uhexen2/pkg-plist ============================================================================== --- head/games/uhexen2/pkg-plist Tue Mar 8 16:04:23 2016 (r410629) +++ head/games/uhexen2/pkg-plist Tue Mar 8 16:05:46 2016 (r410630) @@ -1,8 +1,5 @@ %%HEXEN2%%bin/glhexen2 %%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 @@ -22,7 +19,6 @@ %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081605.u28G5k8c026609>