Attachment #112664 for bug #154101

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




#

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


USE_SDL=	image mixer net ttf
USE_GNOME=	gnometarget pango
USE_GMAKE=	yes
MAKE_JOBS_SAFE=	yes
USE_BZIP2=	yes
USE_CMAKE=	yes
ACLOCAL_ARGS=	-Im4
AUTOMAKE_ARGS=	--add-missing --copy
CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
		LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--localstatedir=/var \
		--with-boost=${LOCALBASE} \
		--with-icondir=${PREFIX}/share/pixmaps \
		--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 id it ja lt pl pt_BR sk \
		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW

MAN6=		wesnoth.6


PORTDATA=	*

OPTIONS=	ANA	 "Enable Asynchronous Network API (WIP)" On \
		BWMON	 "Enable bandwidth monitoring for server" Off \
		CAMPAIGN "Enable campaign server"	On \
		EDITOR	 "Enable map editor"		On \
		FRIBIDI	 "Enable bidirectional support"	On \
		LOWMEM	 "Reduce memory usage (disables animations)" Off \
		NOTIFY	 "Enable desktop notifications"	On \
		POOLALLOC "Use wesnoth own memory allocator" Off \
		PYTHON	 "Enable python developer tools" Off \
		RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \
		SERVER	 "Enable server"		On \
		TESTS	 "Enable unit tests"		Off \
		TINYGUI	 "Enable tiny gui (down to 320x200)" Off \
		TOOLS	 "Enable extra tools for artists and translators" On

.include <bsd.port.options.mk>

.if ${OSVERSION} < 700000
BROKEN=		does not compile
.endif

.if defined(WITH_DEBUG)
CMAKE_BUILD_TYPE=	debug
.endif

.if defined(WITH_PROFILE)
CONFIGURE_ARGS+=	--enable-profile
.endif

# XXX: breaks compilation because of -Werror
.if !defined(WITH_STRICT)
CMAKE_ARGS+=	-DENABLE_STRICT_COMPILATION=off
.endif

.if defined(WITHOUT_ANA)
CMAKE_ARGS+=	-DUSE_ANA_NETWORK=off
.else
CMAKE_ARGS+=	-DUSE_ANA_NETWORK=on
.endif

.if defined(WITHOUT_BWMON)
CONFIGURE_ARGS+=	--disable-bandwidth-monitor
.else
CONFIGURE_ARGS+=	--enable-bandwidth-monitor
.endif

.if defined(WITHOUT_CAMPAIGN)
CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=off
PLIST_SUB+=	CAMPAIGN="@comment "
.else
CMAKE_ARGS+=	-DENABLE_CAMPAIGN_SERVER=on
PLIST_SUB+=	CAMPAIGN=""
.endif

.if defined(WITHOUT_EDITOR)
CMAKE_ARGS+=	-DENABLE_EDITOR=off
PLIST_SUB+=	EDITOR="@comment "
.else
CMAKE_ARGS+=	-DENABLE_EDITOR=on
PLIST_SUB+=	EDITOR=""
.endif

.if defined(WITHOUT_FRIBIDI)
CMAKE_ARGS+=	-DENABLE_FRIBIDI=off
.else
CMAKE_ARGS+=	-DENABLE_FRIBIDI=on
LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
.endif

.if defined(WITHOUT_LOWMEM)
CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
.else
CMAKE_ARGS+=	-DENABLE_LOW_MEM=off
.endif

.if defined(WITHOUT_NOTIFY)
CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=off
.else
CMAKE_ARGS+=	-DENABLE_NOTIFICATIONS=on
LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
.endif

.if defined(WITHOUT_NLS)
CMAKE_ARGS+=	-DENABLE_NLS=off
PLIST_SUB+=	NLS="@comment "
.else
CMAKE_ARGS+=	-DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
USE_GETTEXT=	yes
MANLANG=	"" cs de en_GB et fi fr gl hu id it ja lt pl pt_BR sk \
		sr sr@ijekavian sr@ijekavianlatin sr@latin zh_CN zh_TW
_MANPAGES+=	${PREFIX}/man/es/man6/wesnothd.6 \
		${PREFIX}/man/tr/man6/wesnothd.6
PLIST_SUB+=	NLS=""
.endif

.if defined(WITHOUT_POOLALLOC)
CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=off
.else
CMAKE_ARGS+=	-DENABLE_POOL_ALLOC=on
.endif

.if defined(WITHOUT_PYTHON)
PLIST_SUB+=	PYTHON="@comment "
PLIST_SUB+=		PYTHON="@comment "
.else
BROKEN=		cmake build doesn\'t support installing python tools
USE_PYTHON=	yes
CONFIGURE_ENV+=	PYTHON_PREFIX=${PREFIX} \
		PYTHON_VERSION=${PYTHON_VERSION:S/python//}
CONFIGURE_ARGS+=--enable-python-install
PLIST_SUB+=	PYTHON=""
.endif

.if !defined(WITHOUT_RAWSOCKETS)
CFLAGS+=	-DNETWORK_USE_RAW_SOCKETS
.else
CONFIGURE_ARGS+=	--enable-raw-sockets
.endif

.if defined(WITHOUT_SERVER)
CMAKE_ARGS+=	-DENABLE_SERVER=off
PLIST_SUB+=	SERVER="@comment "
.else
CMAKE_ARGS+=	-DENABLE_SERVER=on
MAN6+=		wesnothd.6
PLIST_SUB+=	SERVER=""
.endif

.if defined(WITHOUT_TESTS)
CMAKE_ARGS+=	-DENABLE_TESTS=off
PLIST_SUB+=	TESTS="@comment "
.else
CMAKE_ARGS+=	-DENABLE_TESTS=on
PLIST_SUB+=	TESTS=""
.endif

.if !defined(WITHOUT_TINYGUI)
CMAKE_ARGS+=	-DGUI=tiny
BUILD_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
BUILD_DEPENDS+=		convert:${PORTSDIR}/graphics/ImageMagick
CONFIGURE_ARGS+=	--enable-tinygui
.endif

.if defined(WITHOUT_TOOLS)
CMAKE_ARGS+=	-DENABLE_TOOLS=off
PLIST_SUB+=	TOOLS="@comment "
.else
CMAKE_ARGS+=	-DENABLE_TOOLS=on
PLIST_SUB+=	TOOLS=""
.endif

.if defined(NOPORTDOCS)
CMAKE_ARGS+=	-DDOCDIR=none
.endif

.if defined(NOPORTDATA)
IGNORE=		game data is required, undefine NOPORTDATA
.endif

post-patch:	.SILENT
	${REINPLACE_CMD} -e 's|png_voidp_NULL|NULL|g' \
		-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.mk>

Lines 1-2 Link Here

(-)games/wesnoth-devel/distinfo (-2 / +2 lines)
1	SHA256 (wesnoth-1.9.3.tar.bz2) = 1c804b20cc20636ce2ca216d6b304c1c76ff8f8430a0eb85e44029da3aa46bdf	1	SHA256 (wesnoth-1.9.4.tar.bz2) = 8644fc2efe071c91a306ca91419ccd11221c6930a1889d356c3a31501765e8d0
2	SIZE (wesnoth-1.9.3.tar.bz2) = 332594366	2	SIZE (wesnoth-1.9.4.tar.bz2) = 334376625




%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/af/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/bg/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ca/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/cs/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/da/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/de/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/el/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/en@shaw/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/eo/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/es/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/et/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/eu/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/fi/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-units.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/fur_IT/LC_MESSAGES/wesnoth.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-did.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-dm.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-lib.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-low.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-multiplayer.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-nr.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-sof.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-sotbe.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tb.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-test.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-thot.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-trow.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tsg.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-tutorial.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-units.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth-utbs.mo
%%NLS%%share/locale/ga/LC_MESSAGES/wesnoth.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-anl.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-aoi.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-did.mo

%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/gl/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/he/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/hr/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/hu/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/id/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/is/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/it/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ja/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ko/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/la/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/lt/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/lv/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/mk/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/mr/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/nl/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/pl/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/pt/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ro/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/ru/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sk/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sl/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sr/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/sv/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/tl/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/tr/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/vi/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wesnoth-lib.mo

%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-dw.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-editor.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-ei.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-help.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-httt.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-l.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-lib.mo

@dirrmtry man/fr
@dirrmtry man/fur_IT/man6
@dirrmtry man/fur_IT
@dirrmtry man/ga/man6
@dirrmtry man/ga
@dirrmtry man/gl/man6
@dirrmtry man/gl
@dirrmtry man/he/man6




--- CMakeLists.txt~
+++ CMakeLists.txt
@@ -21,11 +21,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR
 find_package(SDL 1.2.7 REQUIRED)
 find_package(Boost 1.35 REQUIRED COMPONENTS iostreams regex)
 
-# no, gettext executables are not required when NLS is deactivated
+if(ENABLE_NLS)
 find_package(Gettext)
-# yes, libintl is *required* even when NLS is deactivated (this is to compile
-# src/gettext.cpp since it includes libintl.h)
 find_package(Libintl REQUIRED)
+endif(ENABLE_NLS)
 
 find_package(X11)
 
@@ -68,7 +67,7 @@ option(ENABLE_GAME "Enable compilation o
 option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
 option(ENABLE_SERVER "Enable compilation of server" ON)
 option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON)
-option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
+option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers" OFF)
 option(ENABLE_TESTS "Build unit tests")
 option(ENABLE_NLS "Enable building of translations" ON)
 option(ENABLE_POOL_ALLOC "Enable custom pool malloc" OFF)
@@ -114,18 +113,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 		endif(ENABLE_STRICT_COMPILATION)
 
 		# Strict compilation for C files is disabled until somebody wants to clean them.
-		set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi $ENV{CFLAGS}" 
+		set(CMAKE_C_FLAGS "-W -Wall -ansi $ENV{CFLAGS}" 
 				CACHE STRING "Flags used by the C compiler during normal builds." FORCE)
-		set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi $ENV{CFLAGS}"
+		set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -W -Wall -ansi $ENV{CFLAGS}"
 				CACHE STRING "Flags used by the C compiler during debug builds." FORCE)
-		set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
+		set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
 				CACHE STRING "Flags used by the C compiler during release builds." FORCE)
 
-		set(CMAKE_CXX_FLAGS "-O2 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
+		set(CMAKE_CXX_FLAGS "-W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
 				CACHE STRING "Flags used by the CXX compiler during normal builds." FORCE)
-		set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
+		set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
 				CACHE STRING "Flags used by the CXX compiler during debug builds." FORCE)
-		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
+		set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
 				CACHE STRING "Flags used by the CXX compiler during release builds." FORCE)
 
 	endif(NOT CONFIGURED)
@@ -151,9 +150,15 @@ if(X11_FOUND)
 	add_definitions(-D_X11)
 endif(X11_FOUND)
 
+if(IS_ABSOLUTE ${LOCALEDIR})
+	set(LOCALE_INSTALL ${LOCALEDIR})
+	add_definitions(-DLOCALEDIR=\\\"${LOCALE_INSTALL}\\\")
+	set(LOCALEDIR "translations")
+else(IS_ABSOLUTE ${LOCALEDIR})
 add_definitions(-DHAS_RELATIVE_LOCALEDIR=1)
 add_definitions(-DLOCALEDIR=\\\"${LOCALEDIR}\\\")
 set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
+endif(IS_ABSOLUTE ${LOCALEDIR})
 
 add_definitions(-DFIFODIR=\\\"${FIFO_DIR}\\\")
 
@@ -201,10 +206,14 @@ if(ENABLE_GAME)
 		pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )
 	endif(NOT MSVC)
 
-	find_package( FriBiDi )
+	pkg_check_modules( FRIBIDI fribidi>=0.19.0 )
 	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
 		add_definitions(-DHAVE_FRIBIDI)
 	elseif(ENABLE_FRIBIDI AND NOT FRIBIDI_LIBRARIES)
+		pkg_check_modules( FRIBIDI fribidi )
+		if(FRIBIDI_LIBRARIES)
+			add_definitions(-DOLD_FRIBIDI)
+		endif(FRIBIDI_LIBRARIES)
 		message("Could not find FriBiDi. Disabling FriBiDi support.")
 	endif()
 




--- Makefile.am~
+++ Makefile.am
@@ -73,6 +73,7 @@ if INSTALLDATA
 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
+if INSTALLDOCS
 	@echo "Replicate doc directory skeleton under target doc subdirectory"
 	@echo "Then copy all corresponding files."
 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@@ -84,6 +85,7 @@ if INSTALLDATA
 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
 	done
+endif
 if TINYGUI
 	@echo "Shrink installed images by a factor of two."
 	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \




--- configure.ac~
+++ configure.ac
@@ -213,6 +213,11 @@ esac
 AC_SUBST([FULLLOCALEDIR])
 AC_SUBST([HAS_RELATIVE_LOCALEDIR])
 
+AC_ARG_WITH([docs],
+	         AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
+	      [docs=$withval],
+	      [docs=yes])
+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
 
 AC_ARG_ENABLE([game],
               AS_HELP_STRING([--disable-game], [disable compilation of game]),

Added Link Here

(-)games/wesnoth-devel/files/patch-doc-CMakeLists.txt (+7 lines)
1	--- doc/CMakeLists.txt~
2	+++ doc/CMakeLists.txt
3	@@ -1,2 +1,4 @@
4	add_subdirectory(man)
5	+if(NOT DOCDIR STREQUAL "none")
6	add_subdirectory(manual)
7	+endif(NOT DOCDIR STREQUAL "none")

Removed Link Here

(-)games/wesnoth-devel/files/patch-m4-boost.m4 (-11 lines)
1	--- m4/boost.m4~ 2010-05-27 11:37:13.000000000 +0400
2	+++ m4/boost.m4 2010-08-23 07:12:17.014432212 +0400
3	@@ -729,7 +729,7 @@ AC_CACHE_CHECK([for the flags needed to
4	esac
5	# Generate the test file.
6	AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
7	- [pthread_t th; pthread_join(th, 0);
8	+ [pthread_t th=NULL; pthread_join(th, 0);
9	pthread_attr_init(0); pthread_cleanup_push(0, 0);
10	pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
11	for boost_pthread_flag in '' $boost_pthread_flags; do




--- m4/zlib.m4~
+++ m4/zlib.m4
@@ -16,11 +16,9 @@ fi
 AC_MSG_CHECKING([for zlib location])
 if test x"$zlib_prefix" = x ; then
   zlib_header_found="no"
-  for dir in /usr/local /usr ; do
+  for dir in /usr ; do
   if test -f "$dir/include/zlib.h" ; then
     zlib_header_found="yes"
-    ZLIB_CFLAGS="-I$dir/include"
-    ZLIB_LDFLAGS="-L$dir/lib"
     break
   fi
   done




--- po/CMakeLists.txt~
+++ po/CMakeLists.txt
@@ -273,9 +273,6 @@ if(ENABLE_NLS)
 				COMMENT "mo-update [${DOMAIN}-${LINGUA}]: Creating mo file."
 			)
 
-			install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
-					DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
-
 			set(mo-update-SRC ${mo-update-SRC} 
 				${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
 			)
@@ -285,6 +282,11 @@ if(ENABLE_NLS)
 
 		endforeach(DOMAIN ${DOMAINS})
 
+		foreach(DOMAIN ${NORMAL_DOMAINS})
+			install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
+					DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
+		endforeach(DOMAIN ${NORMAL_DOMAINS})
+
 		if(ENABLE_POT_UPDATE_TARGET)
 			add_custom_target(mo-update-${LINGUA}
 				COMMENT "mo-update ${LINGUA}: Done."




--- src/CMakeLists.txt~
+++ src/CMakeLists.txt
@@ -123,7 +123,7 @@ set(tools-external-libs
 )
 
 if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
-	include_directories( ${FRIBIDI_INCLUDE_DIR} )
+	include_directories( ${FRIBIDI_INCLUDE_DIRS} )
 	set(game-external-libs ${game-external-libs} ${FRIBIDI_LIBRARIES})
 endif(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
 
@@ -782,6 +782,13 @@ set_target_properties(cutter PROPERTIES 
 
 install(TARGETS cutter DESTINATION ${BINDIR})
 
+set(tools_data ../data/tools/wmlscope
+               ../data/tools/wmllint
+               ../data/tools/wmlindent
+               ../data/tools/wesnoth_addon_manager )
+
+install(FILES ${tools_data} DESTINATION ${BINDIR})
+
 endif(ENABLE_TOOLS)
 
 ########### Unit tests ###############
@@ -826,7 +833,9 @@ if(ENABLE_TESTS)
 		boost_unit_test_framework
 	)
 	set_target_properties(test
-		PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}test${BINARY_SUFFIX}
+		PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth_test${BINARY_SUFFIX}
 	)
+
+	install(TARGETS test DESTINATION ${BINDIR})
 endif(ENABLE_TESTS)
 




--- src/Makefile.am~
+++ src/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS += campaignd
 endif
 
 if TESTS
-bin_PROGRAMS += test
+bin_PROGRAMS += wesnoth_test
 endif
 
 CLEANFILES = revision.hpp
@@ -342,7 +342,7 @@ cutter_DEPENDENCIES=libwesnoth-core.a
 #    Unit tests                                                             #
 #############################################################################
 
-test_SOURCES =  \
+wesnoth_test_SOURCES =  \
 	tests/main.cpp \
 	tests/utils/fake_display.cpp \
 	tests/utils/fake_event_source.cpp \
@@ -450,12 +450,12 @@ test_SOURCES =  \
 	tests/gui/test_save_dialog.cpp \
 	$(wesnoth_source)
 
-test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
-test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
+wesnoth_test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
+wesnoth_test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
 if ANA
-test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
-test_DEPENDENCIES += libana.a
-test_SOURCES += network_worker.cpp
+wesnoth_test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
+wesnoth_test_DEPENDENCIES += libana.a
+wesnoth_test_SOURCES += network_worker.cpp
 endif
 
 #############################################################################




--- src/ana/src/CMakeLists.txt~
+++ src/ana/src/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories( ../api )
 
 find_package( Boost 1.35 REQUIRED COMPONENTS thread system)
 
-set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3" )
+set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" )
 
 set ( common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp )
 
@@ -20,19 +20,9 @@ target_link_libraries( ana-static ${Boos
 
 set ( CMAKE_INSTALL_PREFIX /usr/local )
 
-IF(NOT MSVC)
-       set ( CMAKE_INSTALL_PREFIX /usr/local )
-       install ( TARGETS ana LIBRARY DESTINATION lib )
-       install ( TARGETS ana-static ARCHIVE DESTINATION lib )
-ENDIF(NOT MSVC)
-
 set ( ana_headers ../api/ana.hpp
                   ../api/common.hpp
                   ../api/timers.hpp
                   ../api/buffers.hpp
                   ../api/predicates.hpp
                   ../api/binary_streams.hpp )
-
-IF(NOT MSVC)
-       install ( FILES  ${ana_headers} DESTINATION include/ana )
-ENDIF(NOT MSVC)
\ No newline at end of file

Removed Link Here

(-)games/wesnoth-devel/files/patch-src-tests-main.cpp (-10 lines)
1	--- src/tests/main.cpp~
2	+++ src/tests/main.cpp
3	@@ -15,6 +15,7 @@
4	#define GETTEXT_DOMAIN "wesnoth-test"
5
6
7	+#define BOOST_TEST_DYN_LINK
8	#define BOOST_TEST_MODULE wesnoth unit tests master suite
9	#include <boost/test/unit_test.hpp>
10	#include <boost/test/unit_test_monitor.hpp>

Return to bug 154101

Lines 6-12 Link Here

(-)games/wesnoth-devel/Makefile (-98 / +62 lines)
6	#	6	#
7		7
8	PORTNAME= wesnoth	8	PORTNAME= wesnoth
9	PORTVERSION= 1.9.3	9	PORTVERSION= 1.9.4
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
12	http://files.wesnoth.org/	12	http://files.wesnoth.org/
Lines 25-48 CONFLICTS= wesnoth-[0-9]* Link Here
25		25
26	USE_SDL= image mixer net ttf	26	USE_SDL= image mixer net ttf
27	USE_GNOME= gnometarget pango	27	USE_GNOME= gnometarget pango
28	USE_GMAKE= yes
29	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
30	USE_BZIP2= yes	29	USE_BZIP2= yes
31	USE_AUTOTOOLS= aclocal autoheader automake autoconf	30	USE_CMAKE= yes
32	ACLOCAL_ARGS= -Im4
33	AUTOMAKE_ARGS= --add-missing --copy
34	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
35	LDFLAGS="${LDFLAGS}"
36	CONFIGURE_ARGS= --localstatedir=/var \
37	--with-boost=${LOCALBASE} \
38	--with-icondir=${PREFIX}/share/pixmaps \
39	--with-libiconv-prefix=${LOCALBASE} \
40	--with-libintl-prefix=${LOCALBASE} \
41	--with-localedir=${PREFIX}/share/locale
42	PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
43
44	MANLANG= "" cs de en_GB es et fi fr gl hu id it ja lt pl pt_BR sk \
45	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
46		31
47	MAN6= wesnoth.6	32	MAN6= wesnoth.6
48		33
Lines 50-215 PORTDOCS= * Link Here
50	PORTDATA= *	35	PORTDATA= *
51		36
52	OPTIONS= ANA "Enable Asynchronous Network API (WIP)" On \	37	OPTIONS= ANA "Enable Asynchronous Network API (WIP)" On \
53	BWMON "Enable bandwidth monitoring for server" Off \
54	CAMPAIGN "Enable campaign server" On \	38	CAMPAIGN "Enable campaign server" On \
55	EDITOR "Enable map editor" On \	39	EDITOR "Enable map editor" On \
56	FRIBIDI "Enable bidirectional support" On \	40	FRIBIDI "Enable bidirectional support" On \
57	LOWMEM "Reduce memory usage (disables animations)" Off \	41	LOWMEM "Reduce memory usage (disables animations)" Off \
58	NOTIFY "Enable desktop notifications" On \	42	NOTIFY "Enable desktop notifications" On \
59	POOLALLOC "Use wesnoth own memory allocator" Off \	43	POOLALLOC "Use wesnoth own memory allocator" Off \
60	PYTHON "Enable python developer tools" On \	44	PYTHON "Enable python developer tools" Off \
61	RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \	45	RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \
62	SERVER "Enable server" On \	46	SERVER "Enable server" On \
63	TESTS "Enable unit tests" Off \	47	TESTS "Enable unit tests" Off \
64	TINYGUI "Enable tiny gui (down to 320x200)" Off \	48	TINYGUI "Enable tiny gui (down to 320x200)" Off \
65	TOOLS "Enable extra tools for artists and translators" On	49	TOOLS "Enable extra tools for artists and translators" On
66		50
67	.include <bsd.port.pre.mk>	51	.include <bsd.port.options.mk>
68
69	.if ${OSVERSION} < 700000
70	BROKEN= does not compile
71	.endif
72		52
73	.if defined(WITH_DEBUG)	53	.if defined(WITH_DEBUG)
74	CONFIGURE_ARGS+= --enable-debug	54	CMAKE_BUILD_TYPE= debug
75	.endif
76
77	.if defined(WITH_PROFILE)
78	CONFIGURE_ARGS+= --enable-profile
79	.endif	55	.endif
80		56
81	# XXX: breaks compilation because of -Werror	57	# XXX: breaks compilation because of -Werror
82	.if !defined(WITH_STRICT)	58	.if !defined(WITH_STRICT)
83	CONFIGURE_ARGS+= --disable-strict-compilation	59	CMAKE_ARGS+= -DENABLE_STRICT_COMPILATION=off
84	.endif	60	.endif
85		61
86	.if defined(WITHOUT_ANA)	62	.if defined(WITHOUT_ANA)
87	CONFIGURE_ARGS+= --disable-ana	63	CMAKE_ARGS+= -DUSE_ANA_NETWORK=off
88	.else	64	.else
89	CONFIGURE_ARGS+= --enable-ana	65	CMAKE_ARGS+= -DUSE_ANA_NETWORK=on
90	.endif
91
92	.if defined(WITHOUT_BWMON)
93	CONFIGURE_ARGS+= --disable-bandwidth-monitor
94	.else
95	CONFIGURE_ARGS+= --enable-bandwidth-monitor
96	.endif	66	.endif
97		67
98	.if defined(WITHOUT_CAMPAIGN)	68	.if defined(WITHOUT_CAMPAIGN)
99	CONFIGURE_ARGS+= --disable-campaign-server	69	CMAKE_ARGS+= -DENABLE_CAMPAIGN_SERVER=off
100	PLIST_SUB+= CAMPAIGN="@comment "	70	PLIST_SUB+= CAMPAIGN="@comment "
101	.else	71	.else
102	CONFIGURE_ARGS+= --enable-campaign-server	72	CMAKE_ARGS+= -DENABLE_CAMPAIGN_SERVER=on
103	PLIST_SUB+= CAMPAIGN=""	73	PLIST_SUB+= CAMPAIGN=""
104	.endif	74	.endif
105		75
106	.if defined(WITHOUT_EDITOR)	76	.if defined(WITHOUT_EDITOR)
107	CONFIGURE_ARGS+= --disable-editor	77	CMAKE_ARGS+= -DENABLE_EDITOR=off
108	PLIST_SUB+= EDITOR="@comment "	78	PLIST_SUB+= EDITOR="@comment "
109	.else	79	.else
110	CONFIGURE_ARGS+= --enable-editor	80	CMAKE_ARGS+= -DENABLE_EDITOR=on
111	PLIST_SUB+= EDITOR=""	81	PLIST_SUB+= EDITOR=""
112	.endif	82	.endif
113		83
114	.if defined(WITHOUT_FRIBIDI)	84	.if defined(WITHOUT_FRIBIDI)
115	CONFIGURE_ARGS+= --without-fribidi	85	CMAKE_ARGS+= -DENABLE_FRIBIDI=off
116	.else	86	.else
117	CONFIGURE_ARGS+= --with-fribidi	87	CMAKE_ARGS+= -DENABLE_FRIBIDI=on
118	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi	88	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi
119	.endif	89	.endif
120		90
121	.if defined(WITHOUT_LOWMEM)	91	.if defined(WITHOUT_LOWMEM)
122	CONFIGURE_ARGS+= --disable-lowmem	92	CMAKE_ARGS+= -DENABLE_LOW_MEM=off
123	.else	93	.else
124	CONFIGURE_ARGS+= --enable-lowmem	94	CMAKE_ARGS+= -DENABLE_LOW_MEM=off
125	.endif	95	.endif
126		96
127	.if defined(WITHOUT_NOTIFY)	97	.if defined(WITHOUT_NOTIFY)
128	CONFIGURE_ARGS+= --disable-notifications	98	CMAKE_ARGS+= -DENABLE_NOTIFICATIONS=off
129	.else	99	.else
130	CONFIGURE_ARGS+= --enable-notifications --enable-dbus	100	CMAKE_ARGS+= -DENABLE_NOTIFICATIONS=on
131	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus	101	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
132	.endif	102	.endif
133		103
134	.if defined(WITHOUT_NLS)	104	.if defined(WITHOUT_NLS)
135	CONFIGURE_ARGS+= --disable-nls	105	CMAKE_ARGS+= -DENABLE_NLS=off
136	PLIST_SUB+= NLS="@comment "	106	PLIST_SUB+= NLS="@comment "
137	.else	107	.else
138	USE_GETTEXT= yes	108	CMAKE_ARGS+= -DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
139	CONFIGURE_ARGS+= --enable-nls	109	USE_GETTEXT= yes
140	PLIST_SUB+= NLS=""	110	MANLANG= "" cs de en_GB et fi fr gl hu id it ja lt pl pt_BR sk \
		111	sr sr@ijekavian sr@ijekavianlatin sr@latin zh_CN zh_TW
		112	_MANPAGES+= ${PREFIX}/man/es/man6/wesnothd.6 \
		113	${PREFIX}/man/tr/man6/wesnothd.6
		114	PLIST_SUB+= NLS=""
141	.endif	115	.endif
142		116
143	.if defined(WITHOUT_POOLALLOC)	117	.if defined(WITHOUT_POOLALLOC)
144	CONFIGURE_ARGS+= --disable-pool-alloc	118	CMAKE_ARGS+= -DENABLE_POOL_ALLOC=off
145	.else	119	.else
146	CONFIGURE_ARGS+= --enable-pool-alloc	120	CMAKE_ARGS+= -DENABLE_POOL_ALLOC=on
147	.endif	121	.endif
148		122
149	.if defined(WITHOUT_PYTHON)	123	.if defined(WITHOUT_PYTHON)
150	CONFIGURE_ARGS+= --disable-python-install	124	PLIST_SUB+= PYTHON="@comment "
151	PLIST_SUB+= PYTHON="@comment "
152	.else	125	.else
153	USE_PYTHON= yes	126	BROKEN= cmake build doesn\'t support installing python tools
154	CONFIGURE_ENV+= PYTHON_PREFIX=${PREFIX} \	127	USE_PYTHON= yes
155	PYTHON_VERSION=${PYTHON_VERSION:S/python//}	128	CONFIGURE_ENV+= PYTHON_PREFIX=${PREFIX} \
156	CONFIGURE_ARGS+= --enable-python-install	129	PYTHON_VERSION=${PYTHON_VERSION:S/python//}
157	PLIST_SUB+= PYTHON=""	130	CONFIGURE_ARGS+=--enable-python-install
158	.include "${PORTSDIR}/Mk/bsd.python.mk"	131	PLIST_SUB+= PYTHON=""
159	.endif	132	.endif
160		133
161	.if defined(WITHOUT_RAWSOCKETS)	134	.if !defined(WITHOUT_RAWSOCKETS)
162	CONFIGURE_ARGS+= --disable-raw-sockets	135	CFLAGS+= -DNETWORK_USE_RAW_SOCKETS
163	.else
164	CONFIGURE_ARGS+= --enable-raw-sockets
165	.endif	136	.endif
166		137
167	.if defined(WITHOUT_SERVER)	138	.if defined(WITHOUT_SERVER)
168	CONFIGURE_ARGS+= --disable-server	139	CMAKE_ARGS+= -DENABLE_SERVER=off
169	PLIST_SUB+= SERVER="@comment "	140	PLIST_SUB+= SERVER="@comment "
170	.else	141	.else
171	CONFIGURE_ARGS+= --enable-server	142	CMAKE_ARGS+= -DENABLE_SERVER=on
172	MAN6+= wesnothd.6	143	MAN6+= wesnothd.6
173	PLIST_SUB+= SERVER=""	144	PLIST_SUB+= SERVER=""
174	.endif	145	.endif
175		146
176	.if defined(WITHOUT_TESTS)	147	.if defined(WITHOUT_TESTS)
177	CONFIGURE_ARGS+= --disable-tests	148	CMAKE_ARGS+= -DENABLE_TESTS=off
178	PLIST_SUB+= TESTS="@comment "	149	PLIST_SUB+= TESTS="@comment "
179	.else	150	.else
180	CONFIGURE_ARGS+= --enable-tests	151	CMAKE_ARGS+= -DENABLE_TESTS=on
181	PLIST_SUB+= TESTS=""	152	PLIST_SUB+= TESTS=""
182	.endif	153	.endif
183		154
184	.if defined(WITHOUT_TINYGUI)	155	.if !defined(WITHOUT_TINYGUI)
185	CONFIGURE_ARGS+= --disable-tinygui	156	CMAKE_ARGS+= -DGUI=tiny
186	.else	157	BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
187	BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
188	CONFIGURE_ARGS+= --enable-tinygui
189	.endif	158	.endif
190		159
191	.if defined(WITHOUT_TOOLS)	160	.if defined(WITHOUT_TOOLS)
192	CONFIGURE_ARGS+= --disable-tools	161	CMAKE_ARGS+= -DENABLE_TOOLS=off
193	PLIST_SUB+= TOOLS="@comment "	162	PLIST_SUB+= TOOLS="@comment "
194	.else	163	.else
195	CONFIGURE_ARGS+= --enable-tools	164	CMAKE_ARGS+= -DENABLE_TOOLS=on
196	PLIST_SUB+= TOOLS=""	165	PLIST_SUB+= TOOLS=""
197	.endif	166	.endif
198		167
199	.if defined(NOPORTDOCS)	168	.if defined(NOPORTDOCS)
200	CONFIGURE_ARGS+= --without-docs	169	CMAKE_ARGS+= -DDOCDIR=none
201	.endif	170	.endif
202		171
203	.if defined(NOPORTDATA)	172	.if defined(NOPORTDATA)
204	IGNORE= game data is required, undefine NOPORTDATA	173	IGNORE= game data is required, undefine NOPORTDATA
205	.endif	174	.endif
206		175
207	post-patch: .SILENT
208	${REINPLACE_CMD} -e 's\|png_voidp_NULL\|NULL\|g' \
209	-e 's\|png_error_ptr_NULL\|NULL\|g' \
210	${WRKSRC}/src/tools/exploder_utils.cpp
211
212	post-install:	176	post-install:
213	-update-desktop-database ${PREFIX}/share/applications	177	-update-desktop-database ${PREFIX}/share/applications
214		178
215	.include <bsd.port.post.mk>	179	.include <bsd.port.mk>

Added Link Here

(-)games/wesnoth-devel/files/patch-CMakeLists.txt (+82 lines)
1	--- CMakeLists.txt~
2	+++ CMakeLists.txt
3	@@ -21,11 +21,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR
4	find_package(SDL 1.2.7 REQUIRED)
5	find_package(Boost 1.35 REQUIRED COMPONENTS iostreams regex)
6
7	-# no, gettext executables are not required when NLS is deactivated
8	+if(ENABLE_NLS)
9	find_package(Gettext)
10	-# yes, libintl is required even when NLS is deactivated (this is to compile
11	-# src/gettext.cpp since it includes libintl.h)
12	find_package(Libintl REQUIRED)
13	+endif(ENABLE_NLS)
14
15	find_package(X11)
16
17	@@ -68,7 +67,7 @@ option(ENABLE_GAME "Enable compilation o
18	option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
19	option(ENABLE_SERVER "Enable compilation of server" ON)
20	option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON)
21	-option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
22	+option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers" OFF)
23	option(ENABLE_TESTS "Build unit tests")
24	option(ENABLE_NLS "Enable building of translations" ON)
25	option(ENABLE_POOL_ALLOC "Enable custom pool malloc" OFF)
26	@@ -114,18 +113,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
27	endif(ENABLE_STRICT_COMPILATION)
28
29	# Strict compilation for C files is disabled until somebody wants to clean them.
30	- set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi $ENV{CFLAGS}"
31	+ set(CMAKE_C_FLAGS "-W -Wall -ansi $ENV{CFLAGS}"
32	CACHE STRING "Flags used by the C compiler during normal builds." FORCE)
33	- set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi $ENV{CFLAGS}"
34	+ set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -W -Wall -ansi $ENV{CFLAGS}"
35	CACHE STRING "Flags used by the C compiler during debug builds." FORCE)
36	- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
37	+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
38	CACHE STRING "Flags used by the C compiler during release builds." FORCE)
39
40	- set(CMAKE_CXX_FLAGS "-O2 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
41	+ set(CMAKE_CXX_FLAGS "-W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
42	CACHE STRING "Flags used by the CXX compiler during normal builds." FORCE)
43	- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
44	+ set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
45	CACHE STRING "Flags used by the CXX compiler during debug builds." FORCE)
46	- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
47	+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
48	CACHE STRING "Flags used by the CXX compiler during release builds." FORCE)
49
50	endif(NOT CONFIGURED)
51	@@ -151,9 +150,15 @@ if(X11_FOUND)
52	add_definitions(-D_X11)
53	endif(X11_FOUND)
54
55	+if(IS_ABSOLUTE ${LOCALEDIR})
56	+ set(LOCALE_INSTALL ${LOCALEDIR})
57	+ add_definitions(-DLOCALEDIR=\\\"${LOCALE_INSTALL}\\\")
58	+ set(LOCALEDIR "translations")
59	+else(IS_ABSOLUTE ${LOCALEDIR})
60	add_definitions(-DHAS_RELATIVE_LOCALEDIR=1)
61	add_definitions(-DLOCALEDIR=\\\"${LOCALEDIR}\\\")
62	set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
63	+endif(IS_ABSOLUTE ${LOCALEDIR})
64
65	add_definitions(-DFIFODIR=\\\"${FIFO_DIR}\\\")
66
67	@@ -201,10 +206,14 @@ if(ENABLE_GAME)
68	pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )
69	endif(NOT MSVC)
70
71	- find_package( FriBiDi )
72	+ pkg_check_modules( FRIBIDI fribidi>=0.19.0 )
73	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
74	add_definitions(-DHAVE_FRIBIDI)
75	elseif(ENABLE_FRIBIDI AND NOT FRIBIDI_LIBRARIES)
76	+ pkg_check_modules( FRIBIDI fribidi )
77	+ if(FRIBIDI_LIBRARIES)
78	+ add_definitions(-DOLD_FRIBIDI)
79	+ endif(FRIBIDI_LIBRARIES)
80	message("Could not find FriBiDi. Disabling FriBiDi support.")
81	endif()
82

Removed Link Here

(-)games/wesnoth-devel/files/patch-Makefile.am (-18 lines)
1	--- Makefile.am~
2	+++ Makefile.am
3	@@ -73,6 +73,7 @@ if INSTALLDATA
4	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
5	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
6	done
7	+if INSTALLDOCS
8	@echo "Replicate doc directory skeleton under target doc subdirectory"
9	@echo "Then copy all corresponding files."
10	test -z "$(docdir)" \|\| $(mkdir_p) "$(DESTDIR)$(docdir)"
11	@@ -84,6 +85,7 @@ if INSTALLDATA
12	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
13	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
14	done
15	+endif
16	if TINYGUI
17	@echo "Shrink installed images by a factor of two."
18	(cd $(top_srcdir) && find data/core/images data/campaigns images \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) \| while read p; do \

Removed Link Here

(-)games/wesnoth-devel/files/patch-configure.ac (-14 lines)
1	--- configure.ac~
2	+++ configure.ac
3	@@ -213,6 +213,11 @@ esac
4	AC_SUBST([FULLLOCALEDIR])
5	AC_SUBST([HAS_RELATIVE_LOCALEDIR])
6
7	+AC_ARG_WITH([docs],
8	+ AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
9	+ [docs=$withval],
10	+ [docs=yes])
11	+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
12
13	AC_ARG_ENABLE([game],
14	AS_HELP_STRING([--disable-game], [disable compilation of game]),

Removed Link Here

(-)games/wesnoth-devel/files/patch-m4-zlib.m4 (-15 lines)
1	--- m4/zlib.m4~
2	+++ m4/zlib.m4
3	@@ -16,11 +16,9 @@ fi
4	AC_MSG_CHECKING([for zlib location])
5	if test x"$zlib_prefix" = x ; then
6	zlib_header_found="no"
7	- for dir in /usr/local /usr ; do
8	+ for dir in /usr ; do
9	if test -f "$dir/include/zlib.h" ; then
10	zlib_header_found="yes"
11	- ZLIB_CFLAGS="-I$dir/include"
12	- ZLIB_LDFLAGS="-L$dir/lib"
13	break
14	fi
15	done

Added Link Here

(-)games/wesnoth-devel/files/patch-po-CMakeLists.txt (+24 lines)
1	--- po/CMakeLists.txt~
2	+++ po/CMakeLists.txt
3	@@ -273,9 +273,6 @@ if(ENABLE_NLS)
4	COMMENT "mo-update [${DOMAIN}-${LINGUA}]: Creating mo file."
5	)
6
7	- install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
8	- DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
9	-
10	set(mo-update-SRC ${mo-update-SRC}
11	${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
12	)
13	@@ -285,6 +282,11 @@ if(ENABLE_NLS)
14
15	endforeach(DOMAIN ${DOMAINS})
16
17	+ foreach(DOMAIN ${NORMAL_DOMAINS})
18	+ install(FILES ${CMAKE_SOURCE_DIR}/${LOCALEDIR}/${LINGUA}/LC_MESSAGES/${DOMAIN}.mo
19	+ DESTINATION ${LOCALE_INSTALL}/${LINGUA}/LC_MESSAGES)
20	+ endforeach(DOMAIN ${NORMAL_DOMAINS})
21	+
22	if(ENABLE_POT_UPDATE_TARGET)
23	add_custom_target(mo-update-${LINGUA}
24	COMMENT "mo-update ${LINGUA}: Done."

Added Link Here

(-)games/wesnoth-devel/files/patch-src-CMakeLists.txt (+36 lines)
1	--- src/CMakeLists.txt~
2	+++ src/CMakeLists.txt
3	@@ -123,7 +123,7 @@ set(tools-external-libs
4	)
5
6	if(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
7	- include_directories( ${FRIBIDI_INCLUDE_DIR} )
8	+ include_directories( ${FRIBIDI_INCLUDE_DIRS} )
9	set(game-external-libs ${game-external-libs} ${FRIBIDI_LIBRARIES})
10	endif(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
11
12	@@ -782,6 +782,13 @@ set_target_properties(cutter PROPERTIES
13
14	install(TARGETS cutter DESTINATION ${BINDIR})
15
16	+set(tools_data ../data/tools/wmlscope
17	+ ../data/tools/wmllint
18	+ ../data/tools/wmlindent
19	+ ../data/tools/wesnoth_addon_manager )
20	+
21	+install(FILES ${tools_data} DESTINATION ${BINDIR})
22	+
23	endif(ENABLE_TOOLS)
24
25	########### Unit tests ###############
26	@@ -826,7 +833,9 @@ if(ENABLE_TESTS)
27	boost_unit_test_framework
28	)
29	set_target_properties(test
30	- PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}test${BINARY_SUFFIX}
31	+ PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth_test${BINARY_SUFFIX}
32	)
33	+
34	+ install(TARGETS test DESTINATION ${BINDIR})
35	endif(ENABLE_TESTS)
36

Removed Link Here

(-)games/wesnoth-devel/files/patch-src-Makefile.am (-38 lines)
1	--- src/Makefile.am~
2	+++ src/Makefile.am
3	@@ -16,7 +16,7 @@ bin_PROGRAMS += campaignd
4	endif
5
6	if TESTS
7	-bin_PROGRAMS += test
8	+bin_PROGRAMS += wesnoth_test
9	endif
10
11	CLEANFILES = revision.hpp
12	@@ -342,7 +342,7 @@ cutter_DEPENDENCIES=libwesnoth-core.a
13	# Unit tests #
14	#############################################################################
15
16	-test_SOURCES = \
17	+wesnoth_test_SOURCES = \
18	tests/main.cpp \
19	tests/utils/fake_display.cpp \
20	tests/utils/fake_event_source.cpp \
21	@@ -450,12 +450,12 @@ test_SOURCES = \
22	tests/gui/test_save_dialog.cpp \
23	$(wesnoth_source)
24
25	-test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
26	-test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
27	+wesnoth_test_LDADD = $(INTERNALLIBS) $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
28	+wesnoth_test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
29	if ANA
30	-test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
31	-test_DEPENDENCIES += libana.a
32	-test_SOURCES += network_worker.cpp
33	+wesnoth_test_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
34	+wesnoth_test_DEPENDENCIES += libana.a
35	+wesnoth_test_SOURCES += network_worker.cpp
36	endif
37
38	#############################################################################

Added Link Here

(-)games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt (+32 lines)
1	--- src/ana/src/CMakeLists.txt~
2	+++ src/ana/src/CMakeLists.txt
3	@@ -4,7 +4,7 @@ include_directories( ../api )
4
5	find_package( Boost 1.35 REQUIRED COMPONENTS thread system)
6
7	-set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3" )
8	+set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" )
9
10	set ( common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp )
11
12	@@ -20,19 +20,9 @@ target_link_libraries( ana-static ${Boos
13
14	set ( CMAKE_INSTALL_PREFIX /usr/local )
15
16	-IF(NOT MSVC)
17	- set ( CMAKE_INSTALL_PREFIX /usr/local )
18	- install ( TARGETS ana LIBRARY DESTINATION lib )
19	- install ( TARGETS ana-static ARCHIVE DESTINATION lib )
20	-ENDIF(NOT MSVC)
21	-
22	set ( ana_headers ../api/ana.hpp
23	../api/common.hpp
24	../api/timers.hpp
25	../api/buffers.hpp
26	../api/predicates.hpp
27	../api/binary_streams.hpp )
28	-
29	-IF(NOT MSVC)
30	- install ( FILES ${ana_headers} DESTINATION include/ana )
31	-ENDIF(NOT MSVC)
32	\ No newline at end of file