- Convert to USES=libtool and add INSTALL_TARGET=install-strip

- Stop trying to build libQFrenderer_sw as a shared library.  The library
  contains x86 asm that does not support PIC.  It looks like this asm can
  be disabled by adding -DPIC to the command line but doing so leads to
  build errors.

5 files changed, 38 insertions, 66 deletions

diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index c76134287d3b..32252ac1d2c4 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quakeforge
 PORTVERSION=	0.5.5
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF/quake/quake/${PORTVERSION}:sf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf
@@ -17,14 +17,15 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USE_AUTOTOOLS=	libtool
-USES=		bison compiler:nestedfct gmake tar:bzip2
-USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		bison compiler:nestedfct gmake libtool tar:bzip2
+USE_LDCONFIG=	yes
 WANT_SDL=	yes
 
 CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
 		--with-sharepath=${DATADIR} \
+		--disable-debug \
 		--disable-optimize
 
 OPTIONS_DEFINE=		CLIENTS OPTIMIZED_CFLAGS SDL SERVERS SKYBOXES VORBIS \
diff --git a/games/quakeforge/files/patch-configure b/games/quakeforge/files/patch-configure
index dc4856f54304..dc2227ec32fb 100644
--- a/games/quakeforge/files/patch-configure
+++ b/games/quakeforge/files/patch-configure
@@ -5,16 +5,24 @@
  main ()
  {
 -void *(*foo)(size_t) = alloca;
-+void *foo = alloca(sizeof(void));
++int *foo = alloca(sizeof(int));
    ;
    return 0;
  }
-@@ -32304,7 +32304,7 @@
- 
- 
- if test "x$BUILD_SW" = xyes; then
--	VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
-+	VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
- 	VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
- fi
- if test "x$BUILD_SW32" = xyes; then
+@@ -34649,16 +34649,6 @@
+ done
+  ;;
+     default ) chmod +x RPM/build_rpm
+-	if test -n "$AR" -a "$AR" != "ar"; then
+-		sed -e 's/^AR="ar"$/AR="'$AR'"/' libtool > libtool.qf
+-		if cmp -s libtool.qf libtool; then
+-			echo libtool is unchanged
+-			rm -f libtool.qf
+-		else
+-			rm -f libtool
+-			mv libtool.qf libtool
+-		fi
+-	fi
+  ;;
+   esac
+ done
diff --git a/games/quakeforge/files/patch-libs__video__renderer__Makefile.in b/games/quakeforge/files/patch-libs__video__renderer__Makefile.in
deleted file mode 100644
index 3ab3795ec713..000000000000
--- a/games/quakeforge/files/patch-libs__video__renderer__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/video/renderer/Makefile.in.orig	Sun May  2 17:52:09 2004
-+++ ./libs/video/renderer/Makefile.in	Fri Dec 29 17:41:47 2006
-@@ -409,7 +409,7 @@
- libQFrenderer_gl_la_LIBADD = gl/libgl.la
- libQFrenderer_gl_la_SOURCES = $(common_sources)
- libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
--libQFrenderer_sw_la_LDFLAGS = @STATIC@
-+libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
- libQFrenderer_sw_la_LIBADD = sw/libsw.la
- libQFrenderer_sw_la_SOURCES = $(common_sources)
- libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la
diff --git a/games/quakeforge/files/patch-libs__video__renderer__sw__Makefile.in b/games/quakeforge/files/patch-libs__video__renderer__sw__Makefile.in
deleted file mode 100644
index d9e0b5df3b48..000000000000
--- a/games/quakeforge/files/patch-libs__video__renderer__sw__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libs/video/renderer/sw/Makefile.in.orig	Sun May  2 17:52:12 2004
-+++ ./libs/video/renderer/sw/Makefile.in	Sat Jan 20 12:17:37 2007
-@@ -403,8 +403,8 @@
- target_vendor = @target_vendor@
- vid_libs = @vid_libs@
- AUTOMAKE_OPTIONS = foreign
--AM_CFLAGS = @PREFER_NON_PIC@
--AM_CCASFLAGS = @PREFER_NON_PIC@
-+AM_CFLAGS = -fPIC
-+AM_CCASFLAGS = -fPIC
- INCLUDES = -I$(top_srcdir)/include
- @ASM_ARCH_FALSE@asm = 
- @ASM_ARCH_TRUE@asm = libasm.la
diff --git a/games/quakeforge/pkg-plist b/games/quakeforge/pkg-plist
index 81fde6ebcfe6..4944526a668f 100644
--- a/games/quakeforge/pkg-plist
+++ b/games/quakeforge/pkg-plist
@@ -26,95 +26,82 @@ bin/qfwavinfo
 bin/wad
 bin/zpak
 %%CLIENTS%%lib/libQFcd.a
-%%CLIENTS%%lib/libQFcd.la
 %%CLIENTS%%lib/libQFcd.so
 %%CLIENTS%%lib/libQFcd.so.1
+%%CLIENTS%%lib/libQFcd.so.1.0.0
 lib/libQFconsole.a
-lib/libQFconsole.la
 lib/libQFconsole.so
 lib/libQFconsole.so.1
+lib/libQFconsole.so.1.0.0
 lib/libQFgamecode.a
-lib/libQFgamecode.la
 lib/libQFgamecode.so
 lib/libQFgamecode.so.1
+lib/libQFgamecode.so.1.0.0
 lib/libQFgamecode_builtins.a
-lib/libQFgamecode_builtins.la
 lib/libQFgamecode_builtins.so
 lib/libQFgamecode_builtins.so.1
+lib/libQFgamecode_builtins.so.1.0.0
 lib/libQFgib.a
-lib/libQFgib.la
 lib/libQFgib.so
 lib/libQFgib.so.1
+lib/libQFgib.so.1.0.0
 lib/libQFimage.a
-lib/libQFimage.la
 lib/libQFimage.so
 lib/libQFimage.so.1
+lib/libQFimage.so.1.0.0
 %%CLIENTS%%lib/libQFjs.a
-%%CLIENTS%%lib/libQFjs.la
 %%CLIENTS%%lib/libQFjs.so
 %%CLIENTS%%lib/libQFjs.so.1
+%%CLIENTS%%lib/libQFjs.so.1.0.0
 lib/libQFmodels.a
-lib/libQFmodels.la
 lib/libQFmodels.so
 lib/libQFmodels.so.1
+lib/libQFmodels.so.1.0.0
 %%CLIENTS%%lib/libQFmodels_gl.a
-%%CLIENTS%%lib/libQFmodels_gl.la
 %%CLIENTS%%lib/libQFmodels_gl.so
 %%CLIENTS%%lib/libQFmodels_gl.so.1
+%%CLIENTS%%lib/libQFmodels_gl.so.1.0.0
 %%CLIENTS%%lib/libQFmodels_sw.a
-%%CLIENTS%%lib/libQFmodels_sw.la
 %%CLIENTS%%lib/libQFmodels_sw.so
 %%CLIENTS%%lib/libQFmodels_sw.so.1
+%%CLIENTS%%lib/libQFmodels_sw.so.1.0.0
 %%CLIENTS%%lib/libQFrenderer_gl.a
-%%CLIENTS%%lib/libQFrenderer_gl.la
 %%CLIENTS%%lib/libQFrenderer_gl.so
 %%CLIENTS%%lib/libQFrenderer_gl.so.1
-%%CLIENTS%%lib/libQFrenderer_sw.a
-%%CLIENTS%%lib/libQFrenderer_sw.la
-%%CLIENTS%%lib/libQFrenderer_sw.so
-%%CLIENTS%%lib/libQFrenderer_sw.so.1
+%%CLIENTS%%lib/libQFrenderer_gl.so.1.0.0
 %%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
-%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.la
 %%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
 %%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1.0.0
 lib/libQFruamoko.a
-lib/libQFruamoko.la
 lib/libQFruamoko.so
 lib/libQFruamoko.so.1
+lib/libQFruamoko.so.1.0.0
 %%CLIENTS%%lib/libQFsound.a
-%%CLIENTS%%lib/libQFsound.la
 %%CLIENTS%%lib/libQFsound.so
 %%CLIENTS%%lib/libQFsound.so.1
+%%CLIENTS%%lib/libQFsound.so.1.0.0
 lib/libQFutil.a
-lib/libQFutil.la
 lib/libQFutil.so
 lib/libQFutil.so.1
+lib/libQFutil.so.1.0.0
 %%CLIENTS%%lib/quakeforge/cd_file.a
-%%CLIENTS%%lib/quakeforge/cd_file.la
 %%CLIENTS%%lib/quakeforge/cd_file.so
 %%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.a
-%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.la
 %%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
 %%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.a
-%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.la
 %%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
 lib/quakeforge/console_client.a
-lib/quakeforge/console_client.la
 lib/quakeforge/console_client.so
 lib/quakeforge/console_server.a
-lib/quakeforge/console_server.la
 lib/quakeforge/console_server.so
 %%CLIENTS%%lib/quakeforge/snd_output_disk.a
-%%CLIENTS%%lib/quakeforge/snd_output_disk.la
 %%CLIENTS%%lib/quakeforge/snd_output_disk.so
 %%CLIENTS%%lib/quakeforge/snd_output_oss.a
-%%CLIENTS%%lib/quakeforge/snd_output_oss.la
 %%CLIENTS%%lib/quakeforge/snd_output_oss.so
 %%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.a
-%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.la
 %%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
 %%CLIENTS%%lib/quakeforge/snd_render_default.a
-%%CLIENTS%%lib/quakeforge/snd_render_default.la
 %%CLIENTS%%lib/quakeforge/snd_render_default.so
 lib/ruamoko/libcsqc.a
 lib/ruamoko/libgui.a