- remove unneeded patches

ok aja@
This commit is contained in:
jasper 2011-05-02 18:57:53 +00:00
parent e376914233
commit d6d42bf2f8
4 changed files with 5 additions and 39 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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@

View File

@ -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

View File

@ -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