Attachment #81762 for bug #117048

View | Details | Raw Unified | Return to bug 117048
Collapse All | Expand All




#

PORTNAME=	uhexen2
PORTVERSION=	1.4.2
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	SF
DISTNAME=	hexen2source-${PORTVERSION}

UH2_DATA=	default.cfg hexen.rc pak0.pak progs.dat
UH2_DATADIR=	${WRKDIR}/hexen2demo-${PORTVERSION}
.else
DISTFILES+=	gamedata-all-1.19${EXTRACT_SUFX}
PLIST_SUB+=	DEMO="@comment " \
		FULL=""
SUB_FILES+=	pkg-message

.endif

post-extract:
	@${RM} -r ${WRKSRC}/docs/activision
	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}

post-patch:




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/hexenworld-pakfiles-0.15.tgz) = 9ac598a80765daa0862893bd0aac765a
SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9
SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641
MD5 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 91183a784f7f3ee273a04d0c7a828a77
SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe
SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4956848




--- hexen2/Makefile.orig	Sat Sep 15 09:16:44 2007
+++ hexen2/Makefile	Mon Oct  8 15:56:50 2007
@@ -113,13 +113,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
 
 # build environment sanity checks
@@ -176,7 +176,7 @@
 
 else
 
 ifndef DEBUG
-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,)
@@ -184,7 +184,9 @@
 
 ifeq ($(OPT_EXTRA),yes)
 # Note: re-check these flags for non-ia32 machines




--- 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 @@
 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
 
 # build environment sanity checks
@@ -176,7 +176,7 @@
 
 else
 
 ifndef DEBUG
-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,)
@@ -184,7 +184,9 @@
 
 ifeq ($(OPT_EXTRA),yes)
 # Note: re-check these flags for non-ia32 machines




--- 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 @@
 # Compiler flags
 
 else
-ifeq ($(MACH_TYPE),x86)
-CPUFLAGS:=-march=i386
-endif
 # Overrides for the default ARCHFLAGS
 #ARCHFLAGS:=
 
 ifndef DEBUG
-CFLAGS := $(CPUFLAGS) -O2 -Wall
+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall
 endif
 
 ifdef NO_UNIT_AT_A_TIME
 CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)




--- 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
 
 ifndef DEBUG
-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,)




--- launcher/Makefile.orig	Mon Aug 13 08:01:46 2007
+++ launcher/Makefile	Tue Oct  9 13:54:23 2007
@@ -19,19 +19,7 @@
 
 HOST_OS:=$(shell uname)
 

-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)




--- 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 @@
 
 # Common paths:
 # X directory
-X11BASE ?=/usr/X11R6
+X11BASE ?=/usr/local
+X11_PATH ?= $(X11BASE)
 
 # MinGW32 directory:
 MINGWDIR ?=/mingw
@@ -73,22 +73,7 @@
 endif
 
 # Compiler selection:

-ifeq ($(CC_OVERRIDE),)
-CC := $(CC_DEFAULT)
-endif
+CC ?= cc
 
 NASM ?= $(NASM_BIN)
 WINDRES ?= windres
@@ -104,9 +90,6 @@
 
 # default CPU flags
 CPUFLAGS:=
-ifeq ($(MACH_TYPE),x86)
-CPUFLAGS:=-march=i586
-endif
 
 # NASM flags:
 # These are required for IA32 assembly for hexen2/hexenworld clients
@@ -121,7 +104,7 @@
 # be added to the make command
 DFLAGS := -g -Wall
 ifdef DEBUG
-CFLAGS := $(DFLAGS)
+CFLAGS := $(CFLAGS) $(DFLAGS)
 endif
 
 # the "sdl-config" command




%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COMPILE
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/Features
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/NOTES.porting
%%PORTDOCS%%%%DOCSDIR%%/NonIntel.log
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.3dfx
%%PORTDOCS%%%%DOCSDIR%%/README.AoT

%%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%%/TODO
%%DATADIR%%/data1/default.cfg
%%DATADIR%%/data1/hexen.rc

%%HW%%%%DATADIR%%/hw/default.cfg
%%HW%%%%DATADIR%%/hw/hwprogs.dat
%%HW%%%%DATADIR%%/hw/pak4.pak
%%HW%%%%DATADIR%%/hw/pak4_readme.txt
%%HW%%%%DATADIR%%/hw/strings.txt
%%FULL%%%%DATADIR%%/portals/default.cfg
%%FULL%%%%DATADIR%%/portals/hexen.rc

Return to bug 117048

Lines 6-13 Link Here

(-)uhexen2/Makefile (-4 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= uhexen2	8	PORTNAME= uhexen2
9	PORTVERSION= 1.4.1	9	PORTVERSION= 1.4.2
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13	DISTNAME= hexen2source-${PORTVERSION}	12	DISTNAME= hexen2source-${PORTVERSION}
Lines 46-52 Link Here
46	UH2_DATA= default.cfg hexen.rc pak0.pak progs.dat	45	UH2_DATA= default.cfg hexen.rc pak0.pak progs.dat
47	UH2_DATADIR= ${WRKDIR}/hexen2demo-${PORTVERSION}	46	UH2_DATADIR= ${WRKDIR}/hexen2demo-${PORTVERSION}
48	.else	47	.else
49	DISTFILES+= gamedata-all-1.16a${EXTRACT_SUFX}	48	DISTFILES+= gamedata-all-1.19${EXTRACT_SUFX}
50	PLIST_SUB+= DEMO="@comment " \	49	PLIST_SUB+= DEMO="@comment " \
51	FULL=""	50	FULL=""
52	SUB_FILES+= pkg-message	51	SUB_FILES+= pkg-message
Lines 105-111 Link Here
105	.endif	104	.endif
106		105
107	post-extract:	106	post-extract:
108	@${RM} -r ${WRKSRC}/docs/activision
109	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}	107	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
110		108
111	post-patch:	109	post-patch:

Lines 1-12 Link Here

(-)uhexen2/distinfo (-12 / +9 lines)
1	MD5 (uhexen2/hexen2source-1.4.1.tgz) = fe903c85565e785b853c34d04aa9e772	1	MD5 (uhexen2/hexen2source-1.4.2.tgz) = 97430f7f759f662c7424d33f2031e808
2	SHA256 (uhexen2/hexen2source-1.4.1.tgz) = 16e87233b9a4f624e736b3924fe33d15bfb49e1653b68a07e946eb212a60c91e	2	SHA256 (uhexen2/hexen2source-1.4.2.tgz) = cd12e4a24edf1958e773110493a6ef67947d400eb74be2821c3b6786c7769c49
3	SIZE (uhexen2/hexen2source-1.4.1.tgz) = 1977315	3	SIZE (uhexen2/hexen2source-1.4.2.tgz) = 2062106
4	MD5 (uhexen2/gamedata-all-1.16a.tgz) = ddc49a34ca3dc5c7eba7bf1cac7271b1	4	MD5 (uhexen2/gamedata-all-1.19.tgz) = 3eeecab2f5d3bd362c68a6c26f990f70
5	SHA256 (uhexen2/gamedata-all-1.16a.tgz) = a25748d47fc1239e971096f6f76238c315db6523e6885db5d3032b98df49d27e	5	SHA256 (uhexen2/gamedata-all-1.19.tgz) = 1d291d06f3de337bc0ef13dae3d1c0d7593d5a9308a8a2451196730ffb5fe7b1
6	SIZE (uhexen2/gamedata-all-1.16a.tgz) = 3703921	6	SIZE (uhexen2/gamedata-all-1.19.tgz) = 3703620
7	MD5 (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = 6932a1fe02145ee3362b11ddca0b36d4	7	MD5 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 9ac598a80765daa0862893bd0aac765a
8	SHA256 (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = dde1d8a9c9203a1f9d171a9ed39bbd245ec23f4e049ea584bafb5aa1b0a84652	8	SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9
9	SIZE (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = 18788495	9	SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4948641
10	MD5 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 91183a784f7f3ee273a04d0c7a828a77
11	SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe
12	SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4956848

Lines 1-29 Link Here

(-)uhexen2/files/patch-hexen2__Makefile (-10 / +12 lines)
1	--- ./hexen2/Makefile.orig Fri Oct 6 13:43:32 2006	1	--- hexen2/Makefile.orig Sat Sep 15 09:16:44 2007
2	+++ ./hexen2/Makefile Tue Jan 9 16:56:32 2007	2	+++ hexen2/Makefile Mon Oct 8 15:56:50 2007
3	@@ -89,11 +89,11 @@	3	@@ -113,13 +113,13 @@
4	USE_SDLAUDIO=yes	4	USE_SDLAUDIO=yes
5	USE_MIDI=yes	5	USE_MIDI=yes
6	USE_CDAUDIO=yes	6	USE_CDAUDIO=yes
7	-USE_SDLCD=no	7	-USE_SDLCD=no
8	+USE_SDLCD=yes	8	+USE_SDLCD=yes
9	WITH_SPLASHES=yes	9	WITH_SPLASHES=yes
		10	LINK_DIRECTX=no
10	OPT_EXTRA=yes	11	OPT_EXTRA=yes
11	LINK_GL_LIBS=no	12	LINK_GL_LIBS=no
		13	USE_3DFXGAMMA=yes
12	-USE_X86_ASM=yes	14	-USE_X86_ASM=yes
13	+USE_X86_ASM?=no	15	+USE_X86_ASM?=no
		16	COMPILE_32BITS=no
14		17
15	# build environment sanity checks	18	# build environment sanity checks
16	ifeq ($(USE_X86_ASM),yes)	19	@@ -176,7 +176,7 @@
17	@@ -125,7 +125,7 @@	20
18	#ARCHFLAGS:=	21	else
19		22
20	ifndef DEBUG
21	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	23	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
22	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	24	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
23		25
24	HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC))	26	ifdef NO_UNIT_AT_A_TIME
25	DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0)	27	CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)
26	@@ -141,7 +141,9 @@	28	@@ -184,7 +184,9 @@
27		29
28	ifeq ($(OPT_EXTRA),yes)	30	ifeq ($(OPT_EXTRA),yes)
29	# Note: re-check these flags for non-ia32 machines	31	# Note: re-check these flags for non-ia32 machines

Lines 1-29 Link Here

(-)uhexen2/files/patch-hexenworld__Client__Makefile (-10 / +12 lines)
1	--- ./hexenworld/Client/Makefile.orig Fri Oct 6 13:43:35 2006	1	--- hexenworld/Client/Makefile.orig Sat Sep 15 09:16:44 2007
2	+++ ./hexenworld/Client/Makefile Tue Jan 9 16:56:32 2007	2	+++ hexenworld/Client/Makefile Mon Oct 8 15:51:44 2007
3	@@ -89,11 +89,11 @@	3	@@ -113,13 +113,13 @@
4	USE_SDLAUDIO=yes	4	USE_SDLAUDIO=yes
5	USE_MIDI=yes	5	USE_MIDI=yes
6	USE_CDAUDIO=yes	6	USE_CDAUDIO=yes
7	-USE_SDLCD=no	7	-USE_SDLCD=no
8	+USE_SDLCD=yes	8	+USE_SDLCD=yes
9	WITH_SPLASHES=yes	9	WITH_SPLASHES=yes
		10	LINK_DIRECTX=no
10	OPT_EXTRA=yes	11	OPT_EXTRA=yes
11	LINK_GL_LIBS=no	12	LINK_GL_LIBS=no
		13	USE_3DFXGAMMA=yes
12	-USE_X86_ASM=yes	14	-USE_X86_ASM=yes
13	+USE_X86_ASM?=no	15	+USE_X86_ASM?=no
		16	COMPILE_32BITS=no
14		17
15	# build environment sanity checks	18	# build environment sanity checks
16	ifeq ($(USE_X86_ASM),yes)	19	@@ -176,7 +176,7 @@
17	@@ -125,7 +125,7 @@	20
18	#ARCHFLAGS:=	21	else
19		22
20	ifndef DEBUG
21	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	23	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
22	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	24	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
23		25
24	HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC))	26	ifdef NO_UNIT_AT_A_TIME
25	DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0)	27	CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)
26	@@ -141,7 +141,9 @@	28	@@ -184,7 +184,9 @@
27		29
28	ifeq ($(OPT_EXTRA),yes)	30	ifeq ($(OPT_EXTRA),yes)
29	# Note: re-check these flags for non-ia32 machines	31	# Note: re-check these flags for non-ia32 machines

Lines 1-18 Link Here

(-)uhexen2/files/patch-hexenworld__Master__Makefile (-13 / +6 lines)
1	--- ./hexenworld/Master/Makefile.orig Fri Oct 6 13:43:35 2006	1	--- hexenworld/Master/Makefile.orig Thu Jul 12 14:41:20 2007
2	+++ ./hexenworld/Master/Makefile Tue Jan 9 16:56:32 2007	2	+++ hexenworld/Master/Makefile Mon Oct 8 15:58:40 2007
3	@@ -24,14 +24,11 @@	3	@@ -41,7 +41,7 @@
4	# Compiler flags
5		4
6	# Overrides for the default CPUFLAGS	5	else
7	-ifeq ($(MACH_TYPE),x86)
8	-CPUFLAGS:=-march=i386
9	-endif
10	# Overrides for the default ARCHFLAGS
11	#ARCHFLAGS:=
12		6
13	ifndef DEBUG
14	-CFLAGS := $(CPUFLAGS) -O2 -Wall	7	-CFLAGS := $(CPUFLAGS) -O2 -Wall
15	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall	8	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall
16	endif
17		9
18	# Other build flags	10	ifdef NO_UNIT_AT_A_TIME
		11	CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)

Lines 1-11 Link Here

(-)uhexen2/files/patch-hexenworld__Server__Makefile (-7 / +7 lines)
1	--- ./hexenworld/Server/Makefile.orig Fri Oct 6 13:43:35 2006	1	--- hexenworld/Server/Makefile.orig Thu Jul 12 14:41:20 2007
2	+++ ./hexenworld/Server/Makefile Tue Jan 9 16:56:32 2007	2	+++ hexenworld/Server/Makefile Mon Oct 8 16:01:34 2007
3	@@ -30,7 +30,7 @@	3	@@ -64,7 +64,7 @@
4	#ARCHFLAGS:=	4
		5	else
5		6
6	ifndef DEBUG
7	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	7	-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
8	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations	8	+CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations
9		9
10	HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC))	10	ifdef NO_UNIT_AT_A_TIME
11	DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0)	11	CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,)

Lines 1-6 Link Here

(-)uhexen2/files/patch-launcher__Makefile (-7 / +11 lines)
1	--- ./launcher/Makefile.orig Fri Oct 6 13:43:36 2006	1	--- launcher/Makefile.orig Mon Aug 13 08:01:46 2007
2	+++ ./launcher/Makefile Tue Jan 9 16:56:32 2007	2	+++ launcher/Makefile Tue Oct 9 13:54:23 2007
3	@@ -11,27 +11,11 @@	3	@@ -19,19 +19,7 @@
4		4
5	HOST_OS:=$(shell uname)	5	HOST_OS:=$(shell uname)
6		6
Lines 17-31 Link Here
17	-ifeq ($(CC_OVERRIDE),)	17	-ifeq ($(CC_OVERRIDE),)
18	-CC := $(CC_DEFAULT)	18	-CC := $(CC_DEFAULT)
19	-endif	19	-endif
20	+CC ?= gcc	20	+CC_DEFAULT:=cc
21		21
22	LINKER:= $(CC)	22	LINKER:= $(CC)
23		23
		24	@@ -39,11 +27,7 @@
		25	XDELTA_FLAGS:=
		26	XDELTA_LINK:= -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
		27
24	-ifdef DEMO	28	-ifdef DEMO
25	-TMPNAME:= h2demo	29	-H2LAUNCH:= h2demo
26	-else	30	-else
27	TMPNAME:= h2launcher	31	H2LAUNCH:= h2launcher
28	-endif	32	-endif
29		33
30	ifdef GTK1	34	ifdef GTK1
31	H2LAUNCH:= $(TMPNAME).gtk1	35	GTK_CFLAGS:= $(shell gtk-config --cflags)

Lines 1-16 Link Here

(-)uhexen2/files/patch-scripts__makefile.inc (-27 / +7 lines)
1	--- ./scripts/makefile.inc.orig Fri Oct 6 13:43:36 2006	1	--- scripts/makefile.inc.orig Thu Jul 12 14:41:20 2007
2	+++ ./scripts/makefile.inc Tue Jan 9 16:56:32 2007	2	+++ scripts/makefile.inc Mon Oct 8 16:11:27 2007
3	@@ -15,7 +15,8 @@	3	@@ -17,7 +17,7 @@
4		4
5	# Common paths:	5	# Common paths:
6	# X directory	6	# X directory
7	-X11_PATH ?=/usr/X11R6	7	-X11BASE ?=/usr/X11R6
8	+X11BASE ?= /usr/X11R6	8	+X11BASE ?=/usr/local
9	+X11_PATH ?= $(X11BASE)
10		9
11	# MinGW32 directory:	10	# MinGW32 directory:
12	MINGWDIR ?=/mingw	11	MINGWDIR ?=/mingw
13	@@ -61,22 +62,7 @@	12	@@ -73,22 +73,7 @@
14	endif	13	endif
15		14
16	# Compiler selection:	15	# Compiler selection:
Lines 30-55 Link Here
30	-ifeq ($(CC_OVERRIDE),)	29	-ifeq ($(CC_OVERRIDE),)
31	-CC := $(CC_DEFAULT)	30	-CC := $(CC_DEFAULT)
32	-endif	31	-endif
33	+CC ?= gcc	32	+CC ?= cc
34		33
35	NASM ?= $(NASM_BIN)	34	NASM ?= $(NASM_BIN)
36	WINDRES ?= windres	35	WINDRES ?= windres
37	@@ -104,9 +90,6 @@
38
39	# default CPU flags
40	CPUFLAGS:=
41	-ifeq ($(MACH_TYPE),x86)
42	-CPUFLAGS:=-march=i586
43	-endif
44
45	# NASM flags:
46	# These are required for IA32 assembly for hexen2/hexenworld clients
47	@@ -121,7 +104,7 @@
48	# be added to the make command
49	DFLAGS := -g -Wall
50	ifdef DEBUG
51	-CFLAGS := $(DFLAGS)
52	+CFLAGS := $(CFLAGS) $(DFLAGS)
53	endif
54
55	# the "sdl-config" command

Lines 11-20 Link Here

(-)uhexen2/pkg-plist (-4 / +2 lines)
11	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	11	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
12	%%PORTDOCS%%%%DOCSDIR%%/COMPILE	12	%%PORTDOCS%%%%DOCSDIR%%/COMPILE
13	%%PORTDOCS%%%%DOCSDIR%%/COPYING	13	%%PORTDOCS%%%%DOCSDIR%%/COPYING
14	%%PORTDOCS%%%%DOCSDIR%%/Features
15	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
16	%%PORTDOCS%%%%DOCSDIR%%/NOTES.porting
17	%%PORTDOCS%%%%DOCSDIR%%/NonIntel.log
18	%%PORTDOCS%%%%DOCSDIR%%/README	14	%%PORTDOCS%%%%DOCSDIR%%/README
19	%%PORTDOCS%%%%DOCSDIR%%/README.3dfx	15	%%PORTDOCS%%%%DOCSDIR%%/README.3dfx
20	%%PORTDOCS%%%%DOCSDIR%%/README.AoT	16	%%PORTDOCS%%%%DOCSDIR%%/README.AoT
Lines 29-34 Link Here
29	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.3.0	25	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.3.0
30	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.0	26	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.0
31	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.1	27	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.1
		28	%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-1.4.2
32	%%PORTDOCS%%%%DOCSDIR%%/TODO	29	%%PORTDOCS%%%%DOCSDIR%%/TODO
33	%%DATADIR%%/data1/default.cfg	30	%%DATADIR%%/data1/default.cfg
34	%%DATADIR%%/data1/hexen.rc	31	%%DATADIR%%/data1/hexen.rc
Lines 41-46 Link Here
41	%%HW%%%%DATADIR%%/hw/default.cfg	38	%%HW%%%%DATADIR%%/hw/default.cfg
42	%%HW%%%%DATADIR%%/hw/hwprogs.dat	39	%%HW%%%%DATADIR%%/hw/hwprogs.dat
43	%%HW%%%%DATADIR%%/hw/pak4.pak	40	%%HW%%%%DATADIR%%/hw/pak4.pak
		41	%%HW%%%%DATADIR%%/hw/pak4_readme.txt
44	%%HW%%%%DATADIR%%/hw/strings.txt	42	%%HW%%%%DATADIR%%/hw/strings.txt
45	%%FULL%%%%DATADIR%%/portals/default.cfg	43	%%FULL%%%%DATADIR%%/portals/default.cfg
46	%%FULL%%%%DATADIR%%/portals/hexen.rc	44	%%FULL%%%%DATADIR%%/portals/hexen.rc