diff options
author | Philip Paeps <philip@FreeBSD.org> | 2010-08-26 11:25:34 +0000 |
---|---|---|
committer | Philip Paeps <philip@FreeBSD.org> | 2010-08-26 11:25:34 +0000 |
commit | dd1a08de3f9ec51db1a698c282468d8340c7418e (patch) | |
tree | 525161606889d13466bb3f9b930a6d49e67eea68 | |
parent | 809735997156a1acedc7a456bf5c6391e2fd9965 (diff) | |
download | ports-dd1a08de3f9ec51db1a698c282468d8340c7418e.tar.gz ports-dd1a08de3f9ec51db1a698c282468d8340c7418e.zip |
Update to 1.8.4
- drop desktopfileutils dependency[1] but update database when it's installed
- specific directory for desktopfileutils
- allow overriding PKG_CONFIG from environ or make.conf
- sort pixmaps in plist (cosmetic)
[1] it's not mandatory
PR: ports/149485
Submitted by: Anonymous <swell.k@gmail.com>
Notes
Notes:
svn path=/head/; revision=260007
-rw-r--r-- | games/wesnoth/Makefile | 12 | ||||
-rw-r--r-- | games/wesnoth/distinfo | 6 | ||||
-rw-r--r-- | games/wesnoth/files/patch-configure.ac | 12 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src-gettext.cpp | 15 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src-gettext.hpp | 25 | ||||
-rw-r--r-- | games/wesnoth/pkg-plist | 8 |
6 files changed, 53 insertions, 25 deletions
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index d64caf7b4631..80fdefc87b4a 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wesnoth -PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTVERSION= 1.8.4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ @@ -24,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 @@ -33,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} \ @@ -41,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 @@ -203,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 <bsd.port.post.mk> diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index d99664fc7512..6008fb111537 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -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 diff --git a/games/wesnoth/files/patch-configure.ac b/games/wesnoth/files/patch-configure.ac index 73a33764d8c7..0015eec85a64 100644 --- a/games/wesnoth/files/patch-configure.ac +++ b/games/wesnoth/files/patch-configure.ac @@ -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) diff --git a/games/wesnoth/files/patch-src-gettext.cpp b/games/wesnoth/files/patch-src-gettext.cpp index 5efa34c5afe9..23fa486a23b1 100644 --- a/games/wesnoth/files/patch-src-gettext.cpp +++ b/games/wesnoth/files/patch-src-gettext.cpp @@ -13,3 +13,18 @@ char const *egettext(char const *msgid) { return msgid[0] == '\0' ? msgid : gettext(msgid); +--- src/gettext.cpp~ ++++ src/gettext.cpp +@@ -18,6 +18,12 @@ + + #include <cstring> + ++#ifndef ENABLE_NLS ++char *textdomain (const char *domainname) { ++ return "dummy"; ++} ++#endif ++ + char const *egettext(char const *msgid) + { + return msgid[0] == '\0' ? msgid : gettext(msgid); diff --git a/games/wesnoth/files/patch-src-gettext.hpp b/games/wesnoth/files/patch-src-gettext.hpp index fd910d11a583..51cd88141e04 100644 --- a/games/wesnoth/files/patch-src-gettext.hpp +++ b/games/wesnoth/files/patch-src-gettext.hpp @@ -10,6 +10,31 @@ +#ifdef ENABLE_NLS +# include <libintl.h> +#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*); +--- src/gettext.hpp~ ++++ src/gettext.hpp +@@ -35,7 +35,21 @@ + + // gettext-related declarations + +-#include <libintl.h> ++#include "wesconfig.h" ++ ++#ifdef ENABLE_NLS ++# include <libintl.h> ++#else +# define bind_textdomain_codeset(Domain,Codeset) "C" +# define bindtextdomain(Domain,Dir) "/nonexistent" +# define gettext(String) gettext_noop(String) diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist index 26bf27c94d05..e3bd46b56b89 100644 --- a/games/wesnoth/pkg-plist +++ b/games/wesnoth/pkg-plist @@ -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 |