Index: head/games/wesnoth/Makefile =================================================================== --- head/games/wesnoth/Makefile (revision 261935) +++ head/games/wesnoth/Makefile (revision 261936) @@ -1,210 +1,208 @@ # New ports collection makefile for: wesnoth # Date created: 22 December 2003 # Whom: Mezz # # $FreeBSD$ # PORTNAME= wesnoth -PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTVERSION= 1.8.5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ MAINTAINER= philip@FreeBSD.org COMMENT= A fantasy turn-based strategy game LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING 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_BZIP2= yes USE_LUA= 5.1 -USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 +USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 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 it ja lt pl pt_BR sk \ +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 PORTDOCS= * PORTDATA= * OPTIONS= 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" On \ 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 .if ${OSVERSION} < 700000 BROKEN= does not compile .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif .if defined(WITH_PROFILE) CONFIGURE_ARGS+= --enable-profile .endif # XXX: breaks compilation because of -Werror .if !defined(WITH_STRICT) CONFIGURE_ARGS+= --disable-strict-compilation .endif .if defined(WITHOUT_BWMON) CONFIGURE_ARGS+= --disable-bandwidth-monitor .else CONFIGURE_ARGS+= --enable-bandwidth-monitor .endif .if defined(WITHOUT_CAMPAIGN) CONFIGURE_ARGS+= --disable-campaign-server PLIST_SUB+= CAMPAIGN="@comment " .else CONFIGURE_ARGS+= --enable-campaign-server PLIST_SUB+= CAMPAIGN="" .endif .if defined(WITHOUT_EDITOR) CONFIGURE_ARGS+= --disable-editor PLIST_SUB+= EDITOR="@comment " .else CONFIGURE_ARGS+= --enable-editor PLIST_SUB+= EDITOR="" .endif .if defined(WITHOUT_FRIBIDI) CONFIGURE_ARGS+= --without-fribidi .else CONFIGURE_ARGS+= --with-fribidi LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi .endif .if defined(WITHOUT_LOWMEM) CONFIGURE_ARGS+= --disable-lowmem .else CONFIGURE_ARGS+= --enable-lowmem .endif .if defined(WITHOUT_NOTIFY) CONFIGURE_ARGS+= --disable-notifications .else CONFIGURE_ARGS+= --enable-notifications --enable-dbus LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus .endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else USE_GETTEXT= yes CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .endif .if defined(WITHOUT_POOLALLOC) CONFIGURE_ARGS+= --disable-pool-alloc .else CONFIGURE_ARGS+= --enable-pool-alloc .endif .if defined(WITHOUT_PYTHON) CONFIGURE_ARGS+= --disable-python-install PLIST_SUB+= PYTHON="@comment " .else USE_PYTHON= yes CONFIGURE_ENV+= PYTHON_PREFIX=${PREFIX} \ PYTHON_VERSION=${PYTHON_VERSION:S/python//} CONFIGURE_ARGS+= --enable-python-install PLIST_SUB+= PYTHON="" .include "${PORTSDIR}/Mk/bsd.python.mk" .endif .if defined(WITHOUT_RAWSOCKETS) CONFIGURE_ARGS+= --disable-raw-sockets .else CONFIGURE_ARGS+= --enable-raw-sockets .endif .if defined(WITHOUT_SERVER) CONFIGURE_ARGS+= --disable-server PLIST_SUB+= SERVER="@comment " .else CONFIGURE_ARGS+= --enable-server MAN6+= wesnothd.6 PLIST_SUB+= SERVER="" .endif .if defined(WITHOUT_TESTS) CONFIGURE_ARGS+= --disable-tests PLIST_SUB+= TESTS="@comment " .else CONFIGURE_ARGS+= --enable-tests PLIST_SUB+= TESTS="" .endif .if defined(WITHOUT_TINYGUI) CONFIGURE_ARGS+= --disable-tinygui .else BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick CONFIGURE_ARGS+= --enable-tinygui .endif .if defined(WITHOUT_TOOLS) CONFIGURE_ARGS+= --disable-tools PLIST_SUB+= TOOLS="@comment " .else CONFIGURE_ARGS+= --enable-tools PLIST_SUB+= TOOLS="" .endif .if defined(NOPORTDOCS) -CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs +CONFIGURE_ARGS+= --without-docs .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 Property changes on: head/games/wesnoth/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.85 \ No newline at end of property +1.86 \ No newline at end of property Index: head/games/wesnoth/distinfo =================================================================== --- head/games/wesnoth/distinfo (revision 261935) +++ head/games/wesnoth/distinfo (revision 261936) @@ -1,3 +1,3 @@ -MD5 (wesnoth-1.8.4.tar.bz2) = 2dce83f835ecce1d505ea60e46b7356f -SHA256 (wesnoth-1.8.4.tar.bz2) = af29ddf40f83ee016972d6edb8761d7323f8ed5d6bf15005659bff4fd7190eb9 -SIZE (wesnoth-1.8.4.tar.bz2) = 300557790 +MD5 (wesnoth-1.8.5.tar.bz2) = a800285d1406690755dd0ea22b98b6df +SHA256 (wesnoth-1.8.5.tar.bz2) = eca3bdce505480a0cf045d0189df7260c16af9f543a427e7de8690fff9c655fa +SIZE (wesnoth-1.8.5.tar.bz2) = 301024033 Property changes on: head/games/wesnoth/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.52 \ No newline at end of property +1.53 \ No newline at end of property Index: head/games/wesnoth/files/patch-Makefile.am =================================================================== --- head/games/wesnoth/files/patch-Makefile.am (nonexistent) +++ head/games/wesnoth/files/patch-Makefile.am (revision 261936) @@ -0,0 +1,18 @@ +--- 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 \ Property changes on: head/games/wesnoth/files/patch-Makefile.am ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/wesnoth/files/patch-configure.ac =================================================================== --- head/games/wesnoth/files/patch-configure.ac (revision 261935) +++ head/games/wesnoth/files/patch-configure.ac (revision 261936) @@ -1,11 +1,14 @@ --- configure.ac~ +++ configure.ac -@@ -111,7 +111,7 @@ then - fi +@@ -213,6 +213,11 @@ esac + AC_SUBST([FULLLOCALEDIR]) + AC_SUBST([HAS_RELATIVE_LOCALEDIR]) - # Make tests default in svn version --svn_in_version=`expr match "$WESNOTH_VERSION" '.*svn'` -+svn_in_version=`expr "$WESNOTH_VERSION" : '.*svn'` - test_build=yes - if test $svn_in_version = 0 - then ++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]), Property changes on: head/games/wesnoth/files/patch-configure.ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property