Update to 1.9.1

- update
- use AM_SILENT_RULES from automake111, makes it easier to notice warnings
- installing into WRKDIR breaks `clean' since it's running without SU_CMD
- remove superfluous WANT_GNOME

PR:		ports/150650
Submitted by:	Anonymous <swell.k -at- gmail.com>

4 files changed, 67 insertions, 9 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 8b4900ffb8be..1bd1c4bb5a75 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTVERSION=	1.9.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/
@@ -28,9 +27,8 @@ USE_SDL=	image mixer net ttf
 USE_GNOME=	gnometarget pango
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-WANT_GNOME=	yes
 USE_BZIP2=	yes
-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}" \
@@ -43,7 +41,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--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
@@ -199,7 +197,7 @@ PLIST_SUB+=		TOOLS=""
 .endif
 
 .if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--docdir=${WRKDIR}/docs
+CONFIGURE_ARGS+=	--without-docs
 .endif
 
 .if defined(NOPORTDATA)
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index c45ee74eab31..2b1cecdeb80c 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.9.0.tar.bz2) = c4e7ba80c6212cb58c3ff96d10f417ae
-SHA256 (wesnoth-1.9.0.tar.bz2) = 5f0058930e190150b86bb5ca5bab3013569ba622009f80455e76e2ad7f0cd64d
-SIZE (wesnoth-1.9.0.tar.bz2) = 318761871
+MD5 (wesnoth-1.9.1.tar.bz2) = 5dc488f68362717f1b809d2212f9515f
+SHA256 (wesnoth-1.9.1.tar.bz2) = 77c730f49b66970c49a60c0315a4f1a243af85d526ed0d8f8594c0f62d179653
+SIZE (wesnoth-1.9.1.tar.bz2) = 326680872
diff --git a/games/wesnoth-devel/files/patch-Makefile.am b/games/wesnoth-devel/files/patch-Makefile.am
new file mode 100644
index 000000000000..82b281364b79
--- /dev/null
+++ b/games/wesnoth-devel/files/patch-Makefile.am
@@ -0,0 +1,36 @@
+--- 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 \
+--- 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 \
diff --git a/games/wesnoth-devel/files/patch-configure.ac b/games/wesnoth-devel/files/patch-configure.ac
index 0015eec85a64..ce09b59833da 100644
--- a/games/wesnoth-devel/files/patch-configure.ac
+++ b/games/wesnoth-devel/files/patch-configure.ac
@@ -9,3 +9,27 @@
  test_build=yes
  if test $svn_in_version = 0 
  then
+@@ -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]),
+@@ -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]),