From swell.k@gmail.com  Thu May  6 17:26:51 2010
Return-Path: <swell.k@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 131BF106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  6 May 2010 17:26:51 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.153])
	by mx1.freebsd.org (Postfix) with ESMTP id 9686D8FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  6 May 2010 17:26:50 +0000 (UTC)
Received: by fg-out-1718.google.com with SMTP id 22so1791894fge.13
        for <FreeBSD-gnats-submit@freebsd.org>; Thu, 06 May 2010 10:26:44 -0700 (PDT)
Received: by 10.87.74.15 with SMTP id b15mr2098608fgl.11.1273166803520;
        Thu, 06 May 2010 10:26:43 -0700 (PDT)
Received: from localhost (95-25-129-213.broadband.corbina.ru [95.25.129.213])
        by mx.google.com with ESMTPS id e11sm17215297fga.18.2010.05.06.10.26.41
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Thu, 06 May 2010 10:26:42 -0700 (PDT)
Message-Id: <86y6fxym9b.fsf@gmail.com>
Date: Thu, 06 May 2010 21:26:40 +0400
From: Anonymous <swell.k@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] games/wesnoth-devel: update to 1.8.1 and drop USE_GCC

>Number:         146359
>Category:       ports
>Synopsis:       [patch] games/wesnoth-devel: update to 1.8.1 and drop USE_GCC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    philip
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 06 17:30:01 UTC 2010
>Closed-Date:    Tue Jul 20 10:58:53 UTC 2010
>Last-Modified:  Tue Jul 20 10:58:53 UTC 2010
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
USE_GCC was added in r1.75 for 6.x and marked BROKEN on 6.x in r1.76.
If it doesn't fix 6.x then there is no point in keeping.
>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.85
diff -u -p -r1.85 Makefile
--- games/wesnoth-devel/Makefile	2 May 2010 11:02:20 -0000	1.85
+++ games/wesnoth-devel/Makefile	6 May 2010 17:04:18 -0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.8
+PORTVERSION=	1.8.1
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.0 \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
 		http://files.wesnoth.org/
 PKGNAMESUFFIX=	-devel
 
@@ -19,7 +19,6 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/
 
 CONFLICTS=	wesnoth-[0-9]*
 
-USE_GCC=	4.2+
 USE_SDL=	image mixer net ttf
 USE_GNOME=	desktopfileutils gnometarget pango
 USE_GMAKE=	yes
@@ -36,8 +36,8 @@
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-localedir=${PREFIX}/share/locale
 
-MANLANG_GAME=	gl zh_TW
-MANLANG=	"" cs de en_GB es et fi fr hu it ja lt pl pt_BR sk \
+MANLANG_GAME=	zh_TW
+MANLANG=	"" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
 		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN
 
 MAN6=		wesnoth.6
Index: games/wesnoth-devel/distinfo
===================================================================
RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- games/wesnoth-devel/distinfo	2 May 2010 11:02:20 -0000	1.55
+++ games/wesnoth-devel/distinfo	6 May 2010 16:19:33 -0000
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.8.tar.bz2) = 07e4b97512e307c54dcfd86659a61e41
-SHA256 (wesnoth-1.8.tar.bz2) = f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b
-SIZE (wesnoth-1.8.tar.bz2) = 287912025
+MD5 (wesnoth-1.8.1.tar.bz2) = 3d008b0eac291c761a1d27d05651f25f
+SHA256 (wesnoth-1.8.1.tar.bz2) = 7c48ecf11a8789689509ea545e2e63ba75dfc765988b1d08b49c6badf19de24d
+SIZE (wesnoth-1.8.1.tar.bz2) = 288248141
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->philip 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu May 6 17:30:13 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146359 

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146359: [patch] games/wesnoth-devel: update to 1.8.1 and drop USE_GCC
Date: Mon, 21 Jun 2010 22:07:49 +0400

 - update to 1.8.2
 - fix WITHOUT_FRIBIDI
 - fix compilation with non-default LOCALBASE (tested on /usr/pkg)
 - remove -L/usr/lib from ZLIB_LDFLAGS to prevent BOOST picking up wrong
   libstdc++ (tested on BOOST compiled by gcc45)
 
     LOCALBASE/bin/ld: LOCALBASE/lib/libboost_regex.so: error: undefined reference to 'std::_List_node_base::_M_transfer(std::_List_node_base*, std::_List_node_base*)', version 'GLIBCXX_3.4.14'
     LOCALBASE/bin/ld: LOCALBASE/lib/libboost_regex.so: error: undefined reference to 'std::ctype<char>::_M_widen_init() const', version 'GLIBCXX_3.4.11'
     LOCALBASE/bin/ld: LOCALBASE/lib/libboost_regex.so: error: undefined reference to 'std::_List_node_base::_M_unhook()', version 'GLIBCXX_3.4.14'
     LOCALBASE/bin/ld: LOCALBASE/lib/libboost_regex.so: error: undefined reference to 'std::_List_node_base::_M_hook(std::_List_node_base*)', version 'GLIBCXX_3.4.14'
 
 - respect LDFLAGS
 - reduce NO_MANCOMPRESS ifdef a bit (cosmetic)
 - silence post-patch target (cosmetic)
 
 --- a.diff begins here ---
 Index: games/wesnoth-devel/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/games/wesnoth-devel/Makefile,v
 retrieving revision 1.86
 diff -u -p -r1.86 Makefile
 --- games/wesnoth-devel/Makefile	31 May 2010 01:59:08 -0000	1.86
 +++ games/wesnoth-devel/Makefile	21 Jun 2010 18:03:26 -0000
 @@ -6,10 +6,9 @@
  #
  
  PORTNAME=	wesnoth
 -PORTVERSION=	1.8
 -PORTREVISION=	1
 +PORTVERSION=	1.8.2
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.0 \
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
  		http://files.wesnoth.org/
  PKGNAMESUFFIX=	-devel
  
 @@ -20,7 +19,6 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/
  
  CONFLICTS=	wesnoth-[0-9]*
  
 -USE_GCC=	4.2+
  USE_SDL=	image mixer net ttf
  USE_GNOME=	desktopfileutils gnometarget pango
  USE_GMAKE=	yes
 @@ -31,14 +29,17 @@ USE_LUA=	5.1
  USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
  ACLOCAL_ARGS=	-Im4
  AUTOMAKE_ARGS=	--add-missing --copy
 +CONFIGURE_ENV=	PKG_CONFIG=${LOCALBASE}/bin/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
  
 -MANLANG_GAME=	gl zh_TW
 -MANLANG=	"" cs de en_GB es et fi fr hu it ja lt pl pt_BR sk \
 +MANLANG_GAME=	zh_TW
 +MANLANG=	"" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
  		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN
  
  MAN6=		wesnoth.6
 @@ -70,12 +71,7 @@ BROKEN=		does not compile
  # workaround: compress and add to plist disobedient man pages
  .for manlang in ${MANLANG_GAME}
  MAN6_${manlang:U}=	wesnoth.6
 -
 -.if defined(NO_MANCOMPRESS)
 -PLIST_FILES+=	man/${manlang}/man6/wesnoth.6
 -.else
 -PLIST_FILES+=	man/${manlang}/man6/wesnoth.6.gz
 -.endif
 +PLIST_FILES+=		man/${manlang}/man6/wesnoth.6${MANEXT}
  .endfor
  
  .if defined(WITH_DEBUG)
 @@ -206,7 +202,7 @@ BROKEN=		you need NLS support for `campa
  BROKEN=		NOPORT(DOCS|DATA) is not supported
  .endif
  
 -post-patch:
 +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
 Index: games/wesnoth-devel/distinfo
 ===================================================================
 RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v
 retrieving revision 1.55
 diff -u -p -r1.55 distinfo
 --- games/wesnoth-devel/distinfo	2 May 2010 11:02:20 -0000	1.55
 +++ games/wesnoth-devel/distinfo	4 Jun 2010 09:58:38 -0000
 @@ -1,3 +1,3 @@
 -MD5 (wesnoth-1.8.tar.bz2) = 07e4b97512e307c54dcfd86659a61e41
 -SHA256 (wesnoth-1.8.tar.bz2) = f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b
 -SIZE (wesnoth-1.8.tar.bz2) = 287912025
 +MD5 (wesnoth-1.8.2.tar.bz2) = 5dd150057da9f5048826f16452ab0346
 +SHA256 (wesnoth-1.8.2.tar.bz2) = af51389decb431ce5a6c6ef8781c8d23a5415a59d6cb2abb57144b487ef53ef6
 +SIZE (wesnoth-1.8.2.tar.bz2) = 298752358
 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	21 Jun 2010 17:36:56 -0000
 @@ -9,3 +9,15 @@
   test_build=yes
   if test $svn_in_version = 0 
   then
 +@@ -428,9 +428,9 @@ if test "x$fribidi" != "xno"; then
 + 					AC_MSG_RESULT(no)
 + 				])
 + 		])
 +-	AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
 +-	AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 + fi
 ++AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
 ++AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 + 
 + # python
 + AC_PATH_PROG(PYTHON, python, none)
 Index: games/wesnoth-devel/files/patch-m4-zlib.m4
 ===================================================================
 RCS file: games/wesnoth-devel/files/patch-m4-zlib.m4
 diff -N games/wesnoth-devel/files/patch-m4-zlib.m4
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ games/wesnoth-devel/files/patch-m4-zlib.m4	21 Jun 2010 17:00:31 -0000
 @@ -0,0 +1,15 @@
 +--- 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
 --- a.diff ends here ---

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc: Paul Shepel <tacid@tacid.kiev.ua>
Subject: Re: ports/146359: [patch] games/wesnoth-devel: update to 1.8.1 and drop USE_GCC
Date: Tue, 06 Jul 2010 15:00:59 +0400

 - update to 1.8.3
 - remove no longer useful MANLANG_GAME hack
 - support NOPORTDOCS
 - use IGNORE for NOPORTDATA; we do not support --disable-game yet and my
   guess is server may need game data, too
 
 I usually don't test beyond simple map load and making a few moves.
 
 --- a.diff begins here ---
 Index: games/wesnoth-devel/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/games/wesnoth-devel/Makefile,v
 retrieving revision 1.86
 diff -u -p -r1.86 Makefile
 --- games/wesnoth-devel/Makefile	31 May 2010 01:59:08 -0000	1.86
 +++ games/wesnoth-devel/Makefile	6 Jul 2010 10:59:35 -0000
 @@ -6,10 +6,9 @@
  #
  
  PORTNAME=	wesnoth
 -PORTVERSION=	1.8
 -PORTREVISION=	1
 +PORTVERSION=	1.8.3
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.0 \
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
  		http://files.wesnoth.org/
  PKGNAMESUFFIX=	-devel
  
 @@ -20,7 +19,6 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/
  
  CONFLICTS=	wesnoth-[0-9]*
  
 -USE_GCC=	4.2+
  USE_SDL=	image mixer net ttf
  USE_GNOME=	desktopfileutils gnometarget pango
  USE_GMAKE=	yes
 @@ -31,15 +29,17 @@ USE_LUA=	5.1
  USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262
  ACLOCAL_ARGS=	-Im4
  AUTOMAKE_ARGS=	--add-missing --copy
 +CONFIGURE_ENV=	PKG_CONFIG=${LOCALBASE}/bin/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
  
 -MANLANG_GAME=	gl zh_TW
 -MANLANG=	"" cs de en_GB es et fi fr hu it ja lt pl pt_BR sk \
 -		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN
 +MANLANG=	"" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \
 +		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
  
  MAN6=		wesnoth.6
  
 @@ -67,17 +67,6 @@ OPTIONS=	BWMON	 "Enable bandwidth monito
  BROKEN=		does not compile
  .endif
  
 -# workaround: compress and add to plist disobedient man pages
 -.for manlang in ${MANLANG_GAME}
 -MAN6_${manlang:U}=	wesnoth.6
 -
 -.if defined(NO_MANCOMPRESS)
 -PLIST_FILES+=	man/${manlang}/man6/wesnoth.6
 -.else
 -PLIST_FILES+=	man/${manlang}/man6/wesnoth.6.gz
 -.endif
 -.endfor
 -
  .if defined(WITH_DEBUG)
  CONFIGURE_ARGS+=	--enable-debug
  .endif
 @@ -198,15 +187,19 @@ CONFIGURE_ARGS+=	--enable-tools
  PLIST_SUB+=		TOOLS=""
  .endif
  
 +.if defined(NOPORTDOCS)
 +CONFIGURE_ARGS+=	--docdir=${WRKDIR}/docs
 +.endif
 +
  .if (defined(WITH_CAMPAIGN) || defined(WITH_SERVER) || defined(WITH_TOOLS)) && defined(WITHOUT_NLS)
  BROKEN=		you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
  .endif
  
 -.if defined(NOPORTDOCS) || defined(NOPORTDATA)
 -BROKEN=		NOPORT(DOCS|DATA) is not supported
 +.if defined(NOPORTDATA)
 +IGNORE=		game data is required, undefine NOPORTDATA
  .endif
  
 -post-patch:
 +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
 @@ -214,10 +207,4 @@ post-patch:
  post-install:	.SILENT
  	-update-desktop-database
  
 -.if !defined(NO_MANCOMPRESS)
 -.	for manlang in ${MANLANG_GAME}
 -		${GZIP_CMD} ${PREFIX}/man/${manlang}/man6/wesnoth.6
 -.	endfor
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: games/wesnoth-devel/distinfo
 ===================================================================
 RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v
 retrieving revision 1.55
 diff -u -p -r1.55 distinfo
 --- games/wesnoth-devel/distinfo	2 May 2010 11:02:20 -0000	1.55
 +++ games/wesnoth-devel/distinfo	6 Jul 2010 08:15:07 -0000
 @@ -1,3 +1,3 @@
 -MD5 (wesnoth-1.8.tar.bz2) = 07e4b97512e307c54dcfd86659a61e41
 -SHA256 (wesnoth-1.8.tar.bz2) = f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b
 -SIZE (wesnoth-1.8.tar.bz2) = 287912025
 +MD5 (wesnoth-1.8.3.tar.bz2) = 62ba3a4938d3e722797cfbe9450d3e36
 +SHA256 (wesnoth-1.8.3.tar.bz2) = 985d40ff04cf95bb6f8abb3353ec955c3286a6f9edb1bd29b6f26f8b12280928
 +SIZE (wesnoth-1.8.3.tar.bz2) = 298923248
 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	21 Jun 2010 17:36:56 -0000
 @@ -9,3 +9,15 @@
   test_build=yes
   if test $svn_in_version = 0 
   then
 +@@ -428,9 +428,9 @@ if test "x$fribidi" != "xno"; then
 + 					AC_MSG_RESULT(no)
 + 				])
 + 		])
 +-	AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
 +-	AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 + fi
 ++AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes])
 ++AM_CONDITIONAL([OLD_FRIBIDI], [test "x$oldfribidi" = xyes])
 + 
 + # python
 + AC_PATH_PROG(PYTHON, python, none)
 Index: games/wesnoth-devel/files/patch-m4-zlib.m4
 ===================================================================
 RCS file: games/wesnoth-devel/files/patch-m4-zlib.m4
 diff -N games/wesnoth-devel/files/patch-m4-zlib.m4
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ games/wesnoth-devel/files/patch-m4-zlib.m4	21 Jun 2010 17:00:31 -0000
 @@ -0,0 +1,15 @@
 +--- 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
 --- a.diff ends here ---
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Jul 20 10:58:13 UTC 2010 
State-Changed-Why:  
Non-devel port is now at 1.8.3 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146359 
>Unformatted:
