From 317bd01548e6aa6181cc521091422f579a348890 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 10 Sep 2012 08:40:14 +0000
Subject: [PATCH] Explicitely patch for DATADIRNAME; the hack from the gnome
 MODULE will be removed soon.

---
 graphics/simple-scan/Makefile                 |  7 +-
 graphics/simple-scan/patches/patch-aclocal_m4 | 25 ++++++
 graphics/simple-scan/patches/patch-configure  | 78 -------------------
 .../simple-scan/patches/patch-configure_ac    | 14 ++++
 4 files changed, 43 insertions(+), 81 deletions(-)
 create mode 100644 graphics/simple-scan/patches/patch-aclocal_m4
 delete mode 100644 graphics/simple-scan/patches/patch-configure
 create mode 100644 graphics/simple-scan/patches/patch-configure_ac

diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile
index efb1dc9d0ad..93a6b391f01 100644
--- a/graphics/simple-scan/Makefile
+++ b/graphics/simple-scan/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2012/09/01 14:36:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2012/09/10 08:40:14 ajacoutot Exp $
 
 COMMENT=	simple scanning utility
 
 GNOME_PROJECT=	simple-scan
 GNOME_VERSION=	3.4.2
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	graphics
 
@@ -41,6 +41,7 @@ MODGNOME_TOOLS= 	yelp
 
 USE_GMAKE=	Yes
 
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.68
+CONFIGURE_STYLE=autoconf
 
 .include <bsd.port.mk>
diff --git a/graphics/simple-scan/patches/patch-aclocal_m4 b/graphics/simple-scan/patches/patch-aclocal_m4
new file mode 100644
index 00000000000..d805f3f9edb
--- /dev/null
+++ b/graphics/simple-scan/patches/patch-aclocal_m4
@@ -0,0 +1,25 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2012/09/10 08:40:14 ajacoutot Exp $
+
+Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
+
+--- aclocal.m4.orig	Tue May 22 01:03:42 2012
++++ aclocal.m4	Mon Sep 10 10:35:29 2012
+@@ -294,6 +294,8 @@ fi
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+ 
++AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
++
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+@@ -311,6 +313,9 @@ if test -z "$DATADIRNAME"; then
+     dnl in this case.
+     AC_CHECK_FUNC(bind_textdomain_codeset,
+       [DATADIRNAME=share], [DATADIRNAME=lib])
++    ;;
++    *-*-openbsd*)
++    [DATADIRNAME=share]
+     ;;
+     *)
+     [DATADIRNAME=lib]
diff --git a/graphics/simple-scan/patches/patch-configure b/graphics/simple-scan/patches/patch-configure
deleted file mode 100644
index c0b01a059ed..00000000000
--- a/graphics/simple-scan/patches/patch-configure
+++ /dev/null
@@ -1,78 +0,0 @@
-$OpenBSD: patch-configure,v 1.6 2012/03/29 06:42:00 ajacoutot Exp $
-
-No gudev under OpenBSD.
-
---- configure.orig	Sat Mar 17 02:44:57 2012
-+++ configure	Fri Mar 23 22:12:11 2012
-@@ -4717,7 +4717,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- \""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
-     gtk+-3.0
-@@ -4726,7 +4725,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -4738,7 +4736,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- " 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -4758,7 +4755,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- \""; } >&5
-   ($PKG_CONFIG --exists --print-errors "
-     gtk+-3.0
-@@ -4767,7 +4763,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -4779,7 +4774,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- " 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -4808,7 +4802,6 @@ fi
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- " 2>&1`
-         else
- 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-@@ -4818,7 +4811,6 @@ fi
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- " 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -4831,7 +4823,6 @@ fi
-     zlib
-     cairo
-     gdk-pixbuf-2.0
--    gudev-1.0
- ) were not met:
- 
- $SIMPLE_SCAN_PKG_ERRORS
diff --git a/graphics/simple-scan/patches/patch-configure_ac b/graphics/simple-scan/patches/patch-configure_ac
new file mode 100644
index 00000000000..27cfef0e5e2
--- /dev/null
+++ b/graphics/simple-scan/patches/patch-configure_ac
@@ -0,0 +1,14 @@
+$OpenBSD: patch-configure_ac,v 1.1 2012/09/10 08:40:14 ajacoutot Exp $
+
+No gudev under OpenBSD.
+
+--- configure.ac.orig	Mon Sep 10 10:30:59 2012
++++ configure.ac	Mon Sep 10 10:31:06 2012
+@@ -29,7 +29,6 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
+     zlib
+     cairo
+     gdk-pixbuf-2.0
+-    gudev-1.0
+ ])
+ 
+ PKG_CHECK_MODULES(COLORD, [