On Mon, Dec 26, 2016 at 11:35:43AM +0000, Edd Barrett wrote:
> I've always stripped off -g when I see it. Perhaps another porter can comment.
>
>
>
> On 26 December 2016 11:16:19 GMT+00:00, Jonathan Gray <[email protected]> wrote:
> >On Mon, Dec 26, 2016 at 10:31:39AM +0000, Edd Barrett wrote:
> >> Hi,
> >>
> >> I don't have the hexen data to hand, but this looks good.
> >>
> >> I notice that we are building with -g, let's kill that.
> >
> >I played a few levels of sp and had a look at the various dm levels.
> >Why not -g?, installed binary size of glhexen2 is only around 700KB.
>
Here is a version that continues to remove -g in patches:
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 27 Jun 2015 10:10:23 -0000 1.4
+++ Makefile 26 Dec 2016 03:10:52 -0000
@@ -2,11 +2,10 @@
COMMENT = Hexen II: Hammer of Thyrion
-V = 1.5.6
+V = 1.5.8
DISTNAME = hexen2source-${V}
PKGNAME = uhexen2-${V}
EXTRACT_SUFX = .tgz
-REVISION = 2
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
hexen2-${V}-linux-i586.tgz
@@ -26,14 +25,9 @@ BUILD_DEPENDS = devel/nasm
LIB_DEPENDS = devel/sdl \
audio/libmad \
- audio/libvorbis \
- x11/gtk+2
+ audio/libvorbis
-WANTLIB += SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 intl m mad ogg pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pthread vorbis vorbisfile z
+WANTLIB += SDL c m mad ogg pthread vorbis vorbisfile
USE_GMAKE = Yes
MAKE_FLAGS += CC=${CC}
@@ -48,7 +42,6 @@ do-build:
cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} hw
cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} clean
cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} glhw
- cd ${WRKBUILD}/launcher && ${DOMAKE}
cd ${WRKBUILD}/h2patch && ${DOMAKE}
cd ${WRKBUILD}/hw_utils/hwmaster && ${DOMAKE}
cd ${WRKBUILD}/hw_utils/hwmquery && ${DOMAKE}
@@ -60,7 +53,6 @@ BINS = engine/hexen2/hexen2 \
engine/hexenworld/client/hwcl \
engine/hexenworld/client/glhwcl \
engine/hexenworld/server/hwsv \
- launcher/h2launcher \
h2patch/h2patch \
hw_utils/hwmaster/hwmaster \
hw_utils/hwmquery/hwmquery \
@@ -77,7 +69,8 @@ do-install:
.for B in ${BINS}
# overwriting linux binaries as we go...
${INSTALL_PROGRAM} ${WRKBUILD}/${B} ${DATA}
- echo "#!/bin/sh\ncd ${TRUEDATA} && ./${B:T}\n" > ${PREFIX}/bin/${B:T}
+ echo "#!/bin/sh\ncd ${TRUEDATA} && ./${B:T} \"\$$@\"\n" \
+ > ${PREFIX}/bin/${B:T}
chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/${B:T}
chmod +x ${PREFIX}/bin/${B:T}
.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/uhexen2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 30 May 2014 15:25:48 -0000 1.1.1.1
+++ distinfo 26 Dec 2016 02:16:19 -0000
@@ -1,4 +1,4 @@
-SHA256 (hexen2-1.5.6-linux-i586.tgz) =
O1cQK6uTrwWvJ6XyGgkl7fjGnpqI8+BF+5T7xM9otGQ=
-SHA256 (hexen2source-1.5.6.tgz) = TPmjKutSEHbCpu4NahTZi6J3BkAzYKAek7R1TrnXYZ0=
-SIZE (hexen2-1.5.6-linux-i586.tgz) = 4688507
-SIZE (hexen2source-1.5.6.tgz) = 2357833
+SHA256 (hexen2-1.5.8-linux-i586.tgz) =
D2aTVlfAxPPjmy8IcZ/l+Sa+K5VNxYM0pl7eslDVFgM=
+SHA256 (hexen2source-1.5.8.tgz) = ++bQW0oQuC0YF/rszBiZapOybQgU/k5fbnXZSGJmBGM=
+SIZE (hexen2-1.5.8-linux-i586.tgz) = 4631311
+SIZE (hexen2source-1.5.8.tgz) = 2473776
Index: patches/patch-docs_README
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-docs_README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-docs_README
--- patches/patch-docs_README 30 May 2014 15:25:48 -0000 1.1.1.1
+++ patches/patch-docs_README 26 Dec 2016 02:28:16 -0000
@@ -2,16 +2,16 @@ $OpenBSD: patch-docs_README,v 1.1.1.1 20
We only build GL clients.
---- docs/README.orig Sat May 24 02:12:36 2014
-+++ docs/README Sat May 24 02:13:01 2014
-@@ -96,10 +96,8 @@ b. Manual install/update of data files:
+--- docs/README.orig Sat Apr 23 18:55:42 2016
++++ docs/README Mon Dec 26 13:26:09 2016
+@@ -85,10 +85,8 @@ data doesn't need patching.
- Here are the game binaries' names:
+ Here are the game binaries' names:
-- hexen2 - Hexen II (software rendering)
- glhexen2 - Hexen II (opengl rendering)
- h2ded - Hexen II Dedicated server
-- hwcl - HexenWorld Client (software rendering)
- glhwcl - HexenWorld Client (opengl rendering)
- hwsv - HexenWorld Server
- hwmaster- HexenWorld Master Server
+- hexen2 - Hexen II (software rendering)
+ glhexen2 - Hexen II (opengl rendering)
+ h2ded - Hexen II Dedicated server
+- hwcl - HexenWorld Client (software rendering)
+ glhwcl - HexenWorld Client (opengl rendering)
+ hwsv - HexenWorld Server
+ hwmaster - HexenWorld Master Server
Index: patches/patch-engine_h2shared_snd_sys_h
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_h2shared_snd_sys_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-engine_h2shared_snd_sys_h
--- patches/patch-engine_h2shared_snd_sys_h 27 Jun 2015 10:10:23 -0000
1.1
+++ patches/patch-engine_h2shared_snd_sys_h 26 Dec 2016 02:27:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-engine_h2shared_snd_sys_h,v 1.1 2015/06/27 10:10:23 ratchov
Exp $
---- engine/h2shared/snd_sys.h.orig Fri Jun 26 18:28:28 2015
-+++ engine/h2shared/snd_sys.h Fri Jun 26 18:28:51 2015
-@@ -47,7 +47,7 @@
+--- engine/h2shared/snd_sys.h.orig Sun Jan 10 19:51:45 2016
++++ engine/h2shared/snd_sys.h Mon Dec 26 13:16:56 2016
+@@ -48,7 +48,7 @@
#if defined(NO_SUN_AUDIO)
#define HAVE_SUN_SOUND 0
/* add more systems with SUN audio here */
Index: patches/patch-engine_hexen2_Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-engine_hexen2_Makefile
--- patches/patch-engine_hexen2_Makefile 30 May 2014 15:25:48 -0000
1.1.1.1
+++ patches/patch-engine_hexen2_Makefile 31 Dec 2016 09:45:12 -0000
@@ -2,18 +2,18 @@ $OpenBSD: patch-engine_hexen2_Makefile,v
Use standard optimisations.
---- engine/hexen2/Makefile.orig Wed Mar 6 09:21:08 2013
-+++ engine/hexen2/Makefile Sat May 24 01:19:23 2014
-@@ -130,7 +130,7 @@ USE_CODEC_VORBIS=yes
- USE_CODEC_OPUS=no
- # either timidity or wildmidi (both possible
+--- engine/hexen2/Makefile.orig Mon Jul 25 06:40:21 2016
++++ engine/hexen2/Makefile Sat Dec 31 20:43:29 2016
+@@ -133,7 +133,7 @@ USE_CODEC_MODPLUG=no
+ USE_CODEC_UMX=no
+ # either timidity (preferred) or wildmidi (both possible
# but not needed nor meaningful)
-USE_CODEC_TIMIDITY=yes
+USE_CODEC_TIMIDITY=no
USE_CODEC_WILDMIDI=no
# compile timidity with DLS instruments support? (no:
# the dls code isn't good enough and isn't used in unix
-@@ -186,15 +186,7 @@ endif
+@@ -194,12 +194,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
@@ -23,10 +23,7 @@ Use standard optimisations.
-# optimization flags
-CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
-endif
--
--CPPFLAGS=
--LDFLAGS =
+CFLAGS += -Wall
- # compiler includes
- INCLUDES= -I. -I$(COMMONDIR) -I$(UHEXEN2_SHARED)
+ CPPFLAGS=
+ LDFLAGS =
Index: patches/patch-engine_hexen2_server_Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_server_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-engine_hexen2_server_Makefile
--- patches/patch-engine_hexen2_server_Makefile 30 May 2014 15:25:48 -0000
1.1.1.1
+++ patches/patch-engine_hexen2_server_Makefile 31 Dec 2016 09:45:12 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-engine_hexen2_server_Mak
Use standard optimisations.
---- engine/hexen2/server/Makefile.orig Sat May 24 14:49:52 2014
-+++ engine/hexen2/server/Makefile Sat May 24 14:50:02 2014
-@@ -69,15 +69,7 @@ endif
+--- engine/hexen2/server/Makefile.orig Mon Jul 25 06:35:24 2016
++++ engine/hexen2/server/Makefile Sat Dec 31 20:44:08 2016
+@@ -66,12 +66,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
@@ -14,10 +14,7 @@ Use standard optimisations.
-# optimization flags
-CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
-endif
--
--CPPFLAGS=
--LDFLAGS =
+CFLAGS += -Wall
- # compiler includes
- INCLUDES= -I. -I.. -I$(COMMONDIR) -I$(UHEXEN2_SHARED)
+ CPPFLAGS=
+ LDFLAGS =
Index: patches/patch-engine_hexenworld_client_Makefile
===================================================================
RCS file:
/cvs/ports/games/uhexen2/patches/patch-engine_hexenworld_client_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-engine_hexenworld_client_Makefile
--- patches/patch-engine_hexenworld_client_Makefile 30 May 2014 15:25:48
-0000 1.1.1.1
+++ patches/patch-engine_hexenworld_client_Makefile 31 Dec 2016 09:45:34
-0000
@@ -2,18 +2,18 @@ $OpenBSD: patch-engine_hexenworld_client
Disable internal timidity. Use standard optimisations.
---- engine/hexenworld/client/Makefile.orig Wed Mar 6 09:21:08 2013
-+++ engine/hexenworld/client/Makefile Sat May 24 01:19:43 2014
-@@ -123,7 +123,7 @@ USE_CODEC_VORBIS=yes
- USE_CODEC_OPUS=no
- # either timidity or wildmidi (both possible
+--- engine/hexenworld/client/Makefile.orig Mon Jul 25 06:40:21 2016
++++ engine/hexenworld/client/Makefile Sat Dec 31 20:44:19 2016
+@@ -126,7 +126,7 @@ USE_CODEC_MODPLUG=no
+ USE_CODEC_UMX=no
+ # either timidity (preferred) or wildmidi (both possible
# but not needed nor meaningful)
-USE_CODEC_TIMIDITY=yes
+USE_CODEC_TIMIDITY=no
USE_CODEC_WILDMIDI=no
# compile timidity with DLS instruments support? (no:
# the dls code isn't good enough and isn't used in unix
-@@ -154,15 +154,7 @@ endif
+@@ -157,12 +157,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
@@ -23,10 +23,7 @@ Disable internal timidity. Use standard
-# optimization flags
-CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
-endif
--
--CPPFLAGS=
--LDFLAGS =
+CFLAGS += -Wall
- # compiler includes
- INCLUDES= -I. -I$(COMMON_HW) -I$(COMMONDIR) -I$(UHEXEN2_SHARED)
+ CPPFLAGS=
+ LDFLAGS =
Index: patches/patch-engine_hexenworld_server_Makefile
===================================================================
RCS file:
/cvs/ports/games/uhexen2/patches/patch-engine_hexenworld_server_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-engine_hexenworld_server_Makefile
--- patches/patch-engine_hexenworld_server_Makefile 30 May 2014 15:25:48
-0000 1.1.1.1
+++ patches/patch-engine_hexenworld_server_Makefile 31 Dec 2016 09:45:12
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-engine_hexenworld_server
Use standard optimisations.
---- engine/hexenworld/server/Makefile.orig Thu Jan 10 18:04:20 2013
-+++ engine/hexenworld/server/Makefile Sat May 24 01:19:33 2014
-@@ -62,15 +62,7 @@ endif
+--- engine/hexenworld/server/Makefile.orig Mon Jul 25 06:35:24 2016
++++ engine/hexenworld/server/Makefile Sat Dec 31 20:44:37 2016
+@@ -59,12 +59,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
@@ -14,10 +14,7 @@ Use standard optimisations.
-# optimization flags
-CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
-endif
--
--CPPFLAGS=
--LDFLAGS =
+CFLAGS += -Wall
- # compiler includes
- INCLUDES= -I. -I$(COMMON_HW) -I$(COMMONDIR) -I$(UHEXEN2_SHARED)
+ CPPFLAGS=
+ LDFLAGS =
Index: patches/patch-hw_utils_hwmaster_Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwmaster_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-hw_utils_hwmaster_Makefile
--- patches/patch-hw_utils_hwmaster_Makefile 30 May 2014 15:25:48 -0000
1.1.1.1
+++ patches/patch-hw_utils_hwmaster_Makefile 26 Dec 2016 02:27:55 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-hw_utils_hwmaster_Makefi
Use standard optimisations.
---- hw_utils/hwmaster/Makefile.orig Sat May 24 01:11:53 2014
-+++ hw_utils/hwmaster/Makefile Sat May 24 01:12:34 2014
-@@ -50,14 +50,9 @@ endif
+--- hw_utils/hwmaster/Makefile.orig Tue Apr 19 00:03:18 2016
++++ hw_utils/hwmaster/Makefile Mon Dec 26 13:16:56 2016
+@@ -46,14 +46,9 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
Index: patches/patch-hw_utils_hwmquery_Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwmquery_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-hw_utils_hwmquery_Makefile
--- patches/patch-hw_utils_hwmquery_Makefile 30 May 2014 15:25:48 -0000
1.1.1.1
+++ patches/patch-hw_utils_hwmquery_Makefile 26 Dec 2016 02:27:55 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-hw_utils_hwmquery_Makefi
Use standard optimisations.
---- hw_utils/hwmquery/Makefile.orig Thu Jan 3 18:28:36 2013
-+++ hw_utils/hwmquery/Makefile Sat May 24 01:18:54 2014
-@@ -50,14 +50,7 @@ endif
+--- hw_utils/hwmquery/Makefile.orig Tue Apr 19 00:03:18 2016
++++ hw_utils/hwmquery/Makefile Mon Dec 26 13:16:56 2016
+@@ -46,14 +46,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
Index: patches/patch-hw_utils_hwrcon_Makefile
===================================================================
RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwrcon_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-hw_utils_hwrcon_Makefile
--- patches/patch-hw_utils_hwrcon_Makefile 30 May 2014 15:25:48 -0000
1.1.1.1
+++ patches/patch-hw_utils_hwrcon_Makefile 26 Dec 2016 02:27:55 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-hw_utils_hwrcon_Makefile
Use standard optimisations.
---- hw_utils/hwrcon/Makefile.orig Sat May 24 01:15:52 2014
-+++ hw_utils/hwrcon/Makefile Sat May 24 01:16:13 2014
-@@ -51,14 +51,7 @@ endif
+--- hw_utils/hwrcon/Makefile.orig Tue Apr 19 00:03:18 2016
++++ hw_utils/hwrcon/Makefile Mon Dec 26 13:16:56 2016
+@@ -47,14 +47,7 @@ endif
# Overrides for the default CPUFLAGS
CPUFLAGS=$(CPU_X86)
Index: patches/patch-launcher_Makefile
===================================================================
RCS file: patches/patch-launcher_Makefile
diff -N patches/patch-launcher_Makefile
--- patches/patch-launcher_Makefile 30 May 2014 15:25:48 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-launcher_Makefile,v 1.1.1.1 2014/05/30 15:25:48 edd Exp $
-
-Use standard optimisations.
-
---- launcher/Makefile.orig Sat May 24 00:51:35 2014
-+++ launcher/Makefile Sat May 24 00:52:06 2014
-@@ -60,13 +60,7 @@ PTHREAD_LIBS = $(shell sh $(UHEXEN2_TOP)/scripts/pthr
-
- CPUFLAGS=
-
--CFLAGS += -g -Wall
--CFLAGS += $(CPUFLAGS)
--ifdef DEBUG
--CFLAGS += -DDEBUG=1
--else
--CFLAGS += -O2 -DNDEBUG=1
--endif
-+CFLAGS += -Wall
- XDFLAGS +=$(CFLAGS)
-
- CFLAGS += -I. -I$(UHEXEN2_SHARED)
Index: patches/patch-launcher_launcher_defs_h
===================================================================
RCS file: patches/patch-launcher_launcher_defs_h
diff -N patches/patch-launcher_launcher_defs_h
--- patches/patch-launcher_launcher_defs_h 27 Jun 2015 10:10:23 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-launcher_launcher_defs_h,v 1.1 2015/06/27 10:10:23 ratchov Exp
$
---- launcher/launcher_defs.h.orig Fri Jun 26 18:29:39 2015
-+++ launcher/launcher_defs.h Fri Jun 26 18:29:53 2015
-@@ -76,7 +76,7 @@
- #else
- #define HAVE_OSS_SOUND 0
- #endif
--#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun) ||
defined(sun)
-+#if defined(__NetBSD__) || defined(__sun) || defined(sun)
- #define HAVE_SUN_SOUND 1
- #else
- #define HAVE_SUN_SOUND 0
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uhexen2/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 17 Jun 2014 23:57:29 -0000 1.2
+++ pkg/PLIST 26 Dec 2016 02:32:57 -0000
@@ -2,7 +2,6 @@
bin/glhexen2
bin/glhwcl
bin/h2ded
-bin/h2launcher
bin/h2patch
bin/hexen2
bin/hwcl
@@ -23,7 +22,6 @@ share/doc/uhexen2/Features
share/doc/uhexen2/README
share/doc/uhexen2/README.3dfx
share/doc/uhexen2/README.AoT
-share/doc/uhexen2/README.launcher
share/doc/uhexen2/README.music
share/doc/uhexen2/ReleaseNotes
share/doc/uhexen2/ReleaseNotes.old
@@ -57,13 +55,13 @@ share/uhexen2/data1/maps/romeric5.ent
share/uhexen2/data1/maps/romeric5.txt
share/uhexen2/data1/maps/tower.ent
share/uhexen2/data1/maps/tower.txt
+share/uhexen2/data1/music/
share/uhexen2/data1/progs.dat
share/uhexen2/data1/progs2.dat
share/uhexen2/data1/strings.txt
@bin share/uhexen2/glhexen2
@bin share/uhexen2/glhwcl
@bin share/uhexen2/h2ded
-@bin share/uhexen2/h2launcher
@bin share/uhexen2/h2patch
@bin share/uhexen2/hexen2
share/uhexen2/hexen2.png
@@ -89,6 +87,7 @@ share/uhexen2/portals/maps/tibet2.ent
share/uhexen2/portals/maps/tibet2.txt
share/uhexen2/portals/maps/tibet9.ent
share/uhexen2/portals/maps/tibet9.txt
+share/uhexen2/portals/music/
share/uhexen2/portals/progs.dat
share/uhexen2/portals/puzzles.txt
share/uhexen2/portals/strings.txt
Index: pkg/README
===================================================================
RCS file: /cvs/ports/games/uhexen2/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- pkg/README 17 Jun 2014 23:57:29 -0000 1.2
+++ pkg/README 26 Dec 2016 02:32:45 -0000
@@ -15,4 +15,4 @@ If your pak files need to be patched, th
Starting the Game
=================
-Type `glhexen2` or `hexen2` or `h2launcher`.
+Type `glhexen2` or `hexen2`.
