From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 16 01:00:18 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 825381065675 for ; Sun, 16 May 2010 01:00:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4932B8FC14 for ; Sun, 16 May 2010 01:00:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4G10FrF073826 for ; Sun, 16 May 2010 01:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4G10Ftu073825; Sun, 16 May 2010 01:00:15 GMT (envelope-from gnats) Resent-Date: Sun, 16 May 2010 01:00:15 GMT Resent-Message-Id: <201005160100.o4G10Ftu073825@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Tournoij Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F5E1106566B for ; Sun, 16 May 2010 00:58:37 +0000 (UTC) (envelope-from carpetsmoker@daemonforums.org) Received: from cthulhu.daemonforums.org (cthulhu.daemonforums.org [94.142.244.51]) by mx1.freebsd.org (Postfix) with ESMTP id 2D75C8FC16 for ; Sun, 16 May 2010 00:58:35 +0000 (UTC) Received: by cthulhu.daemonforums.org (Postfix, from userid 1001) id D53D217074; Sun, 16 May 2010 02:58:32 +0200 (CEST) Message-Id: <20100516005832.D53D217074@cthulhu.daemonforums.org> Date: Sun, 16 May 2010 02:58:32 +0200 (CEST) From: Martin Tournoij To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: amdmi3@FreeBSD.org Subject: ports/146624: [PATCH] graphics/geeqie update to 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Tournoij List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 01:00:18 -0000 >Number: 146624 >Category: ports >Synopsis: [PATCH] graphics/geeqie update to 1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 16 01:00:14 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Tournoij >Release: FreeBSD 7.3-PRERELEASE i386 >Organization: >Environment: System: FreeBSD cthulhu.daemonforums.org 7.3-PRERELEASE FreeBSD 7.3-PRERELEASE #0: Sun Feb 28 20:26:34 CET 2010 carpetsmoker@cthulhu.daemonforums.org:/usr/obj/usr/src/sys/CTHULHU i386 >Description: Update to 1.0 >How-To-Repeat: >Fix: --- geeqie.diff begins here --- diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' graphics/geeqie/Makefile /home/carpetsmoker/geeqie/Makefile --- graphics/geeqie/Makefile 2010-04-21 19:10:18.000000000 +0000 +++ /home/carpetsmoker/geeqie/Makefile 2010-05-16 02:43:20.000000000 +0000 @@ -6,10 +6,10 @@ # PORTNAME= geeqie -DISTVERSION= 1.0beta2 -PORTREVISION= 2 +DISTVERSION= 1.0 +PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0beta2 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview @@ -32,10 +32,10 @@ MAN1= geeqie.1 USE_GETTEXT= yes -OPTIONS= EXIV2 "Enable EXIV2 for metadata editing" on \ - LCMS "Enable LCMS for color adjusting" on -# Build fails with lirc enabled, disable it for now -# LIRC "Enable lirc for remote control" off +OPTIONS= EXIV2 "Metadata editing" on \ + LCMS "Color adjusting" on \ + LIRC "Remote control" off \ + GPS "GPS map support (libchamplain) EXPERIMENTAL" off .include @@ -60,14 +60,23 @@ CONFIGURE_ARGS+=--disable-lirc .endif +# Support for libchamplain is marked as experimental! +.if defined(WITH_GPS) +LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain +CONFIGURE_ARGS+=--enable-gps +.else +CONFIGURE_ARGS+=--disable-gps +.endif + post-patch: @${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/main.c @${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop -.if defined(NOPORTDOCS) - @${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 + +post-configure: +# I cannot get gnome-doc-tool working properly: Outputs gibberish +#.if defined (NOPORTDOCS) + @${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \ + ${WRKSRC}/Makefile +#.endif .include diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' graphics/geeqie/distinfo /home/carpetsmoker/geeqie/distinfo --- graphics/geeqie/distinfo 2009-08-03 23:45:06.000000000 +0000 +++ /home/carpetsmoker/geeqie/distinfo 2010-05-15 03:25:44.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (geeqie-1.0beta2.tar.gz) = 4e4ddc96a83e1d6bc43d478796e0b3c4 -SHA256 (geeqie-1.0beta2.tar.gz) = cd1d6c51c072ed241f3e9cbceabcffd6a12305d4990a53fa7dbcd7e92311098e -SIZE (geeqie-1.0beta2.tar.gz) = 1912367 +MD5 (geeqie-1.0.tar.gz) = 1d67ef990390224c5052697d93bb49c0 +SHA256 (geeqie-1.0.tar.gz) = d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd +SIZE (geeqie-1.0.tar.gz) = 1934236 diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' graphics/geeqie/pkg-descr /home/carpetsmoker/geeqie/pkg-descr --- graphics/geeqie/pkg-descr 2008-06-26 11:01:21.000000000 +0000 +++ /home/carpetsmoker/geeqie/pkg-descr 2010-05-15 03:42:38.000000000 +0000 @@ -12,8 +12,4 @@ contact gqview author and the only maintainer. Geeqie projects goal is to move the development forward and also integrate the existing patches. -Project Status - Geeqie is currently in alpha state. Everybody is encouraged to try the new - features, however for stable software look at the original project. - WWW: http://geeqie.sourceforge.net/ diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' graphics/geeqie/pkg-plist /home/carpetsmoker/geeqie/pkg-plist --- graphics/geeqie/pkg-plist 2009-08-03 23:45:06.000000000 +0000 +++ /home/carpetsmoker/geeqie/pkg-plist 2010-05-16 02:47:08.000000000 +0000 @@ -1,17 +1,8 @@ bin/geeqie -lib/geeqie/geeqie-import lib/geeqie/geeqie-rotate lib/geeqie/geeqie-symlink lib/geeqie/geeqie-ufraw -share/applications/geeqie.desktop -%%DATADIR%%/applications/geeqie-import-geeqie.desktop -%%DATADIR%%/applications/geeqie-import-gqview.desktop -%%DATADIR%%/applications/geeqie-ufraw-id.desktop -%%DATADIR%%/applications/geeqie-ufraw-recursive.desktop -%%DATADIR%%/applications/geeqie-ufraw.desktop -%%DATADIR%%/applications/rotate.desktop -%%DATADIR%%/applications/symlink.desktop -%%DATADIR%%/template.desktop +lib/geeqie/geeqie-import share/locale/ar/LC_MESSAGES/geeqie.mo share/locale/be/LC_MESSAGES/geeqie.mo share/locale/bg/LC_MESSAGES/geeqie.mo @@ -38,6 +29,7 @@ share/locale/ru/LC_MESSAGES/geeqie.mo share/locale/sk/LC_MESSAGES/geeqie.mo share/locale/sl/LC_MESSAGES/geeqie.mo +share/locale/sr/LC_MESSAGES/geeqie.mo share/locale/sv/LC_MESSAGES/geeqie.mo share/locale/th/LC_MESSAGES/geeqie.mo share/locale/tr/LC_MESSAGES/geeqie.mo @@ -45,10 +37,20 @@ share/locale/vi/LC_MESSAGES/geeqie.mo share/locale/zh_CN.GB2312/LC_MESSAGES/geeqie.mo share/locale/zh_TW/LC_MESSAGES/geeqie.mo +share/locale/sr@latin/LC_MESSAGES/geeqie.mo share/pixmaps/geeqie.png +%%DATADIR%%/applications/rotate.desktop +%%DATADIR%%/applications/symlink.desktop +%%DATADIR%%/applications/geeqie-ufraw-recursive.desktop +%%DATADIR%%/applications/geeqie-ufraw.desktop +%%DATADIR%%/applications/geeqie-ufraw-id.desktop +%%DATADIR%%/applications/geeqie-import-geeqie.desktop +%%DATADIR%%/applications/geeqie-import-gqview.desktop +%%DATADIR%%/template.desktop +share/applications/geeqie.desktop +@dirrm share/applications @dirrm %%DATADIR%%/applications @dirrm %%DATADIR%% -@dirrmtry share/applications +@dirrm share/locale/sr@latin/LC_MESSAGES +@dirrm share/locale/sr@latin @dirrm lib/geeqie -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true --- geeqie.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: