Index: games/wesnoth/Makefile =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth/Makefile,v retrieving revision 1.81 diff -u -p -r1.81 Makefile --- games/wesnoth/Makefile 20 Jul 2010 10:57:06 -0000 1.81 +++ games/wesnoth/Makefile 10 Aug 2010 00:38:00 -0000 @@ -6,7 +6,7 @@ # PORTNAME= wesnoth -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ @@ -23,7 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= wesnoth-devel-[0-9]* USE_SDL= image mixer net ttf -USE_GNOME= desktopfileutils gnometarget pango +USE_GNOME= gnometarget pango USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_GNOME= yes @@ -32,7 +32,7 @@ USE_LUA= 5.1 USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 ACLOCAL_ARGS= -Im4 AUTOMAKE_ARGS= --add-missing --copy -CONFIGURE_ENV= PKG_CONFIG=${LOCALBASE}/bin/pkg-config \ +CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --localstatedir=/var \ --with-boost=${LOCALBASE} \ @@ -40,6 +40,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} \ --with-localedir=${PREFIX}/share/locale +PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config MANLANG= "" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \ sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW @@ -54,7 +55,6 @@ OPTIONS= BWMON "Enable bandwidth monito EDITOR "Enable map editor" On \ FRIBIDI "Enable bidirectional support" On \ LOWMEM "Reduce memory usage (disables animations)" Off \ - NLS "Enable localization" On \ NOTIFY "Enable desktop notifications" On \ POOLALLOC "Use wesnoth own memory allocator" Off \ PYTHON "Enable python developer tools" On \ @@ -194,10 +194,6 @@ PLIST_SUB+= TOOLS="" CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs .endif -.if (defined(WITH_CAMPAIGN) || defined(WITH_SERVER) || defined(WITH_TOOLS)) && defined(WITHOUT_NLS) -BROKEN= you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext -.endif - .if defined(NOPORTDATA) IGNORE= game data is required, undefine NOPORTDATA .endif @@ -207,7 +203,7 @@ post-patch: .SILENT -e 's|png_error_ptr_NULL|NULL|g' \ ${WRKSRC}/src/tools/exploder_utils.cpp -post-install: .SILENT - -update-desktop-database +post-install: + -update-desktop-database ${PREFIX}/share/applications .include Index: games/wesnoth/distinfo =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth/distinfo,v retrieving revision 1.51 diff -u -p -r1.51 distinfo --- games/wesnoth/distinfo 20 Jul 2010 10:57:06 -0000 1.51 +++ games/wesnoth/distinfo 10 Aug 2010 00:45:32 -0000 @@ -1,3 +1,3 @@ -MD5 (wesnoth-1.8.3.tar.bz2) = 62ba3a4938d3e722797cfbe9450d3e36 -SHA256 (wesnoth-1.8.3.tar.bz2) = 985d40ff04cf95bb6f8abb3353ec955c3286a6f9edb1bd29b6f26f8b12280928 -SIZE (wesnoth-1.8.3.tar.bz2) = 298923248 +MD5 (wesnoth-1.8.4.tar.bz2) = 2dce83f835ecce1d505ea60e46b7356f +SHA256 (wesnoth-1.8.4.tar.bz2) = af29ddf40f83ee016972d6edb8761d7323f8ed5d6bf15005659bff4fd7190eb9 +SIZE (wesnoth-1.8.4.tar.bz2) = 300557790 Index: games/wesnoth/pkg-plist =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth/pkg-plist,v retrieving revision 1.57 diff -u -p -r1.57 pkg-plist --- games/wesnoth/pkg-plist 20 Jul 2010 10:57:06 -0000 1.57 +++ games/wesnoth/pkg-plist 27 Jul 2010 04:37:45 -0000 @@ -34,8 +34,6 @@ bin/wesnoth %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo share/applications/wesnoth.desktop %%EDITOR%%share/applications/wesnoth_editor.desktop -share/pixmaps/wesnoth-icon.png -%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-anl.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-aoi.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-did.mo @@ -1232,6 +1230,8 @@ share/pixmaps/wesnoth-icon.png %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-units.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-utbs.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth.mo +share/pixmaps/wesnoth-icon.png +%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth @dirrmtry man/af/man6 @dirrmtry man/af @@ -1358,6 +1358,6 @@ share/pixmaps/wesnoth-icon.png %%NLS%%@dirrmtry share/locale/sr@latin %%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES %%NLS%%@dirrmtry share/locale/tl +@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true +@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true %%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 Index: games/wesnoth/files/patch-configure.ac =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth/files/patch-configure.ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure.ac --- games/wesnoth/files/patch-configure.ac 20 Jul 2010 10:57:07 -0000 1.2 +++ games/wesnoth/files/patch-configure.ac 10 Aug 2010 00:50:38 -0000 @@ -9,15 +9,3 @@ test_build=yes if test $svn_in_version = 0 then -@@ -428,9 +428,9 @@ if test "x$fribidi" != "xno"; then - AC_MSG_RESULT(no) - ]) - ]) -- AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes]) -- AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes]) - fi -+AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes]) -+AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes]) - - # python - AC_PATH_PROG(PYTHON, python, none) Index: games/wesnoth/files/patch-src-gettext.cpp =================================================================== RCS file: games/wesnoth/files/patch-src-gettext.cpp diff -N games/wesnoth/files/patch-src-gettext.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/wesnoth/files/patch-src-gettext.cpp 23 Jul 2010 12:44:38 -0000 @@ -0,0 +1,15 @@ +--- src/gettext.cpp~ ++++ src/gettext.cpp +@@ -18,6 +18,12 @@ + + #include + ++#ifndef ENABLE_NLS ++char *textdomain (const char *domainname) { ++ return "dummy"; ++} ++#endif ++ + char const *egettext(char const *msgid) + { + return msgid[0] == '\0' ? msgid : gettext(msgid); Index: games/wesnoth/files/patch-src-gettext.hpp =================================================================== RCS file: games/wesnoth/files/patch-src-gettext.hpp diff -N games/wesnoth/files/patch-src-gettext.hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/wesnoth/files/patch-src-gettext.hpp 10 Aug 2010 01:34:17 -0000 @@ -0,0 +1,25 @@ +--- src/gettext.hpp~ ++++ src/gettext.hpp +@@ -35,7 +35,21 @@ + + // gettext-related declarations + +-#include ++#include "wesconfig.h" ++ ++#ifdef ENABLE_NLS ++# include ++#else ++# define bind_textdomain_codeset(Domain, Codeset) "C" ++# define bindtextdomain(Domain, Directory) "/nonexistent" ++# define gettext(String) gettext_noop(String) ++# define ngettext(Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural) ++# define dgettext(Domain, String) gettext_noop(String) ++# define dngettext(Domain, Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural) ++# define dcgettext(Domain, String, Category) gettext_noop(String) ++# define dcngettext(Domain, Singular, Plural, Number, Category) gettext_noop(Number == 1 ? Singular : Plural) ++char *textdomain (const char *domainname); ++#endif + + const char* egettext(const char*); + const char* sgettext(const char*);