From 4a3c4607d1478c47d8bd74ee70e14be1e79a8fcd Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 6 Apr 2011 13:56:52 +0000 Subject: [PATCH] Update to gtkam-0.1.17. --- graphics/gtkam/Makefile | 29 +++++++++++-------- graphics/gtkam/distinfo | 10 +++---- graphics/gtkam/patches/patch-Makefile_in | 8 ++--- graphics/gtkam/patches/patch-configure | 8 ++--- graphics/gtkam/patches/patch-gtkam_desktop_in | 13 --------- graphics/gtkam/pkg/PLIST | 4 ++- 6 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 graphics/gtkam/patches/patch-gtkam_desktop_in diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 484d75a7679..b812e3324da 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/17 08:05:14 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2011/04/06 13:56:52 ajacoutot Exp $ COMMENT= digital camera frontend -DISTNAME= gtkam-0.1.16.1 -REVISION= 5 +DISTNAME= gtkam-0.1.17 CATEGORIES= graphics @@ -15,13 +14,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= gmodule-2.0 X11 Xext Xrender gobject-2.0 png \ - atk-1.0 fontconfig freetype m c z cairo glib-2.0 pcre \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 Xau Xcursor \ - Xdmcp Xfixes Xi Xinerama Xrandr exif expat ltdl usb \ - Xcomposite Xdamage pixman-1 pthread gio-2.0 \ - pthread-stubs xcb gdk_pixbuf-2.0 gphoto2 gphoto2_port \ - gdk-x11-2.0>=0.11 gtk-x11-2.0>=0.11 exif-gtk +WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo +WANTLIB += drm exif exif-gtk expat fontconfig freetype gdk-x11-2.0 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += gphoto2 gphoto2_port gthread-2.0 gtk-x11-2.0 ltdl m +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread pthread-stubs usb xcb xcb-render xcb-shm +WANTLIB += z MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} @@ -35,14 +35,19 @@ MODULES= devel/gettext \ USE_LIBTOOL= Yes USE_GROFF = Yes +USE_GMAKE = Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -pthread" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-gnome=no \ +CONFIGURE_ARGS= ${CONFIGURE_SHARED} + +# minimal: don't include any GNOME dependency +CONFIGURE_ARGS +=--with-gnome=no \ --with-gimp=no \ --with-bonobo=no \ --disable-scrollkeeper +FAKE_FLAGS= itlocaledir=${PREFIX}/share/locale + .include diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo index 593050f048f..6d2c6c95fbc 100644 --- a/graphics/gtkam/distinfo +++ b/graphics/gtkam/distinfo @@ -1,5 +1,5 @@ -MD5 (gtkam-0.1.16.1.tar.gz) = pwGiaUfhNNiDuo7vC+t0YQ== -RMD160 (gtkam-0.1.16.1.tar.gz) = j5RAhhhu1pMS7oTek8LdIfQWbRA= -SHA1 (gtkam-0.1.16.1.tar.gz) = 3YtVAJNz6T3nIMBJTkNmUT6ZH2A= -SHA256 (gtkam-0.1.16.1.tar.gz) = 0yIKOG+vHX0DOB6F/V0Zt+nWB6+OWmfk7hzkwHB/SQ8= -SIZE (gtkam-0.1.16.1.tar.gz) = 1392585 +MD5 (gtkam-0.1.17.tar.gz) = ZgC7CBnkW/5maILUaAKWeQ== +RMD160 (gtkam-0.1.17.tar.gz) = ShzBUlyBZJTg+3GkJ0SwHUgnui0= +SHA1 (gtkam-0.1.17.tar.gz) = C8CUJWjedYE35PFqf2dEqu64aFE= +SHA256 (gtkam-0.1.17.tar.gz) = 6GC/KlRKckSjH3AsIYsaFifS56KWcBHy9Z2RF4rfc9I= +SIZE (gtkam-0.1.17.tar.gz) = 1330286 diff --git a/graphics/gtkam/patches/patch-Makefile_in b/graphics/gtkam/patches/patch-Makefile_in index 0a1f2017d6c..124850bca7b 100644 --- a/graphics/gtkam/patches/patch-Makefile_in +++ b/graphics/gtkam/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2009/11/08 17:37:33 ajacoutot Exp $ ---- Makefile.in.orig Fri Dec 5 20:22:29 2008 -+++ Makefile.in Sun Nov 8 18:17:57 2009 -@@ -284,7 +284,7 @@ sysconfdir = @sysconfdir@ +$OpenBSD: patch-Makefile_in,v 1.4 2011/04/06 13:56:52 ajacoutot Exp $ +--- Makefile.in.orig Sun Jan 31 17:14:40 2010 ++++ Makefile.in Wed Apr 6 15:03:34 2011 +@@ -283,7 +283,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/graphics/gtkam/patches/patch-configure b/graphics/gtkam/patches/patch-configure index af82f4ef3b9..24512e72b27 100644 --- a/graphics/gtkam/patches/patch-configure +++ b/graphics/gtkam/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2009/11/08 17:37:33 ajacoutot Exp $ ---- configure.orig Sun Nov 8 18:17:09 2009 -+++ configure Sun Nov 8 18:17:43 2009 -@@ -26467,10 +26467,10 @@ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +$OpenBSD: patch-configure,v 1.4 2011/04/06 13:56:52 ajacoutot Exp $ +--- configure.orig Sun Jan 31 17:14:41 2010 ++++ configure Wed Apr 6 15:03:34 2011 +@@ -26469,10 +26469,10 @@ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim USE_NLS!$USE_NLS$ac_delim GMSGFMT!$GMSGFMT$ac_delim diff --git a/graphics/gtkam/patches/patch-gtkam_desktop_in b/graphics/gtkam/patches/patch-gtkam_desktop_in deleted file mode 100644 index 074215ac1f7..00000000000 --- a/graphics/gtkam/patches/patch-gtkam_desktop_in +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-gtkam_desktop_in,v 1.1 2010/03/21 09:43:33 ajacoutot Exp $ ---- gtkam.desktop.in.orig Fri Feb 26 10:26:03 2010 -+++ gtkam.desktop.in Fri Feb 26 10:26:09 2010 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Encoding=UTF-8 --_Name=Gtkam Digital Camera Browser --_Comment=Browse and download images from an attached digital camera -+Name=Gtkam Digital Camera Browser -+Comment=Browse and download images from an attached digital camera - Exec=gtkam - Icon=gtkam-camera.png - Terminal=false diff --git a/graphics/gtkam/pkg/PLIST b/graphics/gtkam/pkg/PLIST index d7a9a09509e..45505d48f80 100644 --- a/graphics/gtkam/pkg/PLIST +++ b/graphics/gtkam/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2009/12/22 16:06:41 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.9 2011/04/06 13:56:52 ajacoutot Exp $ @bin bin/gtkam @man man/man1/gtkam.1 share/applications/gtkam.desktop @@ -29,9 +29,11 @@ share/locale/be/LC_MESSAGES/gtkam.mo share/locale/cs/LC_MESSAGES/gtkam.mo share/locale/da/LC_MESSAGES/gtkam.mo share/locale/de/LC_MESSAGES/gtkam.mo +share/locale/eo/LC_MESSAGES/gtkam.mo share/locale/es/LC_MESSAGES/gtkam.mo share/locale/fr/LC_MESSAGES/gtkam.mo share/locale/hu/LC_MESSAGES/gtkam.mo +share/locale/id/LC_MESSAGES/gtkam.mo share/locale/it/LC_MESSAGES/gtkam.mo share/locale/ja/LC_MESSAGES/gtkam.mo share/locale/nb/LC_MESSAGES/gtkam.mo