 @@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.56 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2009/02/25 01:17:01 joerg Exp $
 DISTNAME=	gimageview-0.2.27
 PKGREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gtkmmviewer.sourceforge.net/
 COMMENT=	GTK+ based image viewer with tabbed browsing
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake intltool pkg-config
 CONFIGURE_ARGS+=	--disable-xinetest
 CONFIGURE_ARGS+=	--with-gtk2
 # The 'gimv' binary is not linked against libpthread directly, but the
 # librsvg library is.  So, when the program tries to dlopen(3) it, it
 # causes a segfault due to NetBSD "limitations".
 LDFLAGS.NetBSD+=	${PTHREAD_LDFLAGS}

 @@ -1,5 +1,18 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:06 agc Exp $
+$NetBSD: distinfo,v 1.9 2009/02/25 01:17:01 joerg Exp $
 SHA1 (gimageview-0.2.27.tar.gz) = 333f0682e4f8f8ead4abb24f6eddf86f776c2478
 RMD160 (gimageview-0.2.27.tar.gz) = 1d35b3a1b453f87dc232b84407524c3011ec91eb
 Size (gimageview-0.2.27.tar.gz) = 1348286 bytes
 SHA1 (patch-aa) = 74fd28b7370022d4af2556b928d7695b3db67759
 SHA1 (patch-ab) = e5f18d3ae22e63d6c04fbc5e16c1846d5c687bde
 SHA1 (patch-ac) = 02446b9d3393a49804b2a61c725aeb027602b59d
 SHA1 (patch-ad) = f9f5345833f50e74f12f61c37a73aa9e77d7888d
 SHA1 (patch-ae) = e80ab5693424aad5578b6775af5c21857b69f8e2
 SHA1 (patch-af) = e1829e5903fc722a105df24b91461b4943e81506
 SHA1 (patch-ag) = bb80da9d6cbfd98f5a299e2e53e92a594b481688
 SHA1 (patch-ah) = 4ef03652127f442214bd0ad66fe125b75186502b
 SHA1 (patch-ai) = 78e70d580900095fb2c4887867399473306e63d3
 SHA1 (patch-aj) = 73ffb15d6451469ba1cc89d6b8918cecfbd24847
 SHA1 (patch-ak) = 7e8faa1712a5c4aeae2f12e64bb9c7ce415f17db
 SHA1 (patch-al) = cbd0c2ae2fdb096ddbf31dfbc747e25fe8c6311a
 SHA1 (patch-am) = e6e3b6e859b6de2ca7dc17fe714cea0e7fe542ef

$NetBSD: patch-aa,v 1.3 2009/02/25 01:17:01 joerg Exp $ --- src/gimv_cell_pixmap.c.orig 2009-02-25 01:05:51.000000000 +0100 +++ src/gimv_cell_pixmap.c @@ -25,10 +25,6 @@ * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com> */ -#ifndef GTK_DISABLE_DEPRECATED -# define GTK_DISABLE_DEPRECATED -#endif /* GTK_DISABLE_DEPRECATED */ - #include "gimv_cell_pixmap.h" #if (GTK_MAJOR_VERSION >= 2)

$NetBSD: patch-ab,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- src/auto_completion.c.orig 2009-02-25 01:33:28.000000000 +0100 +++ src/auto_completion.c @@ -36,7 +36,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtkentry.h> #include <gtk/gtkframe.h> -#include <gtk/gtkclist.h> #include <gtk/gtkmain.h> #include <gtk/gtkwindow.h> #include <gtk/gtkscrolledwindow.h>

$NetBSD: patch-ac,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/archiver/Makefile.in.orig 2009-02-25 01:53:13.000000000 +0100 +++ plugins/archiver/Makefile.in @@ -346,7 +346,7 @@ archiver_plugin_LTLIBRARIES = \ libgimv_tar_extarc.la \ libgimv_zip_extarc.la -archiver_plugindir = $(DESTDIR)$(plugindir)/$(ARCHIVER_PLUGIN_DIR) +archiver_plugindir = $(plugindir)/$(ARCHIVER_PLUGIN_DIR) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) libgimv_lha_extarc_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_lha_extarc_la_SOURCES = lha-ext.c lha-ext.h

$NetBSD: patch-ad,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/image_loader/Makefile.in.orig 2009-02-25 01:52:40.000000000 +0100 +++ plugins/image_loader/Makefile.in @@ -450,14 +450,14 @@ image_loader_plugin_LTLIBRARIES = \ @ENABLE_SPI_TRUE@gimv_spi_loader_plugin_LTLIBRARIES = libgimv_spi_loader.la @ENABLE_LIBRSVG_TRUE@gimv_rsvg_loader_plugin_LTLIBRARIES = libgimv_rsvg_loader.la @ENABLE_WMF_TRUE@gimv_wmf_loader_plugin_LTLIBRARIES = libgimv_wmf_loader.la -image_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_imlib1_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_jpeg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_mng_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_pixbuf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_spi_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_rsvg_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) -gimv_wmf_loader_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +image_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_imlib1_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_jpeg_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_mng_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_pixbuf_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_spi_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_rsvg_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) +gimv_wmf_loader_plugindir = $(plugindir)/$(IMAGE_LOADER_PLUGIN_DIR) INCLUDES = \ $(GTK_CFLAGS) \ $(GIMV_IMAGELIB_CFLAGS) \

$NetBSD: patch-ae,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/image_saver/Makefile.in.orig 2009-02-25 01:53:42.000000000 +0100 +++ plugins/image_saver/Makefile.in @@ -342,7 +342,7 @@ image_saver_plugin_LTLIBRARIES = \ libgimv_pnm_saver.la \ libgimv_xvpics_saver.la -image_saver_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_SAVER_PLUGIN_DIR) +image_saver_plugindir = $(plugindir)/$(IMAGE_SAVER_PLUGIN_DIR) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) libgimv_png_saver_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_png_saver_la_SOURCES = png_saver.c

$NetBSD: patch-af,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/image_view/Makefile.in.orig 2009-02-25 01:54:27.000000000 +0100 +++ plugins/image_view/Makefile.in @@ -347,8 +347,8 @@ target_alias = @target_alias@ CLEANFILES = *~ .deps/* .*.swp .*.swo @ENABLE_MPLAYER_TRUE@gimv_mplayer_plugin_LTLIBRARIES = libgimv_mplayer.la @ENABLE_XINE_TRUE@gimv_xine_plugin_LTLIBRARIES = libgimv_xine.la -gimv_mplayer_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) -gimv_xine_plugindir = $(DESTDIR)$(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) +gimv_mplayer_plugindir = $(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) +gimv_xine_plugindir = $(plugindir)/$(IMAGE_VIEW_PLUGIN_DIR) INCLUDES = \ $(GTK_CFLAGS) \ $(XINE_CFLAGS) \

$NetBSD: patch-ag,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/io_stream/Makefile.in.orig 2009-02-25 01:55:01.000000000 +0100 +++ plugins/io_stream/Makefile.in @@ -337,8 +337,8 @@ io_stream_plugin_LTLIBRARIES = \ libgimv_gzip_io.la @HAVE_BZLIB_TRUE@gimv_bz_io_plugin_LTLIBRARIES = libgimv_bz_io.la -io_stream_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR) -gimv_bz_io_plugindir = $(DESTDIR)$(plugindir)/$(IO_STREAM_PLUGIN_DIR) +io_stream_plugindir = $(plugindir)/$(IO_STREAM_PLUGIN_DIR) +gimv_bz_io_plugindir = $(plugindir)/$(IO_STREAM_PLUGIN_DIR) INCLUDES = \ $(GTK_CFLAGS) \ $(ZLIB_CLAGS) \

$NetBSD: patch-ah,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/thumbnail/Makefile.in.orig 2009-02-25 01:55:31.000000000 +0100 +++ plugins/thumbnail/Makefile.in @@ -377,7 +377,7 @@ thumbnail_plugin_LTLIBRARIES = \ libgimv_ee_thumb.la \ libgimv_xvpics_thumb.la -thumbnail_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_PLUGIN_DIR) +thumbnail_plugindir = $(plugindir)/$(THUMBNAIL_PLUGIN_DIR) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(GTK_CFLAGS) libgimv_thumb_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS) libgimv_thumb_la_SOURCES = gimv_thumb.c

$NetBSD: patch-ai,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- plugins/thumbnail_view/Makefile.in.orig 2009-02-25 01:56:07.000000000 +0100 +++ plugins/thumbnail_view/Makefile.in @@ -330,7 +330,7 @@ target_alias = @target_alias@ thumbview_plugin_LTLIBRARIES = \ libgimv_thumbview_detail.la -thumbview_plugindir = $(DESTDIR)$(plugindir)/$(THUMBNAIL_VIEW_PLUGIN_DIR) +thumbview_plugindir = $(plugindir)/$(THUMBNAIL_VIEW_PLUGIN_DIR) INCLUDES = \ $(GTK_CFLAGS) \ -I$(top_srcdir) \

$NetBSD: patch-aj,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- src/pixmaps/Makefile.in.orig 2009-02-25 01:56:58.000000000 +0100 +++ src/pixmaps/Makefile.in @@ -299,7 +299,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -default_icondir = $(DESTDIR)$(gimv_icondir)/default +default_icondir = $(gimv_icondir)/default default_icon_DATA = \ alert.xpm \ archive.xpm \

$NetBSD: patch-ak,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- etc/Makefile.in.orig 2009-02-25 01:57:20.000000000 +0100 +++ etc/Makefile.in @@ -304,17 +304,17 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -desktopdir = $(DESTDIR)$(datadir)/gnome/apps/Graphics +desktopdir = $(datadir)/gnome/apps/Graphics desktop_in_files = gimageview.desktop.in #desktop_DATA = gimageview.desktop desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) icondir = $(datadir)/pixmaps icon_DATA = gimv.png -prefsdir = $(DESTDIR)$(gimv_datadir) +prefsdir = $(gimv_datadir) prefs_DATA = \ gtkrc -mplayerrcdir = $(DESTDIR)$(gimv_datadir) +mplayerrcdir = $(gimv_datadir) mplayerrc_DATA = \ mplayerrc

$NetBSD: patch-al,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- doc/ja/Makefile.in.orig 2009-02-25 01:57:50.000000000 +0100 +++ doc/ja/Makefile.in @@ -300,7 +300,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -jahtmldir = $(DESTDIR)$(gimv_docdir)/html/ja +jahtmldir = $(gimv_docdir)/html/ja jahtml_DATA = \ gimageview.css \ index.html \ @@ -318,7 +318,7 @@ jahtml_DATA = \ document.html \ changelog.html -jatextdir = $(DESTDIR)$(gimv_docdir)/text/ja +jatextdir = $(gimv_docdir)/text/ja jatext_DATA = \ COPYING.ja \ ChangeLog.ja \

$NetBSD: patch-am,v 1.1 2009/02/25 01:17:01 joerg Exp $ --- Makefile.in.orig 2009-02-25 02:09:45.000000000 +0100 +++ Makefile.in @@ -329,7 +329,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = doc etc m4 po intl lib src plugins CLEANFILES = *~ .deps/* .*.swp .*.swo -endocdir = $(DESTDIR)$(gimv_docdir)/text/C +endocdir = $(gimv_docdir)/text/C endoc_DATA = \ AUTHORS \ COPYING \