diff options
Diffstat (limited to 'print/cups/patches/patch-an')
| -rw-r--r-- | print/cups/patches/patch-an | 70 |
1 files changed, 44 insertions, 26 deletions
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an index 315e823d60b..fb7a058cb67 100644 --- a/print/cups/patches/patch-an +++ b/print/cups/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.8 2007/03/14 12:29:05 markd Exp $ +$NetBSD: patch-an,v 1.9 2008/01/22 23:58:14 markd Exp $ The '$' while loops expand the variables as long as possible so that no references to other variables occur. This is necessary because fontpath @@ -9,9 +9,9 @@ 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 2007-02-05 22:22:11.000000000 +1300 +--- config-scripts/cups-directories.m4.orig 2007-09-19 08:39:31.000000000 +1200 +++ config-scripts/cups-directories.m4 -@@ -223,7 +223,15 @@ AC_SUBST(CUPS_CACHEDIR) +@@ -247,7 +247,15 @@ AC_SUBST(CUPS_CACHEDIR) # Data files CUPS_DATADIR="$datadir/cups" @@ -27,8 +27,34 @@ works. +AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") AC_SUBST(CUPS_DATADIR) - # Documentation files -@@ -236,7 +244,15 @@ else + # Icon directory +@@ -256,7 +264,11 @@ AC_ARG_WITH(icondir, [ --with-icondir + if test "x$icondir" = x -a -d /usr/share/icons; then + ICONDIR="/usr/share/icons" + else +- ICONDIR="$icondir" ++ if test "x$icondir" = xno; then ++ ICONDIR="" ++ else ++ ICONDIR="$icondir" ++ fi + fi + + AC_SUBST(ICONDIR) +@@ -267,7 +279,11 @@ AC_ARG_WITH(menudir, [ --with-menudir + if test "x$menudir" = x -a -d /usr/share/applications; then + MENUDIR="/usr/share/applications" + else +- MENUDIR="$menudir" ++ if test "x$menudir" = xno; then ++ MENUDIR="" ++ else ++ MENUDIR="$menudir" ++ fi + fi + + AC_SUBST(MENUDIR) +@@ -282,7 +298,15 @@ else CUPS_DOCROOT="$docdir" fi @@ -45,7 +71,7 @@ works. AC_SUBST(CUPS_DOCROOT) # Fonts -@@ -248,10 +264,21 @@ else +@@ -294,8 +318,16 @@ else CUPS_FONTPATH="$fontpath" fi @@ -61,21 +87,12 @@ works. AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") +AC_SUBST(CUPS_FONTPATH) - # Locale data -+AC_ARG_WITH(localedir, [ --with-localedir set path for locale files],localedir="$withval",localedir="") -+ -+if test x$localedir = x; then - case "$uname" in - Linux | GNU | *BSD* | Darwin*) - CUPS_LOCALEDIR="$datadir/locale" -@@ -266,6 +293,17 @@ case "$uname" in - CUPS_LOCALEDIR="$exec_prefix/lib/locale" - ;; - esac -+else -+ CUPS_LOCALEDIR="$localedir" -+fi -+ + # Locale data (initial assignment allows us not to require autoconf 2.60) + localedir="${localedir:=}" +@@ -318,6 +350,14 @@ else + CUPS_LOCALEDIR="$localedir" + fi + +done=no +while test $done = no; do + case "$CUPS_LOCALEDIR" in @@ -83,10 +100,11 @@ works. + *) done=yes;; + esac +done - ++ AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") AC_SUBST(CUPS_LOCALEDIR) -@@ -275,7 +313,6 @@ AC_ARG_WITH(logdir, [ --with-logdir + +@@ -326,7 +366,6 @@ AC_ARG_WITH(logdir, [ --with-logdir if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups" @@ -94,7 +112,7 @@ works. else CUPS_LOGDIR="$logdir" fi -@@ -284,10 +321,13 @@ AC_SUBST(CUPS_LOGDIR) +@@ -335,10 +374,13 @@ AC_SUBST(CUPS_LOGDIR) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" @@ -109,7 +127,7 @@ works. case "$uname" in *BSD* | Darwin*) # *BSD and Darwin (MacOS X) -@@ -300,6 +340,10 @@ case "$uname" in +@@ -351,6 +393,10 @@ case "$uname" in CUPS_SERVERBIN="$exec_prefix/lib/cups" ;; esac @@ -120,7 +138,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(CUPS_SERVERBIN) -@@ -307,12 +351,12 @@ AC_SUBST(INSTALL_SYSV) +@@ -358,12 +404,12 @@ AC_SUBST(INSTALL_SYSV) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" |