Fixed unresolved pathnames like "${datarootdir}/cups".

See: http://mail-index.netbsd.org/pkgsrc-users/2006/10/05/0000.html

3 files changed, 63 insertions, 16 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 576fe500605..3e8b0c0a649 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2006/07/05 20:12:06 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2006/10/05 01:13:00 rillig 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:
@@ -6,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-PKGREVISION=	10
+PKGREVISION=	11
 BASE_VERS=	1.1.23
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
@@ -32,7 +32,7 @@ WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 UNLIMIT_RESOURCES=	datasize memorysize
 USE_LANGUAGES=		c c++	# pdftops is a C++ application
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		autoconf gmake
+USE_TOOLS+=		aclocal autoconf automake gmake
 USE_LIBTOOL=		yes
 INSTALL_TARGET=		installcups
 # patch-a[jkl] were added for 2.60
@@ -128,7 +128,7 @@ SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
 SUBST_STAGE.paths=	post-patch
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && aclocal && autoconf
 
 post-extract:
 	${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 3ddb18ad203..a12688233f0 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2006/09/24 17:09:13 jdc Exp $
+$NetBSD: distinfo,v 1.44 2006/10/05 01:13:00 rillig Exp $
 
 SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
 RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
@@ -16,7 +16,7 @@ SHA1 (patch-aj) = 248c7ae93fd81154d703a56c0149463d6a73a6f6
 SHA1 (patch-ak) = fe0a5317cf70f49fe3b386177b7a12b2df306ed1
 SHA1 (patch-al) = dcec693d824305cce6e31c07fb96be4759a55f81
 SHA1 (patch-am) = 660bdcd7717f68453fbb3e8b6aa81a4205ef08a1
-SHA1 (patch-an) = 8eb0f80067839d3d112d93e08cb8ad6854fa2b4c
+SHA1 (patch-an) = a300388af3673e9bf587326817f73edc813da11e
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
 SHA1 (patch-ap) = 2351844f81a561d69cd02a1e83e30f3c9ee33f5f
 SHA1 (patch-at) = aa36ec591164675b889d2cf32e4d754e9b6db94f
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
index bc55c50856f..27e6a3978f7 100644
--- a/print/cups/patches/patch-an
+++ b/print/cups/patches/patch-an
@@ -1,15 +1,27 @@
-$NetBSD: patch-an,v 1.6 2005/12/03 01:41:56 joerg Exp $
+$NetBSD: patch-an,v 1.7 2006/10/05 01:13:00 rillig Exp $
 
---- config-scripts/cups-directories.m4.orig	Tue Dec 17 10:56:39 2002
-+++ config-scripts/cups-directories.m4
-@@ -29,4 +29,6 @@ AC_ARG_WITH(docdir, [  --with-docdir    
+The '$' while loops expand the variables as long as possible so that no
+references to other variables occur. This is necessary because fontpath
+may be "${exec_prefix}", which itself may be "${prefix}", and so on. I
+don't know how many levels of indirection are possible, therefore the
+loop.
+
+I'm also sure that this is not the Right Way to fix it, but at least it
+works.
+
+--- config-scripts/cups-directories.m4.orig	2005-01-03 20:29:45.000000000 +0100
++++ config-scripts/cups-directories.m4	2006-10-05 02:58:53.000000000 +0200
+@@ -28,6 +28,8 @@ AC_ARG_WITH(fontpath, [  --with-fontpath
+ AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
  AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
  AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
 +AC_ARG_WITH(localedir, [  --with-localedir        set path for locale files],localedir="$withval",localedir="")
 +AC_ARG_WITH(serverbindir, [  --with-serverbindir     set path for server helper programs],serverbindir="$withval",serverbindir="")
  
  dnl Fix "prefix" variable if it hasn't been specified...
-@@ -163,30 +165,30 @@ CUPS_SERVERROOT="$sysconfdir/cups"
+ if test "$prefix" = "NONE"; then
+@@ -162,32 +164,32 @@ dnl Setup default locations...
+ CUPS_SERVERROOT="$sysconfdir/cups"
  CUPS_REQUESTS="$localstatedir/spool/cups"
  
 -AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
@@ -58,7 +70,9 @@ $NetBSD: patch-an,v 1.6 2005/12/03 01:41:56 joerg Exp $
 +AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  
  AC_SUBST(INSTALL_SYSV)
-@@ -197,27 +199,28 @@ AC_SUBST(CUPS_REQUESTS)
+ AC_SUBST(CUPS_SERVERROOT)
+@@ -196,29 +198,47 @@ AC_SUBST(CUPS_LOGDIR)
+ AC_SUBST(CUPS_REQUESTS)
  
  dnl Set the CUPS_LOCALE directory...
 -case "$uname" in
@@ -83,7 +97,7 @@ $NetBSD: patch-an,v 1.6 2005/12/03 01:41:56 joerg Exp $
 +		Linux* | *BSD* | Darwin* | DragonFly*)
 +			CUPS_LOCALEDIR="$datadir/locale"
 +			;;
- 
++
 +		OSF1* | AIX*)
 +			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
 +			;;
@@ -96,25 +110,58 @@ $NetBSD: patch-an,v 1.6 2005/12/03 01:41:56 joerg Exp $
 +else
 +	CUPS_LOCALEDIR="$localedir"
 +fi
+ 
++done=no
++while test $done = no; do
++	case "$CUPS_LOCALEDIR" in
++	*'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
++	*) done=yes;;
++	esac
++done
++	
 +AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
  AC_SUBST(CUPS_LOCALEDIR)
  
  dnl Set the CUPS_DATADIR directory...
  CUPS_DATADIR="$datadir/cups"
 -AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
++done=no
++while test $done = no; do
++	case "$CUPS_DATADIR" in
++	*'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";;
++	*) done=yes;;
++	esac
++done
++
 +AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
  AC_SUBST(CUPS_DATADIR)
  
-@@ -229,12 +232,11 @@ else
- 	CUPS_DOCROOT="$docdir"
+ dnl Set the CUPS_DOCROOT directory...
+@@ -230,11 +250,27 @@ else
  fi
--
+ 
 -AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
++done=no
++while test $done = no; do
++	case "$CUPS_DOCROOT" in
++	*'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";;
++	*) done=yes;;
++	esac
++done
++
 +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT")
  AC_SUBST(CUPS_DOCROOT)
  
  dnl Set the CUPS_FONTPATH directory...
  CUPS_FONTPATH="$fontpath"
++done=no
++while test $done = no; do
++	case "$CUPS_FONTPATH" in
++	*'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";;
++	*) done=yes;;
++	esac
++done
++
 +AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
  AC_SUBST(CUPS_FONTPATH)
 -AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")