diff options
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/distinfo | 6 | ||||
| -rw-r--r-- | print/cups/patches/patch-an | 92 | ||||
| -rw-r--r-- | print/cups/patches/patch-ao | 80 |
4 files changed, 150 insertions, 32 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index b1e8a76dc4f..86f232cfa81 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2003/05/28 08:58:48 jlam Exp $ +# $NetBSD: Makefile,v 1.63 2003/06/04 06:08:43 jlam 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: @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR} CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} -CONFIGURE_ARGS+= --with-bsdmanext +CONFIGURE_ARGS+= --with-manext=bsd CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL} ${LIBTOOL_FLAGS}" CONFIGURE_ARGS+= --enable-slp CONFIGURE_ARGS+= --enable-ssl diff --git a/print/cups/distinfo b/print/cups/distinfo index d887bd0e6b5..9a501796a4b 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2003/05/28 02:33:59 jlam Exp $ +$NetBSD: distinfo,v 1.23 2003/06/04 06:08:44 jlam Exp $ SHA1 (cups-1.1.19-source.tar.bz2) = 125f82618ca8221598079e275fa1c3e874b3211b Size (cups-1.1.19-source.tar.bz2) = 3691376 bytes @@ -8,7 +8,7 @@ SHA1 (patch-ad) = a426a03e67800a66fc819e79762e64fd2a73c646 SHA1 (patch-af) = e0de558fdc6bd960ceb26709ea6ff33bc33567e0 SHA1 (patch-ag) = 317ba533794c9acf968f21c5a0f38aac4d74eedb SHA1 (patch-am) = 67446886161f3062b89f3d9da56edc7faca4ad18 -SHA1 (patch-an) = 5ef594098978476eaee13cc8afc05679b6321176 -SHA1 (patch-ao) = cbe2edda168434d0c58214f2a8089555357de292 +SHA1 (patch-an) = c4266134f66868f59978ca513f8e3f68dc10f07f +SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef SHA1 (patch-ap) = 04da658e62e9ef1765ae4d34ab1f809327d5cf8b SHA1 (patch-at) = 331bfe986dbb1e7f894ec6f0a6baaa86b36307a5 diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an index 042cfb5135b..79d02ede6b7 100644 --- a/print/cups/patches/patch-an +++ b/print/cups/patches/patch-an @@ -1,17 +1,30 @@ -$NetBSD: patch-an,v 1.3 2002/12/19 22:24:55 jlam Exp $ +$NetBSD: patch-an,v 1.4 2003/06/04 06:08:44 jlam Exp $ ---- config-scripts/cups-directories.m4.orig Thu Oct 17 13:05:37 2002 +--- config-scripts/cups-directories.m4.orig Tue Dec 17 10:56:39 2002 +++ config-scripts/cups-directories.m4 -@@ -28,6 +28,7 @@ AC_ARG_WITH(fontpath, [ --with-fontpath - AC_ARG_WITH(docdir, [ --with-docdir set path for documentation],docdir="$withval",docdir="") +@@ -29,4 +29,6 @@ AC_ARG_WITH(docdir, [ --with-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... - if test "$prefix" = "NONE"; then -@@ -174,20 +175,23 @@ else +@@ -163,30 +165,30 @@ CUPS_SERVERROOT="$sysconfdir/cups" + CUPS_REQUESTS="$localstatedir/spool/cups" + +-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") +-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") ++AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT") ++AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS") + + if test x$logdir = x; then + CUPS_LOGDIR="$localstatedir/log/cups" +- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups") + else + CUPS_LOGDIR="$logdir" +- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir") fi ++AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR") dnl See what directory to put server executables... -case "$uname" in @@ -33,18 +46,77 @@ $NetBSD: patch-an,v 1.3 2002/12/19 22:24:55 jlam Exp $ + *BSD* | Darwin*) + # *BSD and Darwin (MacOS X) + CUPS_SERVERBIN="$exec_prefix/libexec/cups" -+ AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups") + ;; + *) + # All others + CUPS_SERVERBIN="$libdir/cups" -+ AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups") + ;; + esac +else + CUPS_SERVERBIN="$serverbindir" -+ AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$serverbindir") +fi ++AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(INSTALL_SYSV) - AC_SUBST(CUPS_SERVERROOT) +@@ -197,27 +199,28 @@ AC_SUBST(CUPS_REQUESTS) + + dnl Set the CUPS_LOCALE directory... +-case "$uname" in +- Linux* | *BSD* | Darwin*) +- CUPS_LOCALEDIR="$datadir/locale" +- AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale") +- ;; +- +- OSF1* | AIX*) +- CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg" +- AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg") +- ;; +- +- *) +- # This is the standard System V location... +- CUPS_LOCALEDIR="$exec_prefix/lib/locale" +- AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale") +- ;; +-esac ++if test x$localedir = x; then ++ case "$uname" in ++ Linux* | *BSD* | Darwin*) ++ CUPS_LOCALEDIR="$datadir/locale" ++ ;; + ++ OSF1* | AIX*) ++ CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg" ++ ;; ++ ++ *) ++ # This is the standard System V location... ++ CUPS_LOCALEDIR="$exec_prefix/lib/locale" ++ ;; ++ esac ++else ++ CUPS_LOCALEDIR="$localedir" ++fi ++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") ++AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") + AC_SUBST(CUPS_DATADIR) + +@@ -229,12 +232,11 @@ else + CUPS_DOCROOT="$docdir" + fi +- +-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir") ++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT") + AC_SUBST(CUPS_DOCROOT) + + dnl Set the CUPS_FONTPATH directory... + CUPS_FONTPATH="$fontpath" ++AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") + AC_SUBST(CUPS_FONTPATH) +-AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath") + + dnl diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao index 0bfa7f95945..7930a67ce93 100644 --- a/print/cups/patches/patch-ao +++ b/print/cups/patches/patch-ao @@ -1,29 +1,75 @@ -$NetBSD: patch-ao,v 1.4 2002/12/19 22:24:55 jlam Exp $ +$NetBSD: patch-ao,v 1.5 2003/06/04 06:08:45 jlam Exp $ ---- config-scripts/cups-manpages.m4.orig Wed Jan 2 13:50:43 2002 +--- config-scripts/cups-manpages.m4.orig Tue Dec 17 10:56:39 2002 +++ config-scripts/cups-manpages.m4 @@ -22,6 +22,8 @@ dnl EMail: cups-info@cups.org dnl WWW: http://www.cups.org dnl -+AC_ARG_WITH(bsdmanext, [ --with-bsdmanext use BSD manpage extensions],bsdmanext="yes",bsdmanext="no") ++AC_ARG_WITH(manext, [ --with-manext set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="") + dnl Fix "mandir" variable... if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then case "$uname" in -@@ -91,6 +93,15 @@ case "$uname" in +@@ -53,9 +55,28 @@ AC_SUBST(AMANDIR) + AC_SUBST(PMANDIR) + + dnl Setup manpage extensions... +-case "$uname" in +- *BSD* | Darwin*) +- # *BSD ++if test x$manext = x; then ++ case "$uname" in ++ *BSD* | Darwin*) ++ # *BSD and Darwin (MacOS X) ++ manext=bsd ++ ;; ++ IRIX*) ++ # SGI IRIX ++ manext=irix ++ ;; ++ SunOS* | HP-UX*) ++ # Solaris and HP-UX ++ manext=sysv ++ ;; ++ *) ++ # All others ++ manext=none ++ ;; ++ esac ++fi ++case "$manext" in ++ bsd) + CAT1EXT=0 + CAT3EXT=0 + CAT5EXT=0 +@@ -63,8 +84,7 @@ case "$uname" in + MAN8EXT=8 MAN8DIR=8 ;; - esac -+ -+if test x$bsdmanext = xyes; then -+ CAT1EXT=0 -+ CAT3EXT=0 -+ CAT5EXT=0 -+ CAT8EXT=0 -+ MAN8EXT=8 -+ MAN8DIR=8 -+fi - - AC_SUBST(CAT1EXT) - AC_SUBST(CAT3EXT) +- IRIX*) +- # SGI IRIX ++ irix) + CAT1EXT=z + CAT3EXT=z + CAT5EXT=z +@@ -72,8 +92,7 @@ case "$uname" in + MAN8EXT=1m + MAN8DIR=1 + ;; +- SunOS* | HP-UX*) +- # Solaris and HP-UX ++ sysv) + CAT1EXT=1 + CAT3EXT=3 + CAT5EXT=5 +@@ -81,8 +100,7 @@ case "$uname" in + MAN8EXT=1m + MAN8DIR=1m + ;; +- *) +- # All others ++ none|*) + CAT1EXT=1 + CAT3EXT=3 + CAT5EXT=5 |