Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Sep 2014 11:06:03 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367919 - in head/games/quakeforge: . files
Message-ID:  <201409111106.s8BB63SK065530@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Thu Sep 11 11:06:02 2014
New Revision: 367919
URL: http://svnweb.freebsd.org/changeset/ports/367919
QAT: https://qat.redports.org/buildarchive/r367919/

Log:
  - 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.

Deleted:
  head/games/quakeforge/files/patch-libs__video__renderer__Makefile.in
  head/games/quakeforge/files/patch-libs__video__renderer__sw__Makefile.in
Modified:
  head/games/quakeforge/Makefile
  head/games/quakeforge/files/patch-configure
  head/games/quakeforge/pkg-plist

Modified: head/games/quakeforge/Makefile
==============================================================================
--- head/games/quakeforge/Makefile	Thu Sep 11 11:05:03 2014	(r367918)
+++ head/games/quakeforge/Makefile	Thu Sep 11 11:06:02 2014	(r367919)
@@ -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 \

Modified: head/games/quakeforge/files/patch-configure
==============================================================================
--- head/games/quakeforge/files/patch-configure	Thu Sep 11 11:05:03 2014	(r367918)
+++ head/games/quakeforge/files/patch-configure	Thu Sep 11 11:06:02 2014	(r367919)
@@ -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

Modified: head/games/quakeforge/pkg-plist
==============================================================================
--- head/games/quakeforge/pkg-plist	Thu Sep 11 11:05:03 2014	(r367918)
+++ head/games/quakeforge/pkg-plist	Thu Sep 11 11:06:02 2014	(r367919)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409111106.s8BB63SK065530>