Date: Sun, 26 Sep 2010 18:09:46 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150967: [patch] games/wesnoth: update to 1.8.5 Message-ID: <864odc4mvp.fsf@gmail.com> Resent-Message-ID: <201009261420.o8QEK3Zl065784@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150967
>Category: ports
>Synopsis: [patch] games/wesnoth: update to 1.8.5
>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: Sun Sep 26 14:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- update
- sync with -devel port
- remove expr(1) patch, applied upstream
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: games/wesnoth/Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- games/wesnoth/Makefile 15 Sep 2010 18:34:29 -0000 1.85
+++ games/wesnoth/Makefile 26 Sep 2010 13:23:14 -0000
@@ -6,8 +6,7 @@
#
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/
@@ -27,10 +26,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}" \
@@ -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
@@ -192,7 +190,7 @@ PLIST_SUB+= TOOLS=""
.endif
.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs
+CONFIGURE_ARGS+= --without-docs
.endif
.if defined(NOPORTDATA)
Index: games/wesnoth/distinfo
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth/distinfo,v
retrieving revision 1.52
diff -u -p -r1.52 distinfo
--- games/wesnoth/distinfo 26 Aug 2010 11:25:34 -0000 1.52
+++ games/wesnoth/distinfo 26 Sep 2010 12:55:19 -0000
@@ -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
Index: games/wesnoth/files/patch-Makefile.am
===================================================================
RCS file: games/wesnoth/files/patch-Makefile.am
diff -N games/wesnoth/files/patch-Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/wesnoth/files/patch-Makefile.am 24 Sep 2010 04:16:37 -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/files/patch-configure.ac
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth/files/patch-configure.ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure.ac
--- games/wesnoth/files/patch-configure.ac 26 Aug 2010 11:25:34 -0000 1.3
+++ games/wesnoth/files/patch-configure.ac 26 Sep 2010 13:00:46 -0000
@@ -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]),
--- 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?864odc4mvp.fsf>