Attachment 99448 Details for Bug 138518 – wesnoth.diff

[patch] wesnoth.diff

wesnoth.diff (text/plain), 3.61 KB, created by swell.k on 2009-09-04 02:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: swell.k

Created: 2009-09-04 02:10:05 UTC

Size: 3.61 KB

patch

obsolete

>Index: games/wesnoth/Makefile
>===================================================================
>RCS file: /home/csup/ports/games/wesnoth/Makefile,v
>retrieving revision 1.72
>diff -u -p -r1.72 Makefile
>--- games/wesnoth/Makefile	2 Sep 2009 12:12:14 -0000	1.72
>+++ games/wesnoth/Makefile	4 Sep 2009 00:36:24 -0000
>@@ -7,22 +7,20 @@
> 
> PORTNAME=	wesnoth
> PORTVERSION=	1.6.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.6/${PORTNAME}-${PORTVERSION} \
> 		http://www.wesnoth.org/files/
> 
>-
> MAINTAINER=	philip@FreeBSD.org
> COMMENT=	A fantasy turn-based strategy game
> 
>-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
>-		freetype.9:${PORTSDIR}/print/freetype2
>+LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
> 
>-CONFLICTS=	wesnoth-1.5* wesnoth-1.7*
>+CONFLICTS=	wesnoth-devel-1.*
> 
> USE_SDL=	image mixer net ttf
>-USE_GNOME=	gnometarget pango
>+USE_GNOME=	desktopfileutils gnometarget pango
> USE_GMAKE=	yes
> MAKE_JOBS_SAFE=	yes
> WANT_GNOME=	yes
>@@ -31,17 +29,16 @@ USE_AUTOTOOLS=	aclocal:110 autoheader:26
> ACLOCAL_ARGS=	-Im4
> AUTOMAKE_ARGS=	--add-missing --copy
> CONFIGURE_ARGS=	--localstatedir=/var \
>+		--with-icondir=${PREFIX}/share/pixmaps \
> 		--with-libiconv-prefix=${LOCALBASE} \
> 		--with-libintl-prefix=${LOCALBASE} \
> 		--with-localedir=${PREFIX}/share/locale
> 
>+MANLANG_GAME=	gl sk
> MANLANG=	"" cs de en_GB es fi fr hu it lt pl sr sr@latin sv tr \
> 		zh_CN zh_TW
> 
> MAN6=		wesnoth.6
>-MAN6_GL=	wesnoth.6
>-MAN6_RU=	wesnoth.6
>-MAN6_SK=	wesnoth.6
> 
> OPTIONS=	CAMPAIGN "Enable campaign server"	On \
> 		EDITOR	 "Enable map editor"		On \
>@@ -52,6 +49,17 @@ OPTIONS=	CAMPAIGN "Enable campaign serve
> 
> .include <bsd.port.pre.mk>
> 
>+# workaround: compress and add to plist disobedient man pages
>+.for manlang in ${MANLANG_GAME}
>+MAN6_${manlang:U}=	wesnoth.6
>+
>+.if defined(NOMANCOMPRESS)
>+PLIST_FILES+=	man/${manlang}/man6/wesnoth.6
>+.else
>+PLIST_FILES+=	man/${manlang}/man6/wesnoth.6.gz
>+.endif
>+.endfor
>+
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=	--enable-debug
> .endif
>@@ -103,8 +111,13 @@ PLIST_SUB+=		TOOLS=""
> BROKEN=		you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
> .endif
> 
>-post-configure:
>-	@${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/pixmaps|' \
>-			${WRKSRC}/icons/Makefile
>+post-install:	.SILENT
>+	-update-desktop-database
>+
>+.if !defined(NOMANCOMPRESS)
>+.	for manlang in ${MANLANG_GAME}
>+		${GZIP_CMD} ${PREFIX}/man/${manlang}/man6/wesnoth.6
>+.	endfor
>+.endif
> 
> .include <bsd.port.post.mk>
>Index: games/wesnoth/pkg-plist
>===================================================================
>RCS file: /home/csup/ports/games/wesnoth/pkg-plist,v
>retrieving revision 1.55
>diff -u -p -r1.55 pkg-plist
>--- games/wesnoth/pkg-plist	14 Aug 2009 19:56:16 -0000	1.55
>+++ games/wesnoth/pkg-plist	4 Sep 2009 00:09:15 -0000
>@@ -10,7 +10,7 @@ bin/wesnoth
> share/applications/wesnoth.desktop
> %%EDITOR%%share/applications/wesnoth_editor.desktop
> share/pixmaps/wesnoth-icon.png
>-share/pixmaps/wesnoth_editor-icon.png
>+%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png
> %%DOCSDIR%%/manual/CMakeLists.txt
> %%DOCSDIR%%/manual/images/de/game-screen-1.5.7.jpg
> %%DOCSDIR%%/manual/images/de/main-menu-1.5.11.jpg
>@@ -9763,3 +9763,5 @@ share/pixmaps/wesnoth_editor-icon.png
> %%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/tl
> %%SERVER%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt
>+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 138518: 99448 | 99449