From b6aeaee13bec17a920ce2597a1feb92134b0e97f Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 18 Sep 2002 23:55:51 +0000 Subject: Update print/xpp to version 1.1. Changes from version 1.0 include: - Removed function overloading for the password dialog, used the new method of CUPS 1.1.3 - Added support for the "natural-scaling" image size option introduced in CUPS 1.1.9 - Added support for the new PPD-O-Matic PPD files of linuxprinting.org (numerical options appeared twice before). The old CUPS-O-Matic files can still be used. - The COMDATA lines in the PPD files of the new XML Foomatic changed in a way incompatible to the parser for the numerical options in XPP. Modified parser to read both the old and the new format. --- print/xpp/Makefile | 7 ++----- print/xpp/distinfo | 8 ++++---- print/xpp/patches/patch-ab | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/print/xpp/Makefile b/print/xpp/Makefile index 3489d79c238..cbcad110eb7 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2002/08/25 21:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/09/18 23:55:51 jlam Exp $ -DISTNAME= xpp-1.0 +DISTNAME= xpp-1.1 PKGREVISION= 1 CATEGORIES= print x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cups/} @@ -16,9 +16,6 @@ GNU_CONFIGURE= # defined DOCDIR= ${PREFIX}/share/doc/xpp -pre-configure: - cd ${WRKSRC}; ${TOUCH} Makefile.in aclocal.m4 configure - post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR} diff --git a/print/xpp/distinfo b/print/xpp/distinfo index 9455a87ed20..b20aa207d8b 100644 --- a/print/xpp/distinfo +++ b/print/xpp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/05/26 07:16:16 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/09/18 23:55:51 jlam Exp $ -SHA1 (xpp-1.0.tar.gz) = de66f28a78a474eca5392a2a6914d08cd876ebb8 -Size (xpp-1.0.tar.gz) = 75420 bytes +SHA1 (xpp-1.1.tar.gz) = 0f9b54690d38e9a7ec810213c9cdc3d6ea71480d +Size (xpp-1.1.tar.gz) = 72611 bytes SHA1 (patch-aa) = 7658afc3b1f2bff134f648aebf2ba26f2f7a8a29 -SHA1 (patch-ab) = 2168a159c0c245384e9c986596a2f2d64d70a2f3 +SHA1 (patch-ab) = 6bb5cb292f5ac24b461b86fc8707595ba99094ef diff --git a/print/xpp/patches/patch-ab b/print/xpp/patches/patch-ab index 446af99677c..e03702ca4e3 100644 --- a/print/xpp/patches/patch-ab +++ b/print/xpp/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2002/09/18 23:55:52 jlam Exp $ ---- configure.orig Fri Jan 26 19:17:37 2001 +--- configure.orig Wed Jan 9 06:31:49 2002 +++ configure -@@ -2126,8 +2126,51 @@ +@@ -2084,8 +2084,51 @@ else echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -+echo "configure:2131: checking for main in -lm" >&5 ++echo "configure:2089: checking for main in -lm" >&5 +ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -15,14 +15,14 @@ $NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -50,12 +50,12 @@ $NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ +fi + echo $ac_n "checking for main in -lGL""... $ac_c" 1>&6 --echo "configure:2131: checking for main in -lGL" >&5 -+echo "configure:2174: checking for main in -lGL" >&5 +-echo "configure:2089: checking for main in -lGL" >&5 ++echo "configure:2132: checking for main in -lGL" >&5 ac_lib_var=`echo GL'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2280,49 +2323,6 @@ +@@ -2238,49 +2281,6 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="$LIBFLTKA $LIBS" @@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ -fi - -echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 --echo "configure:2289: checking for main in -lm" >&5 +-echo "configure:2247: checking for main in -lm" >&5 -ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 @@ -72,14 +72,14 @@ $NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ - ac_save_LIBS="$LIBS" -LIBS="-lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else -- cgit v1.2.3