From 04220030482158ccc6ae5dfe49a45f5fdc4d1ed3 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Thu, 26 Jan 2012 11:53:49 +0000
Subject: update to 4.0.8 changes: -deal with non-utf8 encoded PPD files
 -improved printer search -minor build fixes and cleanup

---
 print/foomatic4-db-engine/Makefile         |  6 +++---
 print/foomatic4-db-engine/distinfo         | 10 +++++-----
 print/foomatic4-db-engine/patches/patch-aa | 19 +++++--------------
 3 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'print/foomatic4-db-engine')

diff --git a/print/foomatic4-db-engine/Makefile b/print/foomatic4-db-engine/Makefile
index 439a43fb039..ce6abc09c08 100644
--- a/print/foomatic4-db-engine/Makefile
+++ b/print/foomatic4-db-engine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 14:21:29 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/01/26 11:53:49 drochner Exp $
 #
 
-DISTNAME=	foomatic-db-engine-4.0.6
-PKGREVISION=	2
+DISTNAME=	foomatic-db-engine-4.0.8
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/
 
@@ -17,6 +16,7 @@ CONFIGURE_ENV+=	LIBDIR=${LOCALBASE}/share/foomatic
 CONFIGURE_ENV+=	FOOMATIC_RIP=${LOCALBASE}/bin/foomatic-rip
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ENV+=	CUPS_ETC=${PKG_SYSCONFBASE}/cups
+CONFIGURE_ENV+=	PERL_INSTALLDIRS=vendor
 USE_TOOLS+=	perl gmake
 PERL5_PACKLIST=	auto/Foomatic/.packlist
 
diff --git a/print/foomatic4-db-engine/distinfo b/print/foomatic4-db-engine/distinfo
index 8db05387638..dc4b5a4c19a 100644
--- a/print/foomatic4-db-engine/distinfo
+++ b/print/foomatic4-db-engine/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/01/17 14:16:50 drochner Exp $
+$NetBSD: distinfo,v 1.4 2012/01/26 11:53:50 drochner Exp $
 
-SHA1 (foomatic-db-engine-4.0.6.tar.gz) = 18c986b0bfb5f4abe9433c591aa0d44999b579d7
-RMD160 (foomatic-db-engine-4.0.6.tar.gz) = ee81598118a36b73657166c32c712db5be60c6f5
-Size (foomatic-db-engine-4.0.6.tar.gz) = 350697 bytes
-SHA1 (patch-aa) = 79b3c5f60aaf1b612334f15f9c54f6ba94f85ce5
+SHA1 (foomatic-db-engine-4.0.8.tar.gz) = e47f5ee9b9256077f70b5ecf2481dfbce416d97a
+RMD160 (foomatic-db-engine-4.0.8.tar.gz) = 56523835ba5de0e5bdb37b78529775334e96ad76
+Size (foomatic-db-engine-4.0.8.tar.gz) = 354578 bytes
+SHA1 (patch-aa) = 12954938f5678c74c2a5663ca8faf7e58329796e
diff --git a/print/foomatic4-db-engine/patches/patch-aa b/print/foomatic4-db-engine/patches/patch-aa
index 66aebd068e0..0423867cd17 100644
--- a/print/foomatic4-db-engine/patches/patch-aa
+++ b/print/foomatic4-db-engine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/11/20 20:54:00 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2012/01/26 11:53:50 drochner Exp $
 
---- configure.orig	2009-08-19 20:09:16.000000000 +0200
+--- configure.orig	2011-07-25 09:51:22.000000000 +0000
 +++ configure
-@@ -3924,8 +3924,8 @@ done
+@@ -4041,8 +4041,8 @@ LIBS="$save_LIBS"
  SPOOLSEARCHPATH=/var/spool:/usr/spool/:/usr/local/spool:/usr/local/var/spool:/var/local/spool:/var/local
  LOGSEARCHPATH=/var/log:/usr/log:/usr/local/log:/usr/local/var/log:/var/local/log:/var/local
  SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
@@ -10,15 +10,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/11/20 20:54:00 drochner Exp $
 -BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
 +SBINSEARCHPATH=${LOCALBASE}/sbin:/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
 +BINSEARCHPATH=${LOCALBASE}/bin:/usr/bin:/bin:/usr/local/bin
- DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
- LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/usr/local/libexec:/opt
+ DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt
+ LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/usr/local/libexec:/opt
  PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
-@@ -4414,7 +4414,7 @@ fi
- 
- 
- 
--PERL_INSTALLDIRS=site
-+PERL_INSTALLDIRS=vendor
- 
- 
- for ac_prog in bash sh
-- 
cgit v1.2.3