Attachment 132265 Details for Bug 176534 – file.diff

[patch] file.diff

file.diff (text/plain), 5.70 KB, created by tkato432 on 2013-02-28 18:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-02-28 18:10:02 UTC

Size: 5.70 KB

patch

obsolete

>diff -urN /usr/ports/games/stratagus/Makefile games/stratagus/Makefile
>--- /usr/ports/games/stratagus/Makefile	2012-11-08 07:30:09.000000000 +0900
>+++ games/stratagus/Makefile	2013-02-27 03:32:35.000000000 +0900
>@@ -1,86 +1,80 @@
>-# New ports collection makefile for:	stratagus
>-# Date created:			30 Jun 2004
>-# Whom:				Travis Poppe <tlp@liquidx.org>
>-#
>+# Created by: Travis Poppe <tlp@liquidx.org>
> # $FreeBSD: head/games/stratagus/Makefile 301513 2012-07-25 08:13:30Z gerald $
>-#
> 
> PORTNAME=	stratagus
>-PORTVERSION=	2.2.5.5
>-PORTREVISION=	3
>+PORTVERSION=	2.2.7
> CATEGORIES=	games
>-MASTER_SITES=	http://launchpadlibrarian.net/59493540/
>-DISTNAME=	${PORTNAME}_${PORTVERSION}
>-EXTRACT_SUFX=	.orig.tar.gz
>+MASTER_SITES=	http://launchpadlibrarian.net/113005346/
>+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Free cross-platform real-time strategy gaming engine
> 
>+LICENSE=	GPLv2
>+
> LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
> 
> OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS DOCS
> OPTIONS_DEFAULT=	VORBIS
>-MNG_DESC=	Enable MNG support
> 
>-LICENSE=	GPLv2
>-USE_GCC=	4.6+
>-USE_LUA=	5.0+
>+USE_GL=		glu
> USE_SDL=	sdl
>-USE_GL=		gl
>-USE_AUTOTOOLS=	aclocal autoheader autoconf
>-USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-extra-includes=${LUA_INCDIR} \
>-		--with-extra-includes=${LOCALBASE}/include/libpng15 \
>-		--with-extra-libs=${LUA_LIBDIR} \
>-		--without-gles
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-MAKE_JOBS_UNSAFE=	yes
>+USE_LUA=	5.0+
>+LUA_COMPS=	toluaxx
>+USE_CMAKE=	yes
>+CMAKE_OUTSOURCE=	yes
>+CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
>+		-DTOLUA++_APP:STRING="${TOLUAXX_CMD}" \
>+		-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
>+		-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so"
>+MAKE_JOBS_SAFE=	yes
> 
>+MAN6=		stratagus.6
> PORTDOCS=	*
>-PLIST_FILES=	bin/stratagus
>+PLIST_FILES=	bin/png2stratagus bin/stratagus sbin/metaserver
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMIKMOD}
>-LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
>-CONFIGURE_ARGS+=--with-mikmod
>+LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
>+CMAKE_ARGS+=	-DWITH_MIKMOD:BOOL=ON
> .else
>-CONFIGURE_ARGS+=--without-mikmod
>+CMAKE_ARGS+=	-DWITH_MIKMOD:BOOL=OFF
> .endif
> 
> .if ${PORT_OPTIONS:MMNG}
>-LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
>-CONFIGURE_ARGS+=--with-mng
>+LIB_DEPENDS+=	mng:${PORTSDIR}/graphics/libmng
>+CMAKE_ARGS+=	-DWITH_MNG:BOOL=ON
> .else
>-CONFIGURE_ARGS+=--without-mng
>+CMAKE_ARGS+=	-DWITH_MNG:BOOL=OFF
> .endif
> 
> .if ${PORT_OPTIONS:MTHEORA}
>-LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
>-CONFIGURE_ARGS+=--with-theora
>+LIB_DEPENDS+=	theora:${PORTSDIR}/multimedia/libtheora
>+CMAKE_ARGS+=	-DWITH_THEORA:BOOL=ON
> .else
>-CONFIGURE_ARGS+=--without-theora
>+CMAKE_ARGS+=	-DWITH_THEORA:BOOL=OFF
> .endif
> 
> .if ${PORT_OPTIONS:MVORBIS}
>-LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
>-CONFIGURE_ARGS+=--with-vorbis
>+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
>+CMAKE_ARGS+=	-DWITH_OGGVORBIS:BOOL=ON
> .else
>-CONFIGURE_ARGS+=--without-vorbis
>+CMAKE_ARGS+=	-DWITH_OGGVORBIS:BOOL=OFF
> .endif
> 
>-pre-configure:
>-	@(cd ${WRKSRC}; ./autogen.sh)
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
>+post-install:
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} stratagus.6 ${MAN6PREFIX}/man/man6)
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
>-	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${DOCSDIR})
>-.endif
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} [a-z]*.html *.txt ${DOCSDIR})
>+	@${MKDIR} ${DOCSDIR}/graphics
>+	(cd ${WRKSRC}/doc/graphics && ${INSTALL_DATA} * ${DOCSDIR}/graphics)
>+	@${MKDIR} ${DOCSDIR}/scripts
>+	(cd ${WRKSRC}/doc/scripts && ${INSTALL_DATA} * ${DOCSDIR}/scripts)
> 	@${ECHO_CMD}
> 	@${CAT} ${PKGMESSAGE}
> 	@${ECHO_CMD}
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/stratagus/distinfo games/stratagus/distinfo
>--- /usr/ports/games/stratagus/distinfo	2012-11-08 07:30:09.000000000 +0900
>+++ games/stratagus/distinfo	2013-02-24 20:06:20.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (stratagus_2.2.5.5.orig.tar.gz) = e0c8fe592ee3ad0c5806937aa950aad39019780de5344987366fe76901377285
>-SIZE (stratagus_2.2.5.5.orig.tar.gz) = 976972
>+SHA256 (stratagus_2.2.7.orig.tar.gz) = 9bdaf207623b60a5e98451128bb7fb649e00ce4aba507320bde63e60f93e8c9f
>+SIZE (stratagus_2.2.7.orig.tar.gz) = 939967
>diff -urN /usr/ports/games/stratagus/files/patch-png.cpp games/stratagus/files/patch-png.cpp
>--- /usr/ports/games/stratagus/files/patch-png.cpp	2012-11-08 07:30:08.000000000 +0900
>+++ games/stratagus/files/patch-png.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,28 +0,0 @@
>---- src/video/png.cpp.orig	2010-11-20 12:23:28.000000000 +0100
>-+++ src/video/png.cpp	2012-04-29 07:12:14.000000000 +0200
>-@@ -39,6 +39,7 @@
>- #include <stdlib.h>
>- #include <string.h>
>- #include <png.h>
>-+#include <pngpriv.h>
>- 
>- #include "stratagus.h"
>- #include "video.h"
>-@@ -147,7 +148,7 @@
>- 	 * the normal method of doing things with libpng).  REQUIRED unless you
>- 	 * set up your own error handlers in png_create_read_struct() earlier.
>- 	 */
>--	if (setjmp(png_ptr->jmpbuf)) {
>-+	if (setjmp(png_jmpbuf(png_ptr))) {
>- 		fprintf(stderr, "Error reading the PNG file.\n");
>- 		ret = -1;
>- 		goto done;
>-@@ -343,7 +344,7 @@
>- 		return;
>- 	}
>- 
>--	if (setjmp(png_ptr->jmpbuf)) {
>-+	if (setjmp(png_jmpbuf(png_ptr))) {
>- 		/* If we get here, we had a problem reading the file */
>- 		fclose(fp);
>- 		png_destroy_write_struct(&png_ptr, &info_ptr);
>diff -urN /usr/ports/games/stratagus/pkg-descr games/stratagus/pkg-descr
>--- /usr/ports/games/stratagus/pkg-descr	2012-11-08 07:30:09.000000000 +0900
>+++ games/stratagus/pkg-descr	2013-02-24 20:28:52.000000000 +0900
>@@ -4,4 +4,4 @@
> a wide-range of features specific to your needs. See the data sets page 
> for a list of current games using the stratagus engine.
> 
>-WWW: http://stratagus.sourceforge.net
>+WWW: https://launchpad.net/stratagus

Actions: View | Diff

Attachments on bug 176534: 132265 | 132266