head 1.3; access; symbols pkgsrc-2020Q1:1.2.0.18 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.40 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.36 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.34 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.32 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.30 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.28 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.26 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.24 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.22 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.20 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.16 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.14 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.12 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.10 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.8 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.6 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.4 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.2 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.1.0.10 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.8 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.6 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.4 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.2 pkgsrc-2014Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2020.04.24.12.00.53; author nia; state dead; branches; next 1.2; commitid 2xtbmLVjtTZDjD5C; 1.2 date 2015.09.05.13.03.22; author jperkin; state Exp; branches; next 1.1; commitid QKTlrhgh4Px254Ay; 1.1 date 2014.06.17.13.17.13; author wiz; state Exp; branches; next ; commitid nYbwnRfZ8CqMsSEx; desc @@ 1.3 log @print: Remove cups15, legacy cups version now BROKEN due to OpenSSL 1.1 @ text @$NetBSD: patch-an,v 1.2 2015/09/05 13:03:22 jperkin Exp $ 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 2011-05-12 05:21:56.000000000 +0000 +++ config-scripts/cups-directories.m4 @@@@ -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 ;; @@@@ -308,7 +308,15 @@@@ AC_SUBST(CUPS_CACHEDIR) # Data files 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) # Icon directory @@@@ -317,7 +325,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) @@@@ -328,7 +340,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) @@@@ -343,7 +359,15 @@@@ else CUPS_DOCROOT="$docdir" 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) # Fonts @@@@ -355,8 +379,16 @@@@ else CUPS_FONTPATH="$fontpath" fi -AC_SUBST(CUPS_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) # Locale data if test "$localedir" = "\${datarootdir}/locale"; then @@@@ -378,6 +410,14 @@@@ 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) @@@@ -386,7 +426,6 @@@@ AC_ARG_WITH(logdir, [ --with-logdir if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups" - AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups") else CUPS_LOGDIR="$logdir" fi @@@@ -395,10 +434,13 @@@@ AC_SUBST(CUPS_LOGDIR) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" -AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") +AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS") AC_SUBST(CUPS_REQUESTS) # Server executables... +AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="") + +if test x$serverbindir = x; then case "$uname" in *BSD* | Darwin*) # *BSD and Darwin (MacOS X) @@@@ -411,6 +453,10 @@@@ case "$uname" in CUPS_SERVERBIN="$exec_prefix/lib/cups" ;; esac +else + INSTALL_SYSV="" + CUPS_SERVERBIN="$serverbindir" +fi AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(CUPS_SERVERBIN) @@@@ -418,7 +464,7 @@@@ AC_SUBST(INSTALL_SYSV) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" -AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") +AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT") AC_SUBST(CUPS_SERVERROOT) # Transient run-time state @ 1.2 log @Various changes to fix build on Darwin. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2014/06/17 13:17:13 wiz Exp $ @ 1.1 log @Import cups-1.5.4nb12 as print/cups15, for those that prefer it to cups-1.7.x The Common UNIX Printing System provides a portable printing layer for UNIX operating systems. It has been developed by Easy Software Products to promote a standard printing solution for all UNIX vendors and users. CUPS provides the System V and Berkeley command-line interfaces. CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for managing print jobs and queues. The Line Printer Daemon (LPD, RFC1179) and AppSocket protocols are also supported with reduced functionality. CUPS adds network printer browsing and PostScript Printer Description ("PPD")-based printing options to support real world applications under UNIX. This package contains the older 1.5 series, before Apple stopped maintaining the filters. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.11 2010/05/21 10:05:20 sbd Exp $ d12 1 a12 1 --- config-scripts/cups-directories.m4.orig 2009-04-12 23:04:51.000000000 +0000 d23 1 a23 1 @@@@ -297,7 +297,15 @@@@ AC_SUBST(CUPS_CACHEDIR) d40 1 a40 1 @@@@ -306,7 +314,11 @@@@ AC_ARG_WITH(icondir, [ --with-icondir d53 1 a53 1 @@@@ -317,7 +329,11 @@@@ AC_ARG_WITH(menudir, [ --with-menudir d66 1 a66 1 @@@@ -332,7 +348,15 @@@@ else d83 1 a83 1 @@@@ -344,8 +368,16 @@@@ else d101 1 a101 1 @@@@ -367,6 +399,14 @@@@ else d116 1 a116 1 @@@@ -375,7 +415,6 @@@@ AC_ARG_WITH(logdir, [ --with-logdir d124 1 a124 1 @@@@ -384,10 +423,13 @@@@ AC_SUBST(CUPS_LOGDIR) d139 1 a139 1 @@@@ -400,6 +442,10 @@@@ case "$uname" in d150 1 a150 1 @@@@ -407,7 +453,7 @@@@ AC_SUBST(INSTALL_SYSV) @