Date: Fri, 17 Sep 2010 19:15:17 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150650: [patch] games/wesnoth-devel: update to 1.9.1 Message-ID: <86y6b0iepm.fsf@gmail.com> Resent-Message-ID: <201009171530.o8HFU2pJ011325@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150650
>Category: ports
>Synopsis: [patch] games/wesnoth-devel: update to 1.9.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 17 15:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- 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
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: games/wesnoth-devel/Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- games/wesnoth-devel/Makefile 15 Sep 2010 18:34:29 -0000 1.89
+++ games/wesnoth-devel/Makefile 17 Sep 2010 14:49:54 -0000
@@ -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)
Index: games/wesnoth-devel/distinfo
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- games/wesnoth-devel/distinfo 26 Aug 2010 11:08:10 -0000 1.56
+++ games/wesnoth-devel/distinfo 17 Sep 2010 14:23:50 -0000
@@ -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
Index: games/wesnoth-devel/files/patch-Makefile.am
===================================================================
RCS file: games/wesnoth-devel/files/patch-Makefile.am
diff -N games/wesnoth-devel/files/patch-Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/wesnoth-devel/files/patch-Makefile.am 17 Sep 2010 01:27:22 -0000
@@ -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 \
Index: games/wesnoth-devel/files/patch-configure.ac
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/files/patch-configure.ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure.ac
--- games/wesnoth-devel/files/patch-configure.ac 2 Sep 2009 07:54:38 -0000 1.1
+++ games/wesnoth-devel/files/patch-configure.ac 17 Sep 2010 01:24:15 -0000
@@ -9,3 +9,15 @@
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]),
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86y6b0iepm.fsf>