From owner-svn-ports-head@FreeBSD.ORG Wed Sep 25 01:36:58 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5C90F509; Wed, 25 Sep 2013 01:36:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2EC2B41; Wed, 25 Sep 2013 01:36:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8P1awoQ099477; Wed, 25 Sep 2013 01:36:58 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8P1avJe099475; Wed, 25 Sep 2013 01:36:57 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309250136.r8P1avJe099475@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 25 Sep 2013 01:36:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328233 - head/graphics/geeqie X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Sep 2013 01:36:58 -0000 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 [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 +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 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