- Update to version 1.4.3.

8 files changed, 47 insertions, 125 deletions

diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index 4e0ddaa97243..10b2b1b36cf0 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	uhexen2
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	hexen2source-${PORTVERSION}
@@ -46,7 +45,7 @@ PLIST_SUB+=	DEMO="" \
 UH2_DATA=	default.cfg hexen.rc pak0.pak progs.dat
 UH2_DATADIR=	${WRKDIR}/hexen2demo-${PORTVERSION}
 .else
-DISTFILES+=	gamedata-all-1.19${EXTRACT_SUFX}
+DISTFILES+=	gamedata-all-1.19a${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO="@comment " \
 		FULL=""
 SUB_FILES+=	pkg-message
@@ -57,10 +56,8 @@ UH2_DATADIR=	${WRKDIR}
 .if defined(WITH_HEXEN2)
 MAKE_ENV+=	BUILD_HEXEN2=yes
 PLIST_SUB+=	HEXEN2=""
-UH2_BIN+=	hexen2/glhexen2
-. if defined(WITH_X86_ASM) && ${ARCH} == "i386"
-UH2_BIN+=	hexen2/hexen2
-. endif
+UH2_BIN+=	hexen2/glhexen2 \
+		hexen2/hexen2
 .else
 PLIST_SUB+=	HEXEN2="@comment "
 .endif
@@ -72,10 +69,8 @@ DISTFILES+=	hexenworld-pakfiles-0.15${EXTRACT_SUFX}
 MAKE_ENV+=	BUILD_HW=yes
 PLIST_SUB+=	HW=""
 UH2_BIN+=	hexenworld/Client/glhwcl hexenworld/Master/hwmaster \
-		hexenworld/Server/hwsv
-. if defined(WITH_X86_ASM) && ${ARCH} == "i386"
-UH2_BIN+=	hexenworld/Client/hwcl
-. endif
+		hexenworld/Server/hwsv \
+		hexenworld/Client/hwcl
 .else
 PLIST_SUB+=	HW="@comment "
 .endif
@@ -99,9 +94,6 @@ PLIST_SUB+=	LAUNCHER_GTK2="@comment "
 .if defined(WITH_X86_ASM) && ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 MAKE_ENV+=	USE_X86_ASM=yes
-PLIST_SUB+=	X86_ASM=""
-.else
-PLIST_SUB+=	X86_ASM="@comment "
 .endif
 
 post-extract:
@@ -134,7 +126,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk1 ${PREFIX}/bin
 .endif
 .if defined(WITH_LAUNCHER_GTK2)
-	${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk2 ${PREFIX}/bin
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/games/uhexen2/distinfo b/games/uhexen2/distinfo
index bdfe1dc88f4e..fa76183eae60 100644
--- a/games/uhexen2/distinfo
+++ b/games/uhexen2/distinfo
@@ -1,9 +1,12 @@
-MD5 (uhexen2/hexen2source-1.4.2.tgz) = 97430f7f759f662c7424d33f2031e808
-SHA256 (uhexen2/hexen2source-1.4.2.tgz) = cd12e4a24edf1958e773110493a6ef67947d400eb74be2821c3b6786c7769c49
-SIZE (uhexen2/hexen2source-1.4.2.tgz) = 2062106
-MD5 (uhexen2/gamedata-all-1.19.tgz) = 3eeecab2f5d3bd362c68a6c26f990f70
-SHA256 (uhexen2/gamedata-all-1.19.tgz) = 1d291d06f3de337bc0ef13dae3d1c0d7593d5a9308a8a2451196730ffb5fe7b1
-SIZE (uhexen2/gamedata-all-1.19.tgz) = 3703620
+MD5 (uhexen2/hexen2source-1.4.3.tgz) = 426a091d6888203858f0a512ced3948c
+SHA256 (uhexen2/hexen2source-1.4.3.tgz) = bbb9ffb5380b57be7dd7fecbbd9bba71846f2f17d5614b670e1df13710f7af0d
+SIZE (uhexen2/hexen2source-1.4.3.tgz) = 2173736
+MD5 (uhexen2/gamedata-all-1.19a.tgz) = 270e2d82f67daded03d8550ff4e2f903
+SHA256 (uhexen2/gamedata-all-1.19a.tgz) = b9b9561b4155bfe3f8005315a7f8f95a567c2ebbcb2a950ad05dcb1702ac68de
+SIZE (uhexen2/gamedata-all-1.19a.tgz) = 3703488
 MD5 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 9ac598a80765daa0862893bd0aac765a
 SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9
 SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641
+MD5 (uhexen2/hexen2demo-1.4.3-linux-i586.tgz) = 50acfa7c67a5316463d89704e70cf390
+SHA256 (uhexen2/hexen2demo-1.4.3-linux-i586.tgz) = d0e07793524a16675f42a973536a19b3baf15ace2abbbbd979e2870c3e99e192
+SIZE (uhexen2/hexen2demo-1.4.3-linux-i586.tgz) = 18830708
diff --git a/games/uhexen2/files/Makefile b/games/uhexen2/files/Makefile
index de530387c93b..f2a465732964 100644
--- a/games/uhexen2/files/Makefile
+++ b/games/uhexen2/files/Makefile
@@ -16,9 +16,11 @@ ifeq ($(BUILD_HW),yes)
 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
diff --git a/games/uhexen2/files/patch-hexen2__Makefile b/games/uhexen2/files/patch-hexen2__Makefile
index 54ec06f63a20..00ad7dd1846a 100644
--- a/games/uhexen2/files/patch-hexen2__Makefile
+++ b/games/uhexen2/files/patch-hexen2__Makefile
@@ -1,6 +1,6 @@
---- hexen2/Makefile.orig	Sat Sep 15 09:16:44 2007
-+++ hexen2/Makefile	Mon Oct  8 15:56:50 2007
-@@ -113,13 +113,13 @@
+--- ./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
@@ -15,8 +15,8 @@
 +USE_X86_ASM?=no
  COMPILE_32BITS=no
  
- # build environment sanity checks
-@@ -176,7 +176,7 @@
+ # include the common dirty stuff
+@@ -179,7 +179,7 @@
  
  else
  
@@ -25,13 +25,3 @@
  
  ifdef NO_UNIT_AT_A_TIME
  CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)
-@@ -184,7 +184,9 @@
- 
- ifeq ($(OPT_EXTRA),yes)
- # Note: re-check these flags for non-ia32 machines
-+ifeq ($(MACH_TYPE),x86)
- CFLAGS := $(CFLAGS) $(call check_gcc,-falign-loops=2 -falign-jumps=2 -falign-functions=2,-malign-loops=2 -malign-jumps=2 -malign-functions=2)
-+endif
- CFLAGS := $(CFLAGS) -fomit-frame-pointer
- endif
- endif
diff --git a/games/uhexen2/files/patch-hexenworld__Client__Makefile b/games/uhexen2/files/patch-hexenworld__Client__Makefile
index ebe2b3f1f39c..78d1537f4166 100644
--- a/games/uhexen2/files/patch-hexenworld__Client__Makefile
+++ b/games/uhexen2/files/patch-hexenworld__Client__Makefile
@@ -1,6 +1,6 @@
---- hexenworld/Client/Makefile.orig	Sat Sep 15 09:16:44 2007
-+++ hexenworld/Client/Makefile	Mon Oct  8 15:51:44 2007
-@@ -113,13 +113,13 @@
+--- ./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
@@ -15,8 +15,8 @@
 +USE_X86_ASM?=no
  COMPILE_32BITS=no
  
- # build environment sanity checks
-@@ -176,7 +176,7 @@
+ # include the common dirty stuff
+@@ -167,7 +167,7 @@
  
  else
  
@@ -25,13 +25,3 @@
  
  ifdef NO_UNIT_AT_A_TIME
  CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)
-@@ -184,7 +184,9 @@
- 
- ifeq ($(OPT_EXTRA),yes)
- # Note: re-check these flags for non-ia32 machines
-+ifeq ($(MACH_TYPE),x86)
- CFLAGS := $(CFLAGS) $(call check_gcc,-falign-loops=2 -falign-jumps=2 -falign-functions=2,-malign-loops=2 -malign-jumps=2 -malign-functions=2)
-+endif
- CFLAGS := $(CFLAGS) -fomit-frame-pointer
- endif
- endif
diff --git a/games/uhexen2/files/patch-launcher__Makefile b/games/uhexen2/files/patch-launcher__Makefile
index e14a1e3927b1..88bc4a94edac 100644
--- a/games/uhexen2/files/patch-launcher__Makefile
+++ b/games/uhexen2/files/patch-launcher__Makefile
@@ -1,44 +1,11 @@
---- launcher/Makefile.orig	Mon Aug 13 10:01:46 2007
-+++ launcher/Makefile	Sun Oct 21 14:38:45 2007
-@@ -19,19 +19,7 @@
- 
- HOST_OS:=$(shell uname)
- 
--CC_DEFAULT:=gcc
--ifeq ($(origin CC),environment)
--CC_OVERRIDE:=1
--ifeq ($(CC),)
--CC_OVERRIDE:=
--endif
--endif
--ifeq ($(origin CC),command line)
--CC_OVERRIDE:=1
--endif
--ifeq ($(CC_OVERRIDE),)
--CC := $(CC_DEFAULT)
--endif
-+CC_DEFAULT:=cc
- 
- LINKER:= $(CC)
- 
-@@ -39,11 +27,7 @@
- XDELTA_FLAGS:=
- XDELTA_LINK:= -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
- 
--ifdef DEMO
--H2LAUNCH:= h2demo
--else
- H2LAUNCH:= h2launcher
--endif
- 
- ifdef GTK1
- GTK_CFLAGS:= $(shell gtk-config --cflags)
-@@ -124,7 +108,7 @@
+--- 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)
  
--$(H2LAUNCH): $(LAUNCHER_OBJS) $(LAUNCHER_MAIN) $(GUI_OBJS) $(XPATCH_OBJS)
-+$(H2LAUNCH): $(ALL_OBJECTS)
- 	@rm -f $(H2LAUNCH)
- 	$(LINKER) -o $(H2LAUNCH) $(ALL_OBJECTS) $(LDFLAGS)
+-$(BINARY): $(LAUNCHER_OBJS) $(LAUNCHER_MAIN) $(GUI_OBJS) $(XPATCH_OBJS)
++$(BINARY): $(ALL_OBJECTS)
+ 	@rm -f $(BINARY)
+ 	$(LINKER) -o $(BINARY) $(ALL_OBJECTS) $(LDFLAGS)
  
diff --git a/games/uhexen2/files/patch-scripts__makefile.inc b/games/uhexen2/files/patch-scripts__makefile.inc
index b89449a8a24c..9870a02275f1 100644
--- a/games/uhexen2/files/patch-scripts__makefile.inc
+++ b/games/uhexen2/files/patch-scripts__makefile.inc
@@ -1,35 +1,11 @@
---- scripts/makefile.inc.orig	Thu Jul 12 14:41:20 2007
-+++ scripts/makefile.inc	Mon Oct  8 16:11:27 2007
-@@ -17,7 +17,7 @@
- 
+--- 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
  
- # MinGW32 directory:
- MINGWDIR ?=/mingw
-@@ -73,22 +73,7 @@
- endif
- 
- # Compiler selection:
--# refuse cc for CC which is the default for make
--# accept environment or command line overrides.
--CC_DEFAULT:=gcc
--ifeq ($(origin CC),environment)
--CC_OVERRIDE:=1
--# watch for stale environment defs
--ifeq ($(CC),)
--CC_OVERRIDE:=
--endif
--endif
--ifeq ($(origin CC),command line)
--CC_OVERRIDE:=1
--endif
--ifeq ($(CC_OVERRIDE),)
--CC := $(CC_DEFAULT)
--endif
-+CC ?= cc
- 
- NASM ?= $(NASM_BIN)
- WINDRES ?= windres
+ # Local w32stuff directory:
+ W32STUFF :=$(UHEXEN2_TOP)/w32stuff
diff --git a/games/uhexen2/pkg-plist b/games/uhexen2/pkg-plist
index 0253a0ce0d6e..738dbfab5c51 100644
--- a/games/uhexen2/pkg-plist
+++ b/games/uhexen2/pkg-plist
@@ -1,9 +1,9 @@
 %%HEXEN2%%bin/glhexen2
 %%HW%%bin/glhwcl
-%%LAUNCHER_GTK2%%bin/h2launcher
 %%LAUNCHER_GTK1%%bin/h2launcher.gtk1
-%%X86_ASM%%%%HEXEN2%%bin/hexen2
-%%X86_ASM%%%%HW%%bin/hwcl
+%%LAUNCHER_GTK2%%bin/h2launcher.gtk2
+%%HEXEN2%%bin/hexen2
+%%HW%%bin/hwcl
 %%HW%%bin/hwmaster
 %%HW%%bin/hwsv
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT
@@ -27,6 +27,8 @@
 %%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%%/SrcNotes.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/data1/default.cfg
 %%DATADIR%%/data1/hexen.rc
@@ -39,7 +41,7 @@
 %%HW%%%%DATADIR%%/hw/default.cfg
 %%HW%%%%DATADIR%%/hw/hwprogs.dat
 %%HW%%%%DATADIR%%/hw/pak4.pak
-%%HW%%%%DATADIR%%/hw/pak4_readme.txt
+%%FULL%%%%HW%%%%DATADIR%%/hw/pak4_readme.txt
 %%HW%%%%DATADIR%%/hw/strings.txt
 %%FULL%%%%DATADIR%%/portals/default.cfg
 %%FULL%%%%DATADIR%%/portals/hexen.rc