- Fix missing scrollbar

Submitted by:	Yamagi, Christoph Mallon

- add support for libvsg2
Reported by:	Christoph Mallon

- use OPTIONS framework instead of autodetect

3 files changed, 58 insertions, 29 deletions

diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 21902e9f05d..7ad52bffaeb 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimageview
 PORTVERSION=	0.2.27
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmmviewer
@@ -15,17 +15,28 @@ MASTER_SITE_SUBDIR=	gtkmmviewer
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Yet another GTK+ based image viewer
 
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
-OPTIONS=	SPLASH "Show splash on startup" On
+OPTIONS=	SPLASH "Show splash on startup" on \
+		NLS "Build with gettext support" on \
+		LIBMNG "Build with libmng support" on \
+		LIBWMF "Build with libwmf support" on \
+		LIBRSVG "Build with librsvg support" off \
+		LIBRSVG2 "Build with librsvg-2 support" on \
+		LIBWMF "Build with libwmf support" on \
+		LIBEXIF "Build with libexif support" on \
+		MPLAYER "Build with Mplayer support" on \
+		LIBXINE "Build with Xine support" off
 
 USE_GNOME=	gtk20
+USE_XORG=	xinerama ice
 CONFIGURE_ARGS=	--with-gtk2
 CFLAGS+=	-DUSE_GTK2
 
@@ -35,6 +46,14 @@ CFLAGS+=	-DUSE_GTK2
 CONFIGURE_ARGS+=	--disable-splash
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if ${HAVE_GNOME:Mimlib}!=""
 USE_GNOME+=	imlib
 PKGNAMESUFFIX=	-imlib
@@ -42,60 +61,59 @@ WITH_IMLIB=	yes
 CONFIGURE_ARGS+=	--disable-gdk-pixbuf
 .endif
 
-.if exists(${LOCALBASE}/lib/libexif.so.12)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-exit_view.c
-.endif
-
-.if exists(${LOCALBASE}/lib/libmng.so.1)
-WITH_LIBMNG=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libwmf.so.2)
-WITH_LIBWMF=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/librsvg.so.1)
-WITH_LIBRSVG=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/mplayer)
-WITH_MPLAYER=	yes
-.endif
-
-.if defined(WITH_LIBMNG)
+.if !defined(WITHOUT_LIBMNG)
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
 PLIST_SUB+=	WITH_LIBMNG=""
 .else
+CONFIGURE_ARGS+=	--without-libmng
 PLIST_SUB+=	WITH_LIBMNG="@comment "
 .endif
 
-.if defined(WITH_LIBWMF)
+.if !defined(WITHOUT_LIBWMF)
 LIB_DEPENDS+=	wmf.2:${PORTSDIR}/graphics/libwmf
 PLIST_SUB+=	WITH_LIBWMF=""
 .else
+CONFIGURE_ARGS+=	--without-libwmf
 PLIST_SUB+=	WITH_LIBWMF="@comment "
 .endif
 
 .if defined(WITH_LIBRSVG)
 LIB_DEPENDS+=	rsvg.1:${PORTSDIR}/graphics/librsvg
+.endif
+
+.if !defined(WITHOUT_LIBRSVG2) && !defined(WITH_LIBRSVG)
+LIB_DEPENDS+=	rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+.endif
+
+.if defined(WITH_LIBRSVG) || !defined(WITHOUT_LIBRSVG2)
 PLIST_SUB+=	WITH_LIBRSVG=""
 .else
+CONFIGURE_ARGS+=	--without-librsvg
 PLIST_SUB+=	WITH_LIBRSVG="@comment "
 .endif
 
-.if defined(WITH_MPLAYER)
+.if !defined(WITHOUT_LIBEXIF)
+LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-exit_view.c
+.else
+CONFIGURE_ARGS+=	--disable-exif
+.endif
+
+.if !defined(WITHOUT_MPLAYER)
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 CONFIGURE_ARGS+=	--enable-mplayer
 PLIST_SUB+=	WITH_LIBMPLAYER=""
 .else
+CONFIGURE_ARGS+=	--disable-mplayer
 PLIST_SUB+=	WITH_LIBMPLAYER="@comment "
 .endif
 
 .if defined(WITH_LIBXINE)
-LIB_DEPENDS+=	xine.16:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=	--with-xine
 PLIST_SUB+=	WITH_LIBXINE=""
 .else
+CONFIGURE_ARGS+=	--without-xine
 PLIST_SUB+=	WITH_LIBXINE="@comment "
 .endif
 
diff --git a/graphics/gimageview/files/patch-gimv_scrolled.c b/graphics/gimageview/files/patch-gimv_scrolled.c
new file mode 100644
index 00000000000..f3a4eff878a
--- /dev/null
+++ b/graphics/gimageview/files/patch-gimv_scrolled.c
@@ -0,0 +1,11 @@
+--- src/gimv_scrolled.c.orig	2009-01-15 19:54:26.000000000 +0100
++++ src/gimv_scrolled.c	2009-01-15 19:54:27.000000000 +0100
+@@ -141,7 +141,7 @@
+                       GTK_CLASS_TYPE(object_class),
+                       GTK_SIGNAL_OFFSET(GimvScrolledClass, set_scroll_adjustments),
+                       gtk_marshal_NONE__POINTER_POINTER,
+-                      GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
++                      GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+     
+    gimv_scrolled_signals[ADJUST_ADJUSTMENTS] = 
+       gtk_signal_new ("adjust_adjustments",
diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist
index 98636d8e587..154bc0db800 100644
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@@ -116,8 +116,8 @@ share/gimageview/pixmaps/default/zoom.xpm
 share/gimageview/pixmaps/default/zoom_fit.xpm
 share/gimageview/pixmaps/default/zoom_in.xpm
 share/gimageview/pixmaps/default/zoom_out.xpm
-share/locale/fr/LC_MESSAGES/gimageview.mo
-share/locale/ja/LC_MESSAGES/gimageview.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gimageview.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gimageview.mo
 share/pixmaps/gimv.png
 @dirrm lib/gimageview/archiver
 @dirrm lib/gimageview/image_loader