Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Aug 2015 21:33:20 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395402 - in head: devel/ponscripter-sekai games/openbor
Message-ID:  <201508262133.t7QLXKcv067482@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Aug 26 21:33:19 2015
New Revision: 395402
URL: https://svnweb.freebsd.org/changeset/ports/395402

Log:
  devel/ponscripter-sekai, games/openbor: add TREMOR option
  
  TREMOR is enabled by default on platforms without hardware floating point.

Modified:
  head/devel/ponscripter-sekai/Makefile   (contents, props changed)
  head/games/openbor/Makefile   (contents, props changed)

Modified: head/devel/ponscripter-sekai/Makefile
==============================================================================
--- head/devel/ponscripter-sekai/Makefile	Wed Aug 26 21:33:04 2015	(r395401)
+++ head/devel/ponscripter-sekai/Makefile	Wed Aug 26 21:33:19 2015	(r395402)
@@ -3,7 +3,7 @@
 PORTNAME=	ponscripter-sekai
 PORTVERSION=	0.0.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel games
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,8 +11,7 @@ COMMENT=	NScripter-like novel-game inter
 
 LICENSE=	GPLv2 # or any later version
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libsmpeg2.so:${PORTSDIR}/multimedia/smpeg2 \
+LIB_DEPENDS=	libsmpeg2.so:${PORTSDIR}/multimedia/smpeg2 \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 CONFLICTS=	ponscripter-[0-9]* # doesn't exist yet
@@ -35,8 +34,8 @@ PORTDOCS=	BUGS CHANGES MANUAL README TOD
 PLIST_FILES=	bin/ponscr \
 		share/emacs/site-lisp/ponscripter-mode.el
 
-OPTIONS_DEFINE=	DOCS MANPAGES
-OPTIONS_DEFAULT=MANPAGES
+OPTIONS_DEFINE=	DOCS MANPAGES TREMOR
+OPTIONS_DEFAULT=MANPAGES ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/}
 
 MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
 MANPAGES_PLIST_FILES=\
@@ -45,6 +44,10 @@ MANPAGES_PLIST_FILES=\
 	man/man7/ponscr-syntax.7.gz \
 	man/man7/ponscripter.7.gz
 
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_CFLAGS=		-DINTEGER_OGG_VORBIS
+TREMOR_LIB_DEPENDS_OFF=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^ifdef DEBUG/,/^$$/d' \
 		-e 's/$$STRIPFLAG/${STRIP}/' \
@@ -58,6 +61,17 @@ post-patch-MANPAGES-off:
 		-e 's/xmlto/${FALSE}/' \
 		${WRKSRC}/configure
 
+post-patch-TREMOR-on:
+	@${REINPLACE_CMD} -i .tremor.bak \
+		-e 's/"libogg, libvorbis"/libvorbisidec/' \
+		-e 's,vorbis/vorbisfile,tremor/ivorbisfile,' \
+		-e 's,vorbis/codec,tremor/ivorbiscodec,' \
+		-e '/genlink/ { s/vorbisfile/vorbisidec/; \
+			/ogg/d; /vorbis$$/d; }' \
+		-e 's/ $$LINKogg//; s/ $$LINKvorbis//' \
+		-e 's/LINKvorbisfile/LINKvorbisidec/' \
+		${WRKSRC}/configure
+
 post-build-MANPAGES-on:
 	# Remove extraneous whitespace to unbreak manpage syntax
 	${REINPLACE_CMD} -e 's/^[[:space:]]*//; /^$$/d' \

Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile	Wed Aug 26 21:33:04 2015	(r395401)
+++ head/games/openbor/Makefile	Wed Aug 26 21:33:19 2015	(r395402)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openbor
 PORTVERSION=	3.0.r4163
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/jbeich \
 		https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn
@@ -12,8 +12,7 @@ COMMENT=	Moddable fighting game engine (
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libvpx.so:${PORTSDIR}/multimedia/libvpx
 
 USES=		dos2unix gmake pkgconfig tar:xz
@@ -36,12 +35,18 @@ DESKTOP_ENTRIES="OpenBOR" \
 		"Game;ArcadeGame;" \
 		""
 
+OPTIONS_DEFINE=		TREMOR
+OPTIONS_DEFAULT=	${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/}
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT_i386=	MMX # runtime detection
 
 MMX_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 MMX_MAKE_ARGS=		BUILD_MMX=1
 
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_MAKE_ARGS=	BUILD_TREMOR=1 BUILD_VORBIS=""
+TREMOR_LIB_DEPENDS_OFF=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+
 #
 # To update snapshot: make makesum BOOTSTRAP=
 # Specific snapshot:  make makesum SVN_FETCH= PORTVERSION=1.0.r1234



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