Date: Fri, 11 Sep 2009 00:25:05 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138711: [patch] games/wesnoth: update to 1.6.5 Message-ID: <86ws46r1i6.fsf@gmail.com> Resent-Message-ID: <200909102030.n8AKU14i069422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138711
>Category: ports
>Synopsis: [patch] games/wesnoth: update to 1.6.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 10 20:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD 9.0-CURRENT #0 r197029M: Wed Sep 9 11:22:43 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64
>Description:
Includes the diff from ports/138518.
>How-To-Repeat:
>Fix:
--- wesnoth.diff begins here ---
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 10 Sep 2009 20:14:22 -0000
@@ -6,23 +6,20 @@
#
PORTNAME= wesnoth
-PORTVERSION= 1.6.4
-PORTREVISION= 1
+PORTVERSION= 1.6.5
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-[0-9]*
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 +28,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= "" cs de en_GB es fi fr hu it lt pl sr sr@latin sv tr \
+MANLANG_GAME= gl sk
+MANLANG= "" cs de en_GB es et 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 +48,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 +110,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/distinfo
===================================================================
RCS file: /home/csup/ports/games/wesnoth/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- games/wesnoth/distinfo 14 Aug 2009 19:56:16 -0000 1.49
+++ games/wesnoth/distinfo 10 Sep 2009 20:03:39 -0000
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.6.4.tar.bz2) = c8bc4c5b2be28e29563dfe3f89eafd51
-SHA256 (wesnoth-1.6.4.tar.bz2) = 496a1a9b2b9f05e400a60466ae0644cd376902439436b0ab1ef3e9a67105a1b3
-SIZE (wesnoth-1.6.4.tar.bz2) = 229852077
+MD5 (wesnoth-1.6.5.tar.bz2) = 493826bbd9ba355930765a7e8fe3749a
+SHA256 (wesnoth-1.6.5.tar.bz2) = 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7
+SIZE (wesnoth-1.6.5.tar.bz2) = 230239169
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 10 Sep 2009 20:23:20 -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
@@ -3938,19 +3938,21 @@ share/pixmaps/wesnoth_editor-icon.png
%%DATADIR%%/data/core/images/terrain/lava-convex-r.png
%%DATADIR%%/data/core/images/terrain/lava-convex-tl.png
%%DATADIR%%/data/core/images/terrain/lava-convex-tr.png
-%%DATADIR%%/data/core/images/terrain/lava-n-ne-nw-s.png
-%%DATADIR%%/data/core/images/terrain/lava-n-ne-nw.png
+%%DATADIR%%/data/core/images/terrain/lava-n-ne-se-s.png
+%%DATADIR%%/data/core/images/terrain/lava-n-ne-se.png
%%DATADIR%%/data/core/images/terrain/lava-n-ne.png
%%DATADIR%%/data/core/images/terrain/lava-n.png
-%%DATADIR%%/data/core/images/terrain/lava-ne-nw-s.png
+%%DATADIR%%/data/core/images/terrain/lava-ne-se-s.png
%%DATADIR%%/data/core/images/terrain/lava-ne-se.png
%%DATADIR%%/data/core/images/terrain/lava-ne.png
+%%DATADIR%%/data/core/images/terrain/lava-nw-n-ne.png
%%DATADIR%%/data/core/images/terrain/lava-nw-n.png
%%DATADIR%%/data/core/images/terrain/lava-nw.png
-%%DATADIR%%/data/core/images/terrain/lava-s-nw-ne-n.png
+%%DATADIR%%/data/core/images/terrain/lava-s-sw-nw-n.png
%%DATADIR%%/data/core/images/terrain/lava-s-sw-nw.png
%%DATADIR%%/data/core/images/terrain/lava-s-sw.png
%%DATADIR%%/data/core/images/terrain/lava-s.png
+%%DATADIR%%/data/core/images/terrain/lava-se-s-sw.png
%%DATADIR%%/data/core/images/terrain/lava-se-s.png
%%DATADIR%%/data/core/images/terrain/lava-se.png
%%DATADIR%%/data/core/images/terrain/lava-sw-nw-n.png
@@ -9711,6 +9713,8 @@ share/pixmaps/wesnoth_editor-icon.png
@dirrmtry man/en_GB
@dirrmtry man/es/man6
@dirrmtry man/es
+@dirrmtry man/et/man6
+@dirrmtry man/et
@dirrmtry man/fi/man6
@dirrmtry man/fi
@dirrmtry man/fr/man6
@@ -9763,3 +9767,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
--- wesnoth.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86ws46r1i6.fsf>