[pkgsrc/trunk]: pkgsrc/print/cups Fix installation with autoconf-2.60.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6ef0c6d303b
branches:  trunk
changeset: 515648:d6ef0c6d303b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jul 05 20:12:06 2006 +0000

description:
Fix installation with autoconf-2.60.

diffstat:

 print/cups/Makefile         |   4 +++-
 print/cups/distinfo         |   5 ++++-
 print/cups/patches/patch-aj |  12 ++++++++++++
 print/cups/patches/patch-ak |  12 ++++++++++++
 print/cups/patches/patch-al |  12 ++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)

diffs (85 lines):

diff -r 43cd64928372 -r d6ef0c6d303b print/cups/Makefile
--- a/print/cups/Makefile       Wed Jul 05 19:49:22 2006 +0000
+++ b/print/cups/Makefile       Wed Jul 05 20:12:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2006/05/03 15:34:36 gdt Exp $
+# $NetBSD: Makefile,v 1.113 2006/07/05 20:12:06 wiz Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -35,6 +35,8 @@
 USE_TOOLS+=            autoconf gmake
 USE_LIBTOOL=           yes
 INSTALL_TARGET=                installcups
+# patch-a[jkl] were added for 2.60
+AUTOCONF_REQD=         2.60
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
diff -r 43cd64928372 -r d6ef0c6d303b print/cups/distinfo
--- a/print/cups/distinfo       Wed Jul 05 19:49:22 2006 +0000
+++ b/print/cups/distinfo       Wed Jul 05 20:12:06 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2006/04/21 17:24:52 wiz Exp $
+$NetBSD: distinfo,v 1.42 2006/07/05 20:12:06 wiz Exp $
 
 SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
 RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
@@ -12,6 +12,9 @@
 SHA1 (patch-ag) = 47a5c7a9ad7c604fa3253aebbaa62f576fb477d0
 SHA1 (patch-ah) = 1ef58b7e1dfcbd8aabb9e822d30f995b3d653ea4
 SHA1 (patch-ai) = f1b60cec40426e158801a24e043bc41fee199d1b
+SHA1 (patch-aj) = 248c7ae93fd81154d703a56c0149463d6a73a6f6
+SHA1 (patch-ak) = fe0a5317cf70f49fe3b386177b7a12b2df306ed1
+SHA1 (patch-al) = dcec693d824305cce6e31c07fb96be4759a55f81
 SHA1 (patch-an) = 8eb0f80067839d3d112d93e08cb8ad6854fa2b4c
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
 SHA1 (patch-ap) = 2351844f81a561d69cd02a1e83e30f3c9ee33f5f
diff -r 43cd64928372 -r d6ef0c6d303b print/cups/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-aj       Wed Jul 05 20:12:06 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.11 2006/07/05 20:12:06 wiz Exp $
+
+--- Makedefs.in.orig   2005-01-03 19:29:44.000000000 +0000
++++ Makedefs.in
+@@ -117,6 +117,7 @@ SSLLIBS            =       @SSLLIBS@
+ 
+ bindir                =       @bindir@
+ datadir               =       @datadir@
++datarootdir   =       @datarootdir@
+ exec_prefix   =       @exec_prefix@
+ includedir    =       @includedir@
+ infodir               =       @infodir@
diff -r 43cd64928372 -r d6ef0c6d303b print/cups/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-ak       Wed Jul 05 20:12:06 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.11 2006/07/05 20:12:06 wiz Exp $
+
+--- cups-config.in.orig        2005-01-03 19:29:44.000000000 +0000
++++ cups-config.in
+@@ -32,6 +32,7 @@ bindir=@bindir@
+ includedir=@includedir@
+ libdir=@libdir@
+ datadir=@datadir@
++datarootdir=@datarootdir@
+ sysconfdir=@sysconfdir@
+ cups_datadir=@CUPS_DATADIR@
+ cups_serverbin=@CUPS_SERVERBIN@
diff -r 43cd64928372 -r d6ef0c6d303b print/cups/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-al       Wed Jul 05 20:12:06 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.6 2006/07/05 20:12:06 wiz Exp $
+
+--- cups.list.in.orig  2005-01-03 19:29:44.000000000 +0000
++++ cups.list.in
+@@ -58,6 +58,7 @@ $prefix=@prefix@
+ $exec_prefix=@exec_prefix@
+ $bindir=@bindir@
+ $datadir=@datadir@
++$datarootdir=@datarootdir@
+ $includedir=@includedir@
+ $infodir=@infodir@
+ $libdir=@libdir@