This update to print/xpp builds the 1.5 release. New in this release

are custom paper sizes, n-up printing selections, page borders, jpeg
and png previewing, job control options, and extended option types
to support foomatic and fax4CUPS.

A repeatable SEGV is fixed (patch also sent to xpp maintainer).

Closes PR pkg/32930

Reviewed by <bouyer>

6 files changed, 45 insertions, 157 deletions

diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 07f27035cc0..924d7f793f5 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/05/07 01:47:00 chap Exp $
 
-DISTNAME=	xpp-1.1
-PKGREVISION=	7
+DISTNAME=	xpp-1.5
 CATEGORIES=	print x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cups/}
 
diff --git a/print/xpp/PLIST b/print/xpp/PLIST
index d6282f812ba..4d41fc26f05 100644
--- a/print/xpp/PLIST
+++ b/print/xpp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/07 01:47:00 chap Exp $
 bin/xpp
 share/doc/xpp/LICENSE
 share/doc/xpp/README
diff --git a/print/xpp/distinfo b/print/xpp/distinfo
index f9f55d1b490..dff713e0e1d 100644
--- a/print/xpp/distinfo
+++ b/print/xpp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:51:46 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/05/07 01:47:00 chap Exp $
 
-SHA1 (xpp-1.1.tar.gz) = 0f9b54690d38e9a7ec810213c9cdc3d6ea71480d
-RMD160 (xpp-1.1.tar.gz) = cd019f2e035656db346bc1bf420d87616700508e
-Size (xpp-1.1.tar.gz) = 72611 bytes
-SHA1 (patch-aa) = 7658afc3b1f2bff134f648aebf2ba26f2f7a8a29
-SHA1 (patch-ab) = 6bb5cb292f5ac24b461b86fc8707595ba99094ef
-SHA1 (patch-ac) = a484ba121ca489bb8cfd45b4b993e8bd58c9e083
+SHA1 (xpp-1.5.tar.gz) = 7f3c1427979516e47402a0acb708eb83b68daa61
+RMD160 (xpp-1.5.tar.gz) = a64ec4c93013d1db08a6c9b6705b43850c36c337
+Size (xpp-1.5.tar.gz) = 107755 bytes
+SHA1 (patch-aa) = f8df413715f4f9319f8d52358a99e54d31cd5a6f
+SHA1 (patch-ab) = 76d0ca39bef410e580f805ca10a3d953285c58bb
+SHA1 (patch-ac) = d94f9359d19de5dff684f61a53af4607bb31f78c
diff --git a/print/xpp/patches/patch-aa b/print/xpp/patches/patch-aa
index adf0159747d..54d5ef370fe 100644
--- a/print/xpp/patches/patch-aa
+++ b/print/xpp/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2001/01/30 16:37:57 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/07 01:47:00 chap Exp $
 
---- configure.in.orig	Fri Jan 26 19:17:37 2001
-+++ configure.in
-@@ -37,6 +37,8 @@
- AC_CHECK_LIB(Xext, main,,,$LIBS)
- dnl Replace `main' with a function in -lcups:
- dnl AC_CHECK_LIB(cups, main)
-+dnl Replace `main' with a function in -lm:
-+AC_CHECK_LIB(m, main)
- dnl Replace `main' with a function in -lGL:
- AC_CHECK_LIB(GL, main)
- dnl Replace `main' with a function in -lGLU:
-@@ -47,8 +49,6 @@
- AC_CHECK_LIB(fltk, main,LIBS="$LIBFLTKA $LIBS",,$LIBS)
- dnl Replace `main' with a function in -lfltk:
- dnl AC_CHECK_LIB(fltk, main,,,$LIBS)
--dnl Replace `main' with a function in -lm:
--AC_CHECK_LIB(m, main)
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(cups/cups.h FL/Fl.H)
+--- mainwindow.fl.orig	2006-02-25 17:02:37.000000000 -0500
++++ mainwindow.fl
+@@ -18,6 +18,8 @@ class xppMainWindow {open
+   Function {xppMainWindow(int  argc, char *argv[], int &exitstat)} {open
+   } {
+     code {exitstat = 0;
++optionDialog=NULL;
++instanceDialog=NULL;
+ print=new printFiles(argc,argv,exitstat);
+ if (exitstat != 0) return;} {}
+     Fl_Window mainWindow {
diff --git a/print/xpp/patches/patch-ab b/print/xpp/patches/patch-ab
index e03702ca4e3..c75f2475dd9 100644
--- a/print/xpp/patches/patch-ab
+++ b/print/xpp/patches/patch-ab
@@ -1,107 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/09/18 23:55:52 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2006/05/07 01:47:00 chap Exp $
 
---- configure.orig	Wed Jan  9 06:31:49 2002
-+++ configure
-@@ -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: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
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lm  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2097 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+main()
-+; return 0; }
-+EOF
-+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
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
-+EOF
-+
-+  LIBS="-lm $LIBS"
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
- echo $ac_n "checking for main in -lGL""... $ac_c" 1>&6
--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
-@@ -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"
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--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
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lm  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2255 "configure"
--#include "confdefs.h"
--
--int main() {
--main()
--; return 0; }
--EOF
--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
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
--  LIBS="-lm $LIBS"
--
- else
-   echo "$ac_t""no" 1>&6
- fi
+--- configure.orig	2006-03-03 12:54:12.000000000 +0100
++++ configure	2006-03-03 12:55:35.000000000 +0100
+@@ -2765,7 +2765,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH:/usr/sbin:/sbin:/usr/local/sbin"
++  ac_dummy="$PATH:/usr/sbin:/sbin:/usr/local/sbin:$prefix/sbin"
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
diff --git a/print/xpp/patches/patch-ac b/print/xpp/patches/patch-ac
index 8decae9903e..f1d3bb5df82 100644
--- a/print/xpp/patches/patch-ac
+++ b/print/xpp/patches/patch-ac
@@ -1,21 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/01/10 09:26:33 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2006/05/07 01:47:00 chap Exp $
 
---- cupshelper.cxx.orig	Wed Jan  9 08:34:17 2002
-+++ cupshelper.cxx
-@@ -67,14 +67,14 @@ int CupsHelper::port(){
- 	return port_;
- }
+--- configure.in.orig	2006-03-03 12:54:21.000000000 +0100
++++ configure.in	2006-03-03 12:56:12.000000000 +0100
+@@ -103,7 +103,7 @@
+ AC_CHECK_LIB(cups,httpConnect)
  
--void CupsHelper::setHostInfo(const char *host, int port = 631){
-+void CupsHelper::setHostInfo(const char *host, int port){
- 	strcpy(host_,host);
- 	cupsSetServer(host_);
- 	port_ = port;
- 	ippSetPort(port_);
- }
- 
--void CupsHelper::setLoginInfo(const char *usr = 0, const char *pwd = 0){
-+void CupsHelper::setLoginInfo(const char *usr, const char *pwd){
- 	strcpy(login_,usr);
- 	cupsSetUser(login_);
- 	strcpy(password_,pwd);
+ dnl Check for CUPSD
+-AC_PATH_PROG(CUPSD,cupsd,,$PATH:/usr/sbin:/sbin:/usr/local/sbin)
++AC_PATH_PROG(CUPSD,cupsd,,$PATH:/usr/sbin:/sbin:/usr/local/sbin:$prefix/sbin)
+ if test "$CUPSD" = ""; then
+         AC_MSG_ERROR(CUPS daemon not found, please install CUPS package (http://www.cups.org).)
+ fi