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. Fix: Apply following to /usr/ports/graphics/geeqie/Makefile: 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.
Responsible Changed From-To: freebsd-bugs->freebsd-ports-bugs Fix synopsis and make this a ports PR.
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 Over to maintainer (via the GNATS Auto Assign Tool)
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 Committed. Thanks!