ports/60064: [maintainer] Update graphics/hpoj to 0.91

[Volker Stolz]

>Number:         60064
>Category:       ports
>Synopsis:       [maintainer] Update graphics/hpoj to 0.91
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 09 02:20:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Volker Stolz
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #12: Mon Dec 8 15:14:27 CET 2003 root at menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386


>Description:
Update to 0.91, including:
 - libusb support
 - CUPS support
>How-To-Repeat:
>Fix:
--- hpoj begins here ---
diff -urN /usr/ports/graphics/hpoj/Makefile hpoj/Makefile
--- /usr/ports/graphics/hpoj/Makefile	Tue Jul 15 16:10:48 2003
+++ hpoj/Makefile	Tue Dec  9 11:00:40 2003
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	hpoj
-PORTVERSION=	0.90
-PORTREVISION=	1
+PORTVERSION=	0.91
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hpoj
@@ -18,9 +17,22 @@
 COMMENT=	"HP OfficeJet Linux driver; printing, scanning, and photo-card access"
 
 LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends \
-		snmp.4:${PORTSDIR}/net/net-snmp4
+		snmp.4:${PORTSDIR}/net/net-snmp4 \
+		usb:${PORTSDIR}/devel/libusb
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
+.if !defined(WITHOUT_CUPS)
+WITH_CUPS=	yes
+.endif
+
+.if defined(WITH_CUPS)
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=--with-cups-backend=${LOCALBASE}/libexec/cups/backend
+PLIST_SUB+=	CUPS=""
+.else
+PLIST_SUB+=	CUPS="@comment "
+.endif
+
 INSTALLS_SHLIB=	yes
 
 USE_REINPLACE=	yes
@@ -53,12 +65,14 @@
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -lcipher -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .ifdef(WITHOUT_X11)
-CONFIGURE_ARGS=	--without-qt
+CONFIGURE_ARGS+=	--without-qt
 .endif
 
 pre-fetch:
 	@${ECHO} You can disable building \'xojpanel\' and avoid the dependency on X11 and QT3 \
 		by restarting the build with WITHOUT_X11
+	@${ECHO} You can disable CUPS support with WITHOUT_CUPS
+
 post-patch:
 .for f in doc/info-devname.html doc/libptal.html doc/ptal-init.html doc/setup-photo-details.html \
 	 doc/setup-print-details.html lib/ptal/ptal.c scripts/ptal-init.in
diff -urN /usr/ports/graphics/hpoj/distinfo hpoj/distinfo
--- /usr/ports/graphics/hpoj/distinfo	Thu Jan 30 14:50:15 2003
+++ hpoj/distinfo	Tue Dec  9 10:31:29 2003
@@ -1 +1 @@
-MD5 (hpoj-0.90.tgz) = dd76385c20bccabf6f5446b1004d8372
+MD5 (hpoj-0.91.tgz) = 0e083aeab9b00495aa433fa9465456e0
diff -urN /usr/ports/graphics/hpoj/pkg-descr hpoj/pkg-descr
--- /usr/ports/graphics/hpoj/pkg-descr	Tue Feb  4 10:10:00 2003
+++ hpoj/pkg-descr	Tue Dec  9 11:05:24 2003
@@ -3,8 +3,6 @@
 PSC, LaserJet, and PhotoSmart printer multi-function
 peripherals (MFPs), which depending on the model can print,
 scan, copy, fax, and/or access digital camera memory cards.
-Only the parallel port and JetDirect (no USB!) are supported
-under FreeBSD.
 
 Includes a xsane plugin.
 
diff -urN /usr/ports/graphics/hpoj/pkg-plist hpoj/pkg-plist
--- /usr/ports/graphics/hpoj/pkg-plist	Tue May 20 09:41:02 2003
+++ hpoj/pkg-plist	Tue Dec  9 10:47:00 2003
@@ -20,6 +20,7 @@
 include/hpojip.h
 include/ptal.h
 etc/rc.d/ptal-init.sh.sample
+%%CUPS%%libexec/cups/backend/ptal
 %%PORTDOCS%%share/doc/hpoj/COPYING
 %%PORTDOCS%%share/doc/hpoj/LICENSE
 %%PORTDOCS%%share/doc/hpoj/LICENSE.OpenSSL
--- hpoj ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: