Attachment #108622 for bug #149485

View | Details | Raw Unified | Return to bug 149485
Collapse All | Expand All




#

PORTNAME=	wesnoth
PORTVERSION=	1.8.4
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
		http://files.wesnoth.org/

CONFLICTS=	wesnoth-devel-[0-9]*

USE_SDL=	image mixer net ttf
USE_GNOME=	gnometarget pango
USE_GMAKE=	yes
MAKE_JOBS_SAFE=	yes
WANT_GNOME=	yes

USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
ACLOCAL_ARGS=	-Im4
AUTOMAKE_ARGS=	--add-missing --copy
CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
		LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--localstatedir=/var \
		--with-boost=${LOCALBASE} \

		--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

		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 \

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

		-e 's|png_error_ptr_NULL|NULL|g' \
		${WRKSRC}/src/tools/exploder_utils.cpp

post-install:
	-update-desktop-database ${PREFIX}/share/applications

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)games/wesnoth/distinfo (-3 / +3 lines)
1	MD5 (wesnoth-1.8.3.tar.bz2) = 62ba3a4938d3e722797cfbe9450d3e36	1	MD5 (wesnoth-1.8.4.tar.bz2) = 2dce83f835ecce1d505ea60e46b7356f
2	SHA256 (wesnoth-1.8.3.tar.bz2) = 985d40ff04cf95bb6f8abb3353ec955c3286a6f9edb1bd29b6f26f8b12280928	2	SHA256 (wesnoth-1.8.4.tar.bz2) = af29ddf40f83ee016972d6edb8761d7323f8ed5d6bf15005659bff4fd7190eb9
3	SIZE (wesnoth-1.8.3.tar.bz2) = 298923248	3	SIZE (wesnoth-1.8.4.tar.bz2) = 300557790

Lines 34-41 bin/wesnoth Link Here

(-)games/wesnoth/pkg-plist (-4 / +4 lines)
34	%%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo	34	%%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo
35	share/applications/wesnoth.desktop	35	share/applications/wesnoth.desktop
36	%%EDITOR%%share/applications/wesnoth_editor.desktop	36	%%EDITOR%%share/applications/wesnoth_editor.desktop
37	share/pixmaps/wesnoth-icon.png
38	%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png
39	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-anl.mo	37	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-anl.mo
40	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-aoi.mo	38	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-aoi.mo
41	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-did.mo	39	%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-did.mo
Lines 1232-1237 share/pixmaps/wesnoth-icon.png Link Here
1232	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-units.mo	1230	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-units.mo
1233	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-utbs.mo	1231	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-utbs.mo
1234	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth.mo	1232	%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth.mo
		1233	share/pixmaps/wesnoth-icon.png
		1234	%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png
1235	%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth	1235	%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth
1236	@dirrmtry man/af/man6	1236	@dirrmtry man/af/man6
1237	@dirrmtry man/af	1237	@dirrmtry man/af
Lines 1358-1363 share/pixmaps/wesnoth-icon.png Link Here
1358	%%NLS%%@dirrmtry share/locale/sr@latin	1358	%%NLS%%@dirrmtry share/locale/sr@latin
1359	%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES	1359	%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
1360	%%NLS%%@dirrmtry share/locale/tl	1360	%%NLS%%@dirrmtry share/locale/tl
		1361	@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null \|\| true
		1362	@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null \|\| true
1361	%%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	1363	%%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
1362	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
1363	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true




 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)




--- 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);




--- 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, 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*);

Return to bug 149485

Lines 6-12 Link Here

(-)games/wesnoth/Makefile (-10 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= wesnoth	8	PORTNAME= wesnoth
9	PORTVERSION= 1.8.3	9	PORTVERSION= 1.8.4
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
12	http://files.wesnoth.org/	12	http://files.wesnoth.org/
Lines 23-29 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
23	CONFLICTS= wesnoth-devel-[0-9]*	23	CONFLICTS= wesnoth-devel-[0-9]*
24		24
25	USE_SDL= image mixer net ttf	25	USE_SDL= image mixer net ttf
26	USE_GNOME= desktopfileutils gnometarget pango	26	USE_GNOME= gnometarget pango
27	USE_GMAKE= yes	27	USE_GMAKE= yes
28	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
29	WANT_GNOME= yes	29	WANT_GNOME= yes
Lines 32-38 USE_LUA= 5.1 Link Here
32	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262	32	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262
33	ACLOCAL_ARGS= -Im4	33	ACLOCAL_ARGS= -Im4
34	AUTOMAKE_ARGS= --add-missing --copy	34	AUTOMAKE_ARGS= --add-missing --copy
35	CONFIGURE_ENV= PKG_CONFIG=${LOCALBASE}/bin/pkg-config \	35	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
36	LDFLAGS="${LDFLAGS}"	36	LDFLAGS="${LDFLAGS}"
37	CONFIGURE_ARGS= --localstatedir=/var \	37	CONFIGURE_ARGS= --localstatedir=/var \
38	--with-boost=${LOCALBASE} \	38	--with-boost=${LOCALBASE} \
Lines 40-45 CONFIGURE_ARGS= --localstatedir=/var \ Link Here
40	--with-libiconv-prefix=${LOCALBASE} \	40	--with-libiconv-prefix=${LOCALBASE} \
41	--with-libintl-prefix=${LOCALBASE} \	41	--with-libintl-prefix=${LOCALBASE} \
42	--with-localedir=${PREFIX}/share/locale	42	--with-localedir=${PREFIX}/share/locale
		43	PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
43		44
44	MANLANG= "" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \	45	MANLANG= "" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
45	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW	46	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
Lines 54-60 OPTIONS= BWMON "Enable bandwidth monito Link Here
54	EDITOR "Enable map editor" On \	55	EDITOR "Enable map editor" On \
55	FRIBIDI "Enable bidirectional support" On \	56	FRIBIDI "Enable bidirectional support" On \
56	LOWMEM "Reduce memory usage (disables animations)" Off \	57	LOWMEM "Reduce memory usage (disables animations)" Off \
57	NLS "Enable localization" On \
58	NOTIFY "Enable desktop notifications" On \	58	NOTIFY "Enable desktop notifications" On \
59	POOLALLOC "Use wesnoth own memory allocator" Off \	59	POOLALLOC "Use wesnoth own memory allocator" Off \
60	PYTHON "Enable python developer tools" On \	60	PYTHON "Enable python developer tools" On \
Lines 194-203 PLIST_SUB+= TOOLS="" Link Here
194	CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs	194	CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs
195	.endif	195	.endif
196		196
197	.if (defined(WITH_CAMPAIGN) \|\| defined(WITH_SERVER) \|\| defined(WITH_TOOLS)) && defined(WITHOUT_NLS)
198	BROKEN= you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
199	.endif
200
201	.if defined(NOPORTDATA)	197	.if defined(NOPORTDATA)
202	IGNORE= game data is required, undefine NOPORTDATA	198	IGNORE= game data is required, undefine NOPORTDATA
203	.endif	199	.endif
Lines 207-213 post-patch: .SILENT Link Here
207	-e 's\|png_error_ptr_NULL\|NULL\|g' \	203	-e 's\|png_error_ptr_NULL\|NULL\|g' \
208	${WRKSRC}/src/tools/exploder_utils.cpp	204	${WRKSRC}/src/tools/exploder_utils.cpp
209		205
210	post-install: .SILENT	206	post-install:
211	-update-desktop-database	207	-update-desktop-database ${PREFIX}/share/applications
212		208
213	.include <bsd.port.post.mk>	209	.include <bsd.port.post.mk>

Lines 9-23 Link Here

(-)games/wesnoth/files/patch-configure.ac (-12 lines)
9	test_build=yes	9	test_build=yes
10	if test $svn_in_version = 0	10	if test $svn_in_version = 0
11	then	11	then
12	@@ -428,9 +428,9 @@ if test "x$fribidi" != "xno"; then
13	AC_MSG_RESULT(no)
14	])
15	])
16	- AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
17	- AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
18	fi
19	+AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
20	+AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
21
22	# python
23	AC_PATH_PROG(PYTHON, python, none)

Added Link Here

(-)games/wesnoth/files/patch-src-gettext.cpp (+15 lines)
1	--- src/gettext.cpp~
2	+++ src/gettext.cpp
3	@@ -18,6 +18,12 @@
4
5	#include <cstring>
6
7	+#ifndef ENABLE_NLS
8	+char textdomain (const char domainname) {
9	+ return "dummy";
10	+}
11	+#endif
12	+
13	char const egettext(char const msgid)
14	{
15	return msgid[0] == '\0' ? msgid : gettext(msgid);

Added Link Here

(-)games/wesnoth/files/patch-src-gettext.hpp (+25 lines)
1	--- src/gettext.hpp~
2	+++ src/gettext.hpp
3	@@ -35,7 +35,21 @@
4
5	// gettext-related declarations
6
7	-#include <libintl.h>
8	+#include "wesconfig.h"
9	+
10	+#ifdef ENABLE_NLS
11	+# include <libintl.h>
12	+#else
13	+# define bind_textdomain_codeset(Domain, Codeset) "C"
14	+# define bindtextdomain(Domain, Directory) "/nonexistent"
15	+# define gettext(String) gettext_noop(String)
16	+# define ngettext(Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural)
17	+# define dgettext(Domain, String) gettext_noop(String)
18	+# define dngettext(Domain, Singular, Plural, Number) gettext_noop(Number == 1 ? Singular : Plural)
19	+# define dcgettext(Domain, String, Category) gettext_noop(String)
20	+# define dcngettext(Domain, Singular, Plural, Number, Category) gettext_noop(Number == 1 ? Singular : Plural)
21	+char textdomain (const char domainname);
22	+#endif
23
24	const char* egettext(const char*);
25	const char* sgettext(const char*);