From nobody@FreeBSD.org  Sun Sep 22 15:37:52 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 16FF523F
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Sep 2013 15:37:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 05560274F
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Sep 2013 15:37:52 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8MFbpfv087158
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Sep 2013 15:37:51 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8MFbpX4087155;
	Sun, 22 Sep 2013 15:37:51 GMT
	(envelope-from nobody)
Message-Id: <201309221537.r8MFbpX4087155@oldred.freebsd.org>
Date: Sun, 22 Sep 2013 15:37:51 GMT
From: Matthieu Volat <mazhe@alkumuna.eu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: geeqie champlain detection with GSP option
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182300
>Category:       ports
>Synopsis:       graphics/geeqie: geeqie champlain detection with GSP option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 22 15:40:00 UTC 2013
>Closed-Date:    Wed Sep 25 04:18:13 UTC 2013
>Last-Modified:  Wed Sep 25 04:18:13 UTC 2013
>Originator:     Matthieu Volat
>Release:        9.2-RC4
>Organization:
>Environment:
FreeBSD freedom.alkumuna.eu 9.2-RC4 FreeBSD 9.2-RC4 #0 r255465: Wed Sep 11 05:11:03 UTC 2013     root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
graphics/geeqie configure has a hard time with the ill-defined pkgconfig name for champlain, its maps backend: it must be re-harcoded with current version in port (0.8), else maps support won't be activated.

One solution is to sed the correct version in ${WORKSRC}/configure, I've enclosed a naive patch to do so.
>How-To-Repeat:
# cd /usr/port/graphics/geeqie
# make config -> enable GPS
# make (re)install clean
-> unable to add maps wiget, configure output states that champlain 0.4 wasn't found.
>Fix:
Apply following to /usr/ports/graphics/geeqie/Makefile:

--- Makefile.orig	2013-09-22 17:25:43.000000000 +0200
+++ Makefile	2013-09-22 17:30:15.000000000 +0200
@@ -77,5 +77,11 @@
 	@${REINPLACE_CMD} -e '/^install-data-am:/,/^[a-z]/ s|install-readmeDATA||' \
 		${WRKSRC}/Makefile.in
 .endif
+.if ${PORT_OPTIONS:MGPS}
+	@${REINPLACE_CMD} \
+		-e 's/champlain-0\.4/champlain-0.8/g' \
+		-e 's/champlain-gtk-0\.4/champlain-gtk-0.8/g' \
+		${WRKSRC}/configure
+.endif
 
 .include <bsd.port.mk>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Sep 22 17:32:47 UTC 2013 
Responsible-Changed-Why:  
Fix synopsis and make this a ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182300 
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Sep 22 17:33:19 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182300: commit references a PR
Date: Wed, 25 Sep 2013 01:37:07 +0000 (UTC)

 Author: amdmi3
 Date: Wed Sep 25 01:36:57 2013
 New Revision: 328233
 URL: http://svnweb.freebsd.org/changeset/ports/328233
 
 Log:
   - Support staging
   - Use new options features
   - Use new LIB_DEPENDS syntax
   - Fix detection of libchamplain [1]
   
   PR:		182300 [1]
   Submitted by:	Matthieu Volat <mazhe@alkumuna.eu> [1]
 
 Modified:
   head/graphics/geeqie/Makefile
   head/graphics/geeqie/pkg-plist
 
 Modified: head/graphics/geeqie/Makefile
 ==============================================================================
 --- head/graphics/geeqie/Makefile	Wed Sep 25 01:35:23 2013	(r328232)
 +++ head/graphics/geeqie/Makefile	Wed Sep 25 01:36:57 2013	(r328233)
 @@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
  MAINTAINER=	amdmi3@FreeBSD.org
  COMMENT=	Lightweight image viewer forked from GQview
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
  
  USE_GNOME=	gtk20 desktopfileutils
  GNU_CONFIGURE=	yes
 @@ -17,65 +17,42 @@ CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
  		--htmldir="${DOCSDIR}/html" \
  		--with-htmldir="${DOCSDIR}/html" \
  		--with-readmedir="${DOCSDIR}"
 +USES=		gettext gmake pkgconfig
 +
  CFLAGS+=	-I${LOCALBASE}/include
  CPPFLAGS+=	${CFLAGS}
  LDFLAGS+=	-L${LOCALBASE}/lib
  MAKE_ARGS+=	top_builddir="${WRKSRC}"
  
  PORTDOCS=	*
 -MAN1=		geeqie.1
 -USES=		gettext gmake pkgconfig
  
  OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS DOCS
 -OPTIONS_DEFAULT=EXIV2 LCMS
 +OPTIONS_DEFAULT=EXIV2 LCMS DOCS
  EXIV2_DESC=	Metadata editing
  LCMS_DESC=	Color adjusting
  LIRC_DESC=	Remote control
  GPS_DESC=	GPS map support (libchamplain) EXPERIMENTAL
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 +EXIV2_CONFIGURE_ENABLE=	exiv2
  
 -.if ${PORT_OPTIONS:MEXIV2}
 -LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
 -CONFIGURE_ARGS+=--enable-exiv2
 -.else
 -CONFIGURE_ARGS+=--disable-exiv2
 -.endif
 -
 -.if ${PORT_OPTIONS:MLCMS}
 -LIB_DEPENDS+=	lcms:${PORTSDIR}/graphics/lcms
 -CONFIGURE_ARGS+=--enable-lcms
 -.else
 -CONFIGURE_ARGS+=--disable-lcms
 -.endif
 -
 -.if ${PORT_OPTIONS:MLIRC}
 -LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 -CONFIGURE_ARGS+=--enable-lirc
 -.else
 -CONFIGURE_ARGS+=--disable-lirc
 -.endif
 -
 -# Support for libchamplain is marked as experimental!
 -.if ${PORT_OPTIONS:MGPS}
 -LIB_DEPENDS+=	champlain-0.8:${PORTSDIR}/graphics/libchamplain
 -CONFIGURE_ARGS+=--enable-gps
 -.else
 -CONFIGURE_ARGS+=--disable-gps
 -.endif
 +LCMS_LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms
 +LCMS_CONFIGURE_ENABLE=	lcms
 +
 +LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
 +LIRC_CONFIGURE_ENABLE=	lirc
 +
 +GPS_LIB_DEPENDS=	libchamplain-0.8.so:${PORTSDIR}/graphics/libchamplain
 +GPS_CONFIGURE_ENABLE=	gps
  
  post-patch:
 +	@${REINPLACE_CMD} -e 's|champlain-0\.4|champlain-0.8|g; \
 +		s|champlain-gtk-0\.4|champlain-gtk-0.8|g' \
 +		${WRKSRC}/configure
  	@${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/main.c
  	@${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop
  # I cannot get gnome-doc-tool working properly: Outputs gibberish
  	@${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \
  		${WRKSRC}/Makefile.in
 -.if ! ${PORT_OPTIONS:MDOCS}
 -	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-helpDATA||' \
 -		${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} -e '/^install-data-am:/,/^[a-z]/ s|install-readmeDATA||' \
 -		${WRKSRC}/Makefile.in
 -.endif
  
  .include <bsd.port.mk>
 
 Modified: head/graphics/geeqie/pkg-plist
 ==============================================================================
 --- head/graphics/geeqie/pkg-plist	Wed Sep 25 01:35:23 2013	(r328232)
 +++ head/graphics/geeqie/pkg-plist	Wed Sep 25 01:36:57 2013	(r328233)
 @@ -3,6 +3,7 @@ lib/geeqie/geeqie-import
  lib/geeqie/geeqie-rotate
  lib/geeqie/geeqie-symlink
  lib/geeqie/geeqie-ufraw
 +man/man1/geeqie.1.gz
  share/applications/geeqie.desktop
  %%DATADIR%%/applications/geeqie-import-geeqie.desktop
  %%DATADIR%%/applications/geeqie-import-gqview.desktop
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Sep 25 04:18:12 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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