From nobody@FreeBSD.org  Fri Aug 13 18:21:26 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E3791065672
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Aug 2010 18:21:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C32C8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Aug 2010 18:21:26 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7DILPJf018176
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Aug 2010 18:21:25 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o7DILPcr018175;
	Fri, 13 Aug 2010 18:21:25 GMT
	(envelope-from nobody)
Message-Id: <201008131821.o7DILPcr018175@www.freebsd.org>
Date: Fri, 13 Aug 2010 18:21:25 GMT
From: Barbara <barbara.xxx1975@libero.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net-p2p/amule2: fix for geoip and for a gd warning
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: swell.k@gmail.com

>Number:         149627
>Category:       ports
>Synopsis:       [patch] net-p2p/amule2: fix for geoip and for a gd warning
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 13 18:30:04 UTC 2010
>Closed-Date:    Fri Sep 03 10:09:42 UTC 2010
>Last-Modified:  Fri Sep 03 10:09:42 UTC 2010
>Originator:     Barbara
>Release:        RELENG_8
>Organization:
>Environment:
FreeBSD satanasso.local.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Tue Aug 10 13:51:27 CEST 2010     root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386
>Description:

Running "make configure" I'm getting an error about GeoIP:

checking GeoIP.h usability... no
checking GeoIP.h presence... no
checking for GeoIP.h... no
configure: WARNING:
        GeoIP support has been disabled because the GeoIP header files were
        not found
..
 *** Warnings during configuration ***

* GeoIP support has been disabled because the GeoIP header files were not
  found


and a warning about gd.h:

configure: WARNING: gd.h: accepted by the compiler, rejected by the preprocessor
!
configure: WARNING: gd.h: proceeding with the compiler's result


The strange thing is that I usually build aMule SVN by myself, but in my configure options I don't need to specify geoip headers directory or gdlib prefix. About gd I've always used "--with-gdlib-config=/usr/local/bin/gdlib-config", and I don't get the warning.

>How-To-Repeat:
# cd /usr/ports/net-p2p/amule2
# make config
if not checked, check CAS and GEOIP
# make configure

>Fix:


Patch attached with submission follows:

33c33,35
< CONFIGURE_ARGS=	--without-included-gettext \
---
> CONFIGURE_ARGS=	--with-gdlib-prefix=${LOCALBASE} \
> 		--with-geoip-headers=${LOCALBASE}/include \
> 		--without-included-gettext \


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 13 18:30:15 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: swell.k@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149627: net-p2p/amule2: fix for geoip and for a gd warning
Date: Fri, 13 Aug 2010 18:30:13 UT

 Maintainer of net-p2p/amule2,
 
 Please note that PR ports/149627 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/149627
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Barbara <barbara.xxx1975@libero.it>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149627: net-p2p/amule: fix for geoip and for a gd warning
Date: Fri, 13 Aug 2010 20:42:10 +0200 (CEST)

 Sorry, I've attached a wrong patch.
 
 You can find the correct one here:
 http://pastebin.com/gyUc7iNf
 

From: Anonymous <swell.k@gmail.com>
To: Barbara <barbara.xxx1975@libero.it>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149627: net-p2p/amule2: fix for geoip and for a gd warning
Date: Sat, 14 Aug 2010 01:27:54 +0400

 I'd just stuff environment with *FLAGS and forget about these
 
   --with-xxx-prefix=${LOCALBASE} or --with-xxx-config=${LOCALBASE}/xxx-config
 
 My patch also aligns case in PORTNAME with port *directory* name. Unlike
 graphics/ImageMagick the directory name of net-p2p/amule2 is lowercase.
 
 Now configure stage looks like
 
   %% difference with your second patch
   @@ -1,4 +1,4 @@
   -===>  Configuring for aMule-10266
   +===>  Configuring for amule-10266
    checking for a BSD-compatible install... /usr/bin/install -c
    checking whether build environment is sane... yes
    checking for gawk... no
   @@ -53,9 +53,7 @@ checking for unistd.h... yes
    checking for gdlib-config... /usr/local/bin/gdlib-config
    checking for gdlib version >= 2.0.0... yes (version 2.0.35)
    checking gd.h usability... yes
   -checking gd.h presence... no
   -configure: WARNING: gd.h: accepted by the compiler, rejected by the preprocessor!
   -configure: WARNING: gd.h: proceeding with the compiler's result
   +checking gd.h presence... yes
    checking for gd.h... yes
    checking for libpng-config... /usr/local/bin/libpng-config
    checking for libpng version >= 1.2.0... yes (version 1.4.3)
   @@ -98,9 +96,9 @@ checking for inttypes.h... (cached) yes
    checking langinfo.h usability... yes
    checking langinfo.h presence... yes
    checking for langinfo.h... yes
   -checking libintl.h usability... no
   -checking libintl.h presence... no
   -checking for libintl.h... no
   +checking libintl.h usability... yes
   +checking libintl.h presence... yes
   +checking for libintl.h... yes
    checking limits.h usability... yes
    checking limits.h presence... yes
    checking for limits.h... yes
   @@ -429,7 +427,7 @@ config.status: executing denoiser comman
      Libraries aMule will use to build:
                                           wxWidgets             2.8.10 (gtk2,shared)
                                           crypto++              5.6.0 (installed, in /usr/local)
   -                                       libupnp               1.6.6 (in /usr/local)
   +                                       libupnp               1.6.6
                                           libintl               system
                                           libGeoIP              user
                                           libpng                1.4.3
   %%
 
   %% difference with what's currently in CVS
   @@ -1,4 +1,4 @@
   -===>  Configuring for aMule-10266
   +===>  Configuring for amule-10266
    checking for a BSD-compatible install... /usr/bin/install -c
    checking whether build environment is sane... yes
    checking for gawk... no
   @@ -53,19 +53,15 @@ checking for unistd.h... yes
    checking for gdlib-config... /usr/local/bin/gdlib-config
    checking for gdlib version >= 2.0.0... yes (version 2.0.35)
    checking gd.h usability... yes
   -checking gd.h presence... no
   -configure: WARNING: gd.h: accepted by the compiler, rejected by the preprocessor!
   -configure: WARNING: gd.h: proceeding with the compiler's result
   +checking gd.h presence... yes
    checking for gd.h... yes
    checking for libpng-config... /usr/local/bin/libpng-config
    checking for libpng version >= 1.2.0... yes (version 1.4.3)
    checking for File::Copy... ok
   -checking GeoIP.h usability... no
   -checking GeoIP.h presence... no
   -checking for GeoIP.h... no
   -configure: WARNING:
   -        GeoIP support has been disabled because the GeoIP header files were
   -        not found
   +checking GeoIP.h usability... yes
   +checking GeoIP.h presence... yes
   +checking for GeoIP.h... yes
   +checking for GeoIP_open in -lGeoIP... yes
    checking for the --with-toolkit option... will be automatically detected
    checking for the --with-wxshared option... will be automatically detected
    checking for the --with-wxdebug option... will be automatically detected
   @@ -100,9 +96,9 @@ checking for inttypes.h... (cached) yes
    checking langinfo.h usability... yes
    checking langinfo.h presence... yes
    checking for langinfo.h... yes
   -checking libintl.h usability... no
   -checking libintl.h presence... no
   -checking for libintl.h... no
   +checking libintl.h usability... yes
   +checking libintl.h presence... yes
   +checking for libintl.h... yes
    checking limits.h usability... yes
    checking limits.h presence... yes
    checking for limits.h... yes
   @@ -401,7 +397,7 @@ config.status: executing denoiser comman
      Should aMule be compiled with profiling?                   no
      Should aMule be compiled with optimizations?               no
      Should aMule be compiled with UPnP support?                yes
   -  Should aMule be compiled with IP2country support?          disabled
   +  Should aMule be compiled with IP2country support?          yes
      Should aMule monolithic application be built?              yes
      Should aMule daemon version be built?                      yes
      Should aMule remote gui be built? (EXPERIMENTAL)           yes
   @@ -431,14 +427,9 @@ config.status: executing denoiser comman
      Libraries aMule will use to build:
                                           wxWidgets             2.8.10 (gtk2,shared)
                                           crypto++              5.6.0 (installed, in /usr/local)
   -                                       libupnp               1.6.6 (in /usr/local)
   +                                       libupnp               1.6.6
                                           libintl               system
   +                                       libGeoIP              user
                                           libpng                1.4.3
                                           libgd                 2.0.35
                                           zlib                  1.2.5
   -
   -
   - *** Warnings during configuration ***
   -
   -* GeoIP support has been disabled because the GeoIP header files were not
   -  found
   %%
 
 --- a.diff begins here ---
 Index: net-p2p/amule2/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/net-p2p/amule2/Makefile,v
 retrieving revision 1.38
 diff -u -p -r1.38 Makefile
 --- net-p2p/amule2/Makefile	13 Aug 2010 13:18:23 -0000	1.38
 +++ net-p2p/amule2/Makefile	13 Aug 2010 21:24:46 -0000
 @@ -5,12 +5,12 @@
  # $FreeBSD: ports/net-p2p/amule2/Makefile,v 1.38 2010/08/13 13:18:23 pav Exp $
  #
  
 -PORTNAME=	aMule
 +PORTNAME=	amule
  PORTVERSION=	10266
  CATEGORIES=	net-p2p
  MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/ \
 -		http://repo.or.cz/w/${PORTNAME:L}.git/snapshot/
 -DISTNAME=	${PORTNAME:L}-svn-r${PORTVERSION}
 +		http://repo.or.cz/w/${PORTNAME}.git/snapshot/
 +DISTNAME=	${PORTNAME}-svn-r${PORTVERSION}
  
  MAINTAINER=	swell.k@gmail.com
  COMMENT=	The all-platform eMule p2p client
 @@ -18,10 +18,10 @@ COMMENT=	The all-platform eMule p2p clie
  BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
  		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
  
 -LATEST_LINK=	aMule2
 -CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
 +LATEST_LINK=	amule2
 +CONFLICTS=	aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]*
  
 -WRKSRC=		${WRKDIR}/${PORTNAME:L}
 +WRKSRC=		${WRKDIR}/${PORTNAME}
  
  USE_GNOME=	pkgconfig
  USE_GMAKE=	yes
 @@ -30,16 +30,16 @@ USE_QT_VER=	4
  USE_WX=		2.8
  WX_CONF_ARGS=	absolute
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--without-included-gettext \
 -		--with-libintl-prefix=${LOCALBASE} \
 -		--with-libiconv-prefix=${LOCALBASE} \
 -		--with-crypto-prefix=${LOCALBASE} \
 -		--with-denoise-level=0
 +CONFIGURE_ARGS=	--with-denoise-level=0
  
  CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
  		docdir='$${prefix}/${DOCSDIR_REL}' \
 -		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 -		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 +		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 +		LDFLAGS="${LDFLAGS}"
 +
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +CFLAGS+=	${PTHREAD_CFLAGS}
 +LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
  
  OPTIONS=	ALC "Compile aMule Link Creator (+GUI)" on \
  		AMULECMD "Compile aMule command line client" on \
 @@ -55,8 +55,6 @@ OPTIONS=	ALC "Compile aMule Link Creator
  		WXUNICODE "Enable Unicode support" on \
  		XAS "Install XChat2 plugin" on
  
 -DATADIR_REL=	share/${PORTNAME:L}
 -DOCSDIR_REL=	share/doc/${PORTNAME:L}
  PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
  		ED2K-Links.HOWTO INSTALL README TODO \
  		amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
 @@ -106,7 +104,6 @@ PLIST_SUB+=		AMULEDAEMON="@comment "
  .if !defined(WITHOUT_AMULEGUI)
  CONFIGURE_ARGS+=	--enable-amule-gui
  PLIST_SUB+=		AMULEGUI=""
 -USE_RC_SUBR=		amuled.sh
  .else
  CONFIGURE_ARGS+=	--disable-amule-gui
  PLIST_SUB+=		AMULEGUI="@comment "
 @@ -130,7 +127,8 @@ PLIST_SUB+=		ED2K="@comment "
  .endif
  
  .if !defined(WITHOUT_GEOIP)
 -CONFIGURE_ARGS+=	--enable-geoip
 +CONFIGURE_ARGS+=	--enable-geoip \
 +			--with-geoip-headers=${LOCALBASE}/include
  LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
  .else
  CONFIGURE_ARGS+=	--disable-geoip
 @@ -154,7 +152,6 @@ PLIST_SUB+=		PLASMAMULE="@comment "
  .endif
  
  .if !defined(WITHOUT_UPNP)
 -CONFIGURE_ARGS+=	--with-libupnp-prefix=${LOCALBASE}
  LIB_DEPENDS+=		upnp.3:${PORTSDIR}/devel/upnp
  .else
  CONFIGURE_ARGS+=	--disable-upnp
 --- a.diff ends here ---

From: Anonymous <swell.k@gmail.com>
To: Barbara <barbara.xxx1975@libero.it>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149627: net-p2p/amule2: fix for geoip and for a gd warning
Date: Sat, 14 Aug 2010 01:31:56 +0400

 Anonymous <swell.k@gmail.com> writes:
 
 > @@ -130,7 +127,8 @@ PLIST_SUB+=		ED2K="@comment "
 >  .endif
 >  
 >  .if !defined(WITHOUT_GEOIP)
 > -CONFIGURE_ARGS+=	--enable-geoip
 > +CONFIGURE_ARGS+=	--enable-geoip \
 > +			--with-geoip-headers=${LOCALBASE}/include
 >  LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
 >  .else
 >  CONFIGURE_ARGS+=	--disable-geoip
 
 Oops, this hunk is not needed.
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Sat Aug 14 00:04:03 UTC 2010 
State-Changed-Why:  
Maintainer prefers own patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149627 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Sep 3 10:08:51 UTC 2010 
State-Changed-Why:  
Obsoleted by ports/149988 

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