Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jun 2009 03:00:26 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/136048: Update port: games/stratagus to 2.2.4
Message-ID:  <20090626030026.ea6b5b01.tkato432@yahoo.com>
Resent-Message-ID: <200906251810.n5PIA3HK086454@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         136048
>Category:       ports
>Synopsis:       Update port: games/stratagus to 2.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 25 18:10:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.4

New file:
files/patch-Rules.make

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/stratagus/Makefile games/stratagus/Makefile
--- /usr/ports/games/stratagus/Makefile	2009-05-29 15:27:43.000000000 +0900
+++ games/stratagus/Makefile	2009-06-01 03:54:16.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stratagus
-PORTVERSION=	2.2.2
-PORTREVISION=	4
+PORTVERSION=	2.2.4
 CATEGORIES=	games
 MASTER_SITES=	SF
 EXTRACT_SUFX=	-src.tar.gz
@@ -17,43 +16,73 @@
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-USE_GMAKE=	yes
-USE_LUA=	5.0
-USE_SDL=	sdl
-USE_GL=		gl
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LUA_INCDIR}
-CONFIGURE_ENV=	LDFLAGS="-L${LUA_LIBDIR} -lm"
-
 OPTIONS=	OPENGL "Enable OpenGL support" on \
 		MIKMOD "Enable Mikmod support" off \
+		MNG "Enable MNG support" off \
+		THEORA "Enable Theora support" off \
 		VORBIS "Enable Ogg Vorbis support" off
 
+USE_LUA=	5.0+
+USE_SDL=	sdl
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-extra-includes=${LUA_INCDIR} \
+		--with-extra-libs=${LUA_LIBDIR}
+
+PORTDOCS=	*
 PLIST_FILES=	bin/stratagus
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -lm
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_OPENGL)
+.if !defined(WITH_OPENGL)
+CONFIGURE_ARGS+=--without-opengl
+.else
+USE_GL=		gl
 CONFIGURE_ARGS+=--with-opengl
 .endif
 
 .if defined(WITH_MIKMOD)
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=--with-mikmod
 .else
 CONFIGURE_ARGS+=--without-mikmod
 .endif
 
+.if defined(WITH_MNG)
+LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
+CONFIGURE_ARGS+=--with-mng
+.else
+CONFIGURE_ARGS+=--without-mng
+.endif
+
+.if defined(WITH_THEORA)
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
+CONFIGURE_ARGS+=--with-theora
+.else
+CONFIGURE_ARGS+=--without-theora
+.endif
+
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbisfile.5:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--with-vorbis
 .else
-CONFIGURE_ARGS+=--without-ogg
+CONFIGURE_ARGS+=--without-vorbis
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||; s|gcc|${CC}|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2 -pipe|| ; \
+		 s|-ldl||' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
diff -urN /usr/ports/games/stratagus/distinfo games/stratagus/distinfo
--- /usr/ports/games/stratagus/distinfo	2007-02-28 04:17:51.000000000 +0900
+++ games/stratagus/distinfo	2009-06-01 03:29:34.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (stratagus-2.2.2-src.tar.gz) = 0e116a9d4080dbca6dad78b7d34fec8f
-SHA256 (stratagus-2.2.2-src.tar.gz) = b01417a32358a4f234d2d093fff932e3dd526c1bdba1bf0b95fb6aed52e1c9be
-SIZE (stratagus-2.2.2-src.tar.gz) = 931693
+MD5 (stratagus-2.2.4-src.tar.gz) = 311b41c8dcd2d695d2f3ca7d2c17587e
+SHA256 (stratagus-2.2.4-src.tar.gz) = 66a96dd7712e9b007420dbe2a1257985daa9c758648fad36696c527c15d5a77d
+SIZE (stratagus-2.2.4-src.tar.gz) = 939353
diff -urN /usr/ports/games/stratagus/files/patch-Rules.make games/stratagus/files/patch-Rules.make
--- /usr/ports/games/stratagus/files/patch-Rules.make	1970-01-01 09:00:00.000000000 +0900
+++ games/stratagus/files/patch-Rules.make	2009-06-01 03:49:45.000000000 +0900
@@ -0,0 +1,11 @@
+--- Rules.make.in.orig	2006-11-27 06:27:04.000000000 +0900
++++ Rules.make.in	2009-06-01 03:49:13.000000000 +0900
+@@ -17,7 +17,7 @@
+ # Prefix for 'make install'
+ PREFIX=@PREFIX@
+ 
+-CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include
++CPPFLAGS=-DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include @DEFS@ @CPPFLAGS@
+ CXXFLAGS=@CXXFLAGS@
+ LDFLAGS=@LDFLAGS@ -lpng -lz -lm
+ 
>Release-Note:
>Audit-Trail:
>Unformatted:



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