diff options
author | tnn <tnn@pkgsrc.org> | 2009-10-11 16:30:43 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2009-10-11 16:30:43 +0000 |
commit | 822894a7760154559a7dcc14f049e7965b2011c9 (patch) | |
tree | 1d6aa19d9581e62c357642a408aa281f6c23436b /print | |
parent | e6eaf67c9e44ddfe61222f32dd93700ba784ded0 (diff) | |
download | pkgsrc-822894a7760154559a7dcc14f049e7965b2011c9.tar.gz |
patch-ag: cups installs stuff in /usr/pkg/lib64 on Linux. Don't do this.
Diffstat (limited to 'print')
-rw-r--r-- | print/cups/distinfo | 5 | ||||
-rw-r--r-- | print/cups/patches/patch-ag | 22 | ||||
-rw-r--r-- | print/cups/patches/patch-an | 33 |
3 files changed, 46 insertions, 14 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index b4f04f21e6c..21ed1efd574 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2009/09/08 19:02:11 joerg Exp $ +$NetBSD: distinfo,v 1.64 2009/10/11 16:30:43 tnn Exp $ SHA1 (cups-1.3.11-source.tar.bz2) = c8304ee8d631bb370fc10fc1fffbe8ebae413df2 RMD160 (cups-1.3.11-source.tar.bz2) = aa263fe29350cee307bbd72ef2f5cb061c2476e0 @@ -9,6 +9,7 @@ SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 SHA1 (patch-ae) = 4b2c1e8821856ba69d6af72a5b96a7b88c346656 SHA1 (patch-af) = 5445e6b5ced9dee71f48208369728e9d298dd0bb -SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49 +SHA1 (patch-ag) = ac35b637aeea8b2e5798c6a779f2ad6ae9e41dca +SHA1 (patch-an) = 9c11292459b0839ae15920d7cc65469247f30800 SHA1 (patch-ao) = c9f93c7d69d934677a605197959a162dfb1658eb SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag new file mode 100644 index 00000000000..300ae518418 --- /dev/null +++ b/print/cups/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.20 2009/10/11 16:30:43 tnn Exp $ + +--- config-scripts/cups-3264.m4.orig 2007-07-11 23:46:42.000000000 +0200 ++++ config-scripts/cups-3264.m4 +@@ -95,7 +95,7 @@ case "$uname" in + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$exec_prefix/lib" +- if test -d /usr/lib32; then ++ if test -d /usr/lib32 && false; then + LIB32DIR="${LIB32DIR}32" + fi + UNINSTALL32="uninstall32bit" +@@ -107,7 +107,7 @@ case "$uname" in + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$exec_prefix/lib" +- if test -d /usr/lib64; then ++ if test -d /usr/lib64 && false; then + LIB64DIR="${LIB64DIR}64" + fi + UNINSTALL64="uninstall64bit" diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an index fb7a058cb67..45a8b7b8296 100644 --- a/print/cups/patches/patch-an +++ b/print/cups/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.9 2008/01/22 23:58:14 markd Exp $ +$NetBSD: patch-an,v 1.10 2009/10/11 16:30:43 tnn 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,18 @@ 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-09-19 08:39:31.000000000 +1200 +--- config-scripts/cups-directories.m4.orig 2008-10-23 17:40:14.000000000 +0200 +++ config-scripts/cups-directories.m4 -@@ -247,7 +247,15 @@ AC_SUBST(CUPS_CACHEDIR) +@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib + libdir="$exec_prefix/lib32" + ;; + Linux*) +- if test -d /usr/lib64; then ++ if test -d /usr/lib64 && false; then + libdir="$exec_prefix/lib64" + fi + ;; +@@ -249,7 +249,15 @@ AC_SUBST(CUPS_CACHEDIR) # Data files CUPS_DATADIR="$datadir/cups" @@ -28,7 +37,7 @@ works. AC_SUBST(CUPS_DATADIR) # Icon directory -@@ -256,7 +264,11 @@ AC_ARG_WITH(icondir, [ --with-icondir +@@ -258,7 +266,11 @@ AC_ARG_WITH(icondir, [ --with-icondir if test "x$icondir" = x -a -d /usr/share/icons; then ICONDIR="/usr/share/icons" else @@ -41,7 +50,7 @@ works. fi AC_SUBST(ICONDIR) -@@ -267,7 +279,11 @@ AC_ARG_WITH(menudir, [ --with-menudir +@@ -269,7 +281,11 @@ AC_ARG_WITH(menudir, [ --with-menudir if test "x$menudir" = x -a -d /usr/share/applications; then MENUDIR="/usr/share/applications" else @@ -54,7 +63,7 @@ works. fi AC_SUBST(MENUDIR) -@@ -282,7 +298,15 @@ else +@@ -284,7 +300,15 @@ else CUPS_DOCROOT="$docdir" fi @@ -71,7 +80,7 @@ works. AC_SUBST(CUPS_DOCROOT) # Fonts -@@ -294,8 +318,16 @@ else +@@ -296,8 +320,16 @@ else CUPS_FONTPATH="$fontpath" fi @@ -89,7 +98,7 @@ works. # Locale data (initial assignment allows us not to require autoconf 2.60) localedir="${localedir:=}" -@@ -318,6 +350,14 @@ else +@@ -320,6 +352,14 @@ else CUPS_LOCALEDIR="$localedir" fi @@ -104,7 +113,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") AC_SUBST(CUPS_LOCALEDIR) -@@ -326,7 +366,6 @@ AC_ARG_WITH(logdir, [ --with-logdir +@@ -328,7 +368,6 @@ AC_ARG_WITH(logdir, [ --with-logdir if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups" @@ -112,7 +121,7 @@ works. else CUPS_LOGDIR="$logdir" fi -@@ -335,10 +374,13 @@ AC_SUBST(CUPS_LOGDIR) +@@ -337,10 +376,13 @@ AC_SUBST(CUPS_LOGDIR) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" @@ -127,7 +136,7 @@ works. case "$uname" in *BSD* | Darwin*) # *BSD and Darwin (MacOS X) -@@ -351,6 +393,10 @@ case "$uname" in +@@ -353,6 +395,10 @@ case "$uname" in CUPS_SERVERBIN="$exec_prefix/lib/cups" ;; esac @@ -138,7 +147,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(CUPS_SERVERBIN) -@@ -358,12 +404,12 @@ AC_SUBST(INSTALL_SYSV) +@@ -360,12 +406,12 @@ AC_SUBST(INSTALL_SYSV) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" |