Update xpp to 1.0. Changes from version 0.7:

   - Let jobs from standard input get the name "STDIN" instead of
     "(stdin)", because the parantheses caused problems with Samba
     or Windows servers.
   - Let the first printer be selected when CUPS does not report a
     default printer
   - Banner page support
   - Raw output support
   - Renamed "Cancel" button of main window to "Close"
   - Added comment in "Instances" to tell the user that he has to
     copy an existing instance of the desired printer when he wants
     to add an instance.
   - Support for adding, copying, renaming, and deleting printer
     instances.
   - Rearranged option widgets for media settings on the "Basic" tab
     of the "Options" dialog: Now there is a seperate widget for the
     media type and widgets for options which are not supported
     according to the PPD file are grayed out.
   - Fixed bug of the duplex widget on the "Basic" tab of the
     "Options" dialog: The widget was sometimes linked to the
     "Duplexer installed?" option.
   - All sliders for numerical options (both CUPS and CUPS-O-MATIC)
     have fields for typing the values now.

3 files changed, 32 insertions, 6 deletions

diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index fe8a9c5f170..97af83f51b9 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2001/01/25 15:57:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/30 16:37:55 jlam Exp $
 
-DISTNAME=	xpp-0.7
+DISTNAME=	xpp-1.0
 CATEGORIES=	print x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cups/}
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://cups.sourceforge.net/xpp/index.html
 
+BUILD_DEPENDS+=	autoconf:../../devel/autoconf
 DEPENDS+=	cups>=1.1.1:../../print/cups
 DEPENDS+=	fltk>=1.0.9:../../x11/fltk
 
@@ -15,13 +16,16 @@ USE_X11=	# defined
 USE_GMAKE=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+=	LIBS="${LIBS}"
 
+EVAL_PREFIX+=	FLTKDIR=fltk
+CPPFLAGS+=	-I${FLTKDIR}/include		# FL/Fl.h
 CPPFLAGS+=	-I${LOCALBASE}/include		# cups/cups.h
-LIBS+=		-lGL -lm			# -lfltk
 
 DOCDIR=		${PREFIX}/share/doc/xpp
 
+pre-configure:
+	cd ${WRKSRC} && autoconf && touch aclocal.m4 Makefile.in
+
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR}
diff --git a/print/xpp/files/md5 b/print/xpp/files/md5
index d13587f167a..3e61d7117ac 100644
--- a/print/xpp/files/md5
+++ b/print/xpp/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/08 16:36:24 jlam Exp $
+$NetBSD: md5,v 1.2 2001/01/30 16:37:56 jlam Exp $
 
-MD5 (xpp-0.7.tar.gz) = 4a959f60c0807901b5ac236d5b372ff5
+MD5 (xpp-1.0.tar.gz) = fc2649b2db29a3ae4bec6842ccd8e268
diff --git a/print/xpp/patches/patch-aa b/print/xpp/patches/patch-aa
new file mode 100644
index 00000000000..adf0159747d
--- /dev/null
+++ b/print/xpp/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2001/01/30 16:37:57 jlam 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)