FreeBSD Bugzilla – Attachment 81762 Details for
Bug 117048
update games/uhexen2 to version 1.4.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.45 KB, created by
Pedro F. Giffuni
on 2007-10-09 20:50:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Pedro F. Giffuni
Created:
2007-10-09 20:50:01 UTC
Size:
10.45 KB
patch
obsolete
>diff -ruN uhexen2.orig/Makefile uhexen2/Makefile >--- uhexen2.orig/Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/Makefile Mon Oct 8 15:31:54 2007 >@@ -6,8 +6,7 @@ > # > > PORTNAME= uhexen2 >-PORTVERSION= 1.4.1 >-PORTREVISION= 1 >+PORTVERSION= 1.4.2 > CATEGORIES= games > MASTER_SITES= SF > DISTNAME= hexen2source-${PORTVERSION} >@@ -46,7 +45,7 @@ > UH2_DATA= default.cfg hexen.rc pak0.pak progs.dat > UH2_DATADIR= ${WRKDIR}/hexen2demo-${PORTVERSION} > .else >-DISTFILES+= gamedata-all-1.16a${EXTRACT_SUFX} >+DISTFILES+= gamedata-all-1.19${EXTRACT_SUFX} > PLIST_SUB+= DEMO="@comment " \ > FULL="" > SUB_FILES+= pkg-message >@@ -105,7 +104,6 @@ > .endif > > post-extract: >- @${RM} -r ${WRKSRC}/docs/activision > @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} > > post-patch: >diff -ruN uhexen2.orig/distinfo uhexen2/distinfo >--- uhexen2.orig/distinfo Mon Oct 8 15:04:46 2007 >+++ uhexen2/distinfo Tue Oct 9 13:50:40 2007 >@@ -1,12 +1,9 @@ >-MD5 (uhexen2/hexen2source-1.4.1.tgz) = fe903c85565e785b853c34d04aa9e772 >-SHA256 (uhexen2/hexen2source-1.4.1.tgz) = 16e87233b9a4f624e736b3924fe33d15bfb49e1653b68a07e946eb212a60c91e >-SIZE (uhexen2/hexen2source-1.4.1.tgz) = 1977315 >-MD5 (uhexen2/gamedata-all-1.16a.tgz) = ddc49a34ca3dc5c7eba7bf1cac7271b1 >-SHA256 (uhexen2/gamedata-all-1.16a.tgz) = a25748d47fc1239e971096f6f76238c315db6523e6885db5d3032b98df49d27e >-SIZE (uhexen2/gamedata-all-1.16a.tgz) = 3703921 >-MD5 (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = 6932a1fe02145ee3362b11ddca0b36d4 >-SHA256 (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = dde1d8a9c9203a1f9d171a9ed39bbd245ec23f4e049ea584bafb5aa1b0a84652 >-SIZE (uhexen2/hexen2demo-1.4.1-linux-i586.tgz) = 18788495 >-MD5 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 91183a784f7f3ee273a04d0c7a828a77 >-SHA256 (uhexen2/hexenworld-pakfiles-0.15.tgz) = 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe >-SIZE (uhexen2/hexenworld-pakfiles-0.15.tgz) = 4956848 >+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 >diff -ruN uhexen2.orig/files/patch-hexen2__Makefile uhexen2/files/patch-hexen2__Makefile >--- uhexen2.orig/files/patch-hexen2__Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-hexen2__Makefile Tue Oct 9 13:40:28 2007 >@@ -1,29 +1,31 @@ >---- ./hexen2/Makefile.orig Fri Oct 6 13:43:32 2006 >-+++ ./hexen2/Makefile Tue Jan 9 16:56:32 2007 >-@@ -89,11 +89,11 @@ >+--- 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 >- ifeq ($(USE_X86_ASM),yes) >-@@ -125,7 +125,7 @@ >- #ARCHFLAGS:= >+@@ -176,7 +176,7 @@ >+ >+ else > >- ifndef DEBUG > -CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations > +CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations > >- HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC)) >- DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0) >-@@ -141,7 +141,9 @@ >+ 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 >diff -ruN uhexen2.orig/files/patch-hexenworld__Client__Makefile uhexen2/files/patch-hexenworld__Client__Makefile >--- uhexen2.orig/files/patch-hexenworld__Client__Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-hexenworld__Client__Makefile Tue Oct 9 13:40:52 2007 >@@ -1,29 +1,31 @@ >---- ./hexenworld/Client/Makefile.orig Fri Oct 6 13:43:35 2006 >-+++ ./hexenworld/Client/Makefile Tue Jan 9 16:56:32 2007 >-@@ -89,11 +89,11 @@ >+--- 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 >- ifeq ($(USE_X86_ASM),yes) >-@@ -125,7 +125,7 @@ >- #ARCHFLAGS:= >+@@ -176,7 +176,7 @@ >+ >+ else > >- ifndef DEBUG > -CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations > +CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations > >- HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC)) >- DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0) >-@@ -141,7 +141,9 @@ >+ 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 >diff -ruN uhexen2.orig/files/patch-hexenworld__Master__Makefile uhexen2/files/patch-hexenworld__Master__Makefile >--- uhexen2.orig/files/patch-hexenworld__Master__Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-hexenworld__Master__Makefile Mon Oct 8 16:00:03 2007 >@@ -1,18 +1,11 @@ >---- ./hexenworld/Master/Makefile.orig Fri Oct 6 13:43:35 2006 >-+++ ./hexenworld/Master/Makefile Tue Jan 9 16:56:32 2007 >-@@ -24,14 +24,11 @@ >- # Compiler flags >+--- 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 @@ > >- # Overrides for the default CPUFLAGS >--ifeq ($(MACH_TYPE),x86) >--CPUFLAGS:=-march=i386 >--endif >- # Overrides for the default ARCHFLAGS >- #ARCHFLAGS:= >+ else > >- ifndef DEBUG > -CFLAGS := $(CPUFLAGS) -O2 -Wall > +CFLAGS := $(CFLAGS) $(CPUFLAGS) -O2 -Wall >- endif > >- # Other build flags >+ ifdef NO_UNIT_AT_A_TIME >+ CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) >diff -ruN uhexen2.orig/files/patch-hexenworld__Server__Makefile uhexen2/files/patch-hexenworld__Server__Makefile >--- uhexen2.orig/files/patch-hexenworld__Server__Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-hexenworld__Server__Makefile Mon Oct 8 16:02:57 2007 >@@ -1,11 +1,11 @@ >---- ./hexenworld/Server/Makefile.orig Fri Oct 6 13:43:35 2006 >-+++ ./hexenworld/Server/Makefile Tue Jan 9 16:56:32 2007 >-@@ -30,7 +30,7 @@ >- #ARCHFLAGS:= >+--- 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 > >- HAVE_GCC_4_0:=$(shell sh $(UHEXEN2_TOP)/scripts/gcc40check.sh $(CC)) >- DISABLE_UNIT_AT_A_TIME ?=$(HAVE_GCC_4_0) >+ ifdef NO_UNIT_AT_A_TIME >+ CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) >diff -ruN uhexen2.orig/files/patch-launcher__Makefile uhexen2/files/patch-launcher__Makefile >--- uhexen2.orig/files/patch-launcher__Makefile Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-launcher__Makefile Tue Oct 9 13:55:01 2007 >@@ -1,6 +1,6 @@ >---- ./launcher/Makefile.orig Fri Oct 6 13:43:36 2006 >-+++ ./launcher/Makefile Tue Jan 9 16:56:32 2007 >-@@ -11,27 +11,11 @@ >+--- 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) > >@@ -17,15 +17,19 @@ > -ifeq ($(CC_OVERRIDE),) > -CC := $(CC_DEFAULT) > -endif >-+CC ?= gcc >++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 >--TMPNAME:= h2demo >+-H2LAUNCH:= h2demo > -else >- TMPNAME:= h2launcher >+ H2LAUNCH:= h2launcher > -endif > > ifdef GTK1 >- H2LAUNCH:= $(TMPNAME).gtk1 >+ GTK_CFLAGS:= $(shell gtk-config --cflags) >diff -ruN uhexen2.orig/files/patch-scripts__makefile.inc uhexen2/files/patch-scripts__makefile.inc >--- uhexen2.orig/files/patch-scripts__makefile.inc Mon Oct 8 15:04:46 2007 >+++ uhexen2/files/patch-scripts__makefile.inc Mon Oct 8 16:13:16 2007 >@@ -1,16 +1,15 @@ >---- ./scripts/makefile.inc.orig Fri Oct 6 13:43:36 2006 >-+++ ./scripts/makefile.inc Tue Jan 9 16:56:32 2007 >-@@ -15,7 +15,8 @@ >+--- 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 >--X11_PATH ?=/usr/X11R6 >-+X11BASE ?= /usr/X11R6 >-+X11_PATH ?= $(X11BASE) >+-X11BASE ?=/usr/X11R6 >++X11BASE ?=/usr/local > > # MinGW32 directory: > MINGWDIR ?=/mingw >-@@ -61,22 +62,7 @@ >+@@ -73,22 +73,7 @@ > endif > > # Compiler selection: >@@ -30,26 +29,7 @@ > -ifeq ($(CC_OVERRIDE),) > -CC := $(CC_DEFAULT) > -endif >-+CC ?= gcc >++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 >diff -ruN uhexen2.orig/pkg-plist uhexen2/pkg-plist >--- uhexen2.orig/pkg-plist Mon Oct 8 15:04:46 2007 >+++ uhexen2/pkg-plist Tue Oct 9 14:37:40 2007 >@@ -11,10 +11,6 @@ > %%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 >@@ -29,6 +25,7 @@ > %%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 >@@ -41,6 +38,7 @@ > %%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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=81762">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 117048
: 81762