From d6d42bf2f8d3afdfabcc3562a821c342cb1addc4 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 2 May 2011 18:57:53 +0000 Subject: [PATCH] - remove unneeded patches ok aja@ --- graphics/xsane/Makefile | 6 +++++- graphics/xsane/patches/patch-doc_Makefile_in | 12 ------------ graphics/xsane/patches/patch-po_Makefile_in | 12 ------------ graphics/xsane/patches/patch-src_Makefile_in | 14 -------------- 4 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 graphics/xsane/patches/patch-doc_Makefile_in delete mode 100644 graphics/xsane/patches/patch-po_Makefile_in delete mode 100644 graphics/xsane/patches/patch-src_Makefile_in diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index f118dae86f0..a5b7548f01b 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2010/11/18 07:30:10 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.28 2011/05/02 18:57:53 jasper Exp $ COMMENT= scanner frontend for SANE @@ -57,4 +57,8 @@ CONFIGURE_ENV += CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0" CONFIGURE_ARGS+=--disable-gimp .endif +FAKE_FLAGS+= localedir=${PREFIX}/share/locale \ + sanedatadir=${PREFIX}/share/ \ + xsanedocdir=${PREFIX}/share/doc/xsane/ + .include diff --git a/graphics/xsane/patches/patch-doc_Makefile_in b/graphics/xsane/patches/patch-doc_Makefile_in deleted file mode 100644 index 9ff360e2ed1..00000000000 --- a/graphics/xsane/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2006/10/20 17:54:45 ajacoutot Exp $ ---- doc/Makefile.in.orig Thu Sep 21 15:53:19 2006 -+++ doc/Makefile.in Thu Sep 21 15:54:24 2006 -@@ -21,7 +21,7 @@ includedir = @includedir@ - oldincludedir = /usr/include - configdir = ${sysconfdir}/sane.d - sanedatadir = ${datadir}/sane --xsanedocdir = ${datadir}/sane/xsane/doc -+xsanedocdir = ${datadir}/doc/xsane - - MKINSTALLDIRS = @MKINSTALLDIRS@ - INSTALL = @INSTALL@ diff --git a/graphics/xsane/patches/patch-po_Makefile_in b/graphics/xsane/patches/patch-po_Makefile_in deleted file mode 100644 index ccb475320eb..00000000000 --- a/graphics/xsane/patches/patch-po_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_Makefile_in,v 1.1.1.1 2006/10/20 17:54:45 ajacoutot Exp $ ---- po/Makefile.in.orig Fri Oct 20 16:50:13 2006 -+++ po/Makefile.in Fri Oct 20 16:50:34 2006 -@@ -20,7 +20,7 @@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/graphics/xsane/patches/patch-src_Makefile_in b/graphics/xsane/patches/patch-src_Makefile_in deleted file mode 100644 index 7c0a6262249..00000000000 --- a/graphics/xsane/patches/patch-src_Makefile_in +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.2 2008/09/24 16:30:43 ajacoutot Exp $ ---- src/Makefile.in.orig Wed Sep 24 17:59:31 2008 -+++ src/Makefile.in Wed Sep 24 17:59:51 2008 -@@ -21,8 +21,8 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - configdir = ${sysconfdir}/sane.d --sanedatadir = ${datadir}/sane --xsanedocdir = ${datadir}/sane/xsane/doc -+sanedatadir = ${datadir} -+xsanedocdir = ${datadir}/doc/xsane - desktopappdir = @datadir@/applications - pixmapdir = @datadir@/pixmaps -