graphics/hpoj has expired: project discontinued, please switch to print/hplip

14 files changed, 1 insertions, 368 deletions

diff --git a/MOVED b/MOVED
index 74d42fc85064..516c33f684bd 100644
--- a/MOVED
+++ b/MOVED
@@ -3100,3 +3100,4 @@ www/lynx-ssl|www/lynx|2007-07-10|SSL enabled by default in www/lynx
 net-p2p/py-bittorrent-devel|net-p2p/py-bittorent|2007-07-10|Non-devel port have newer version
 net-p2p/py-bittorrent-core-devel|net-p2p/py-bittorent-core|2007-07-10|Non-devel port have newer version
 devel/libslang2-devel||2007-07-11|Non-devel port have newer version
+graphics/hpoj||2007-07-14|Expired: project discontinued, please switch to print/hplip
diff --git a/graphics/Makefile b/graphics/Makefile
index cc6c5d825153..901c3e201cee 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -252,7 +252,6 @@
     SUBDIR += gwenview
     SUBDIR += gx
     SUBDIR += hobbes-icons-xpm
-    SUBDIR += hpoj
     SUBDIR += hppsmtools
     SUBDIR += hs-hgl
     SUBDIR += hsetroot
diff --git a/graphics/hpoj/Makefile b/graphics/hpoj/Makefile
deleted file mode 100644
index 86c60b483f1b..000000000000
--- a/graphics/hpoj/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	hpoj
-# Date created:			2003-01-30
-# Whom:				Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hpoj
-PORTVERSION=	0.91
-PORTREVISION=	7
-CATEGORIES=	graphics print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hpoj
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	vs@FreeBSD.org
-COMMENT=	HP OfficeJet Linux driver; printing, scanning, and photo-card access
-
-NOT_FOR_ARCHS=	sparc64 ia64
-
-DEPRECATED=	the project is no longer being developed, all future MFP support is being done by the HPLIP project (print/hplip)
-EXPIRATION_DATE=2007-07-01
-
-LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends \
-		usb:${PORTSDIR}/devel/libusb
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
-OPTIONS=	CUPS "CUPS support" on \
-		SNMP "SNMP support (required for JetDirect)" on
-
-.if defined(WITH_X11)
-USE_QT_VER=	3
-USE_XLIB=	yes
-PLIST_SUB+=	X11=""
-.else
-PLIST_SUB+=	X11="@comment "
-CONFIGURE_ARGS+=--without-qt
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_CUPS)
-WITH_CUPS=	yes
-.endif
-
-.if !defined(WITHOUT_SNMP)
-WITH_SNMP=	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
-CONFIGURE_ARGS+=--without-cups
-PLIST_SUB+=	CUPS="@comment "
-.endif
-
-.if defined(WITH_SNMP)
-LIB_DEPENDS+=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}/include/net-snmp/library
-.else
-CONFIGURE_ARGS+=--without-snmp
-.endif
-
-USE_LDCONFIG=	yes
-
-USE_GMAKE=	yes
-USE_PERL5=	yes
-
-.if ${ARCH} == "alpha"
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-mlcd-Makefile.in \
-		${FILESDIR}/extra-patch-mlcd-ParPort.h
-.endif
-
-GNU_CONFIGURE=	yes
-# Necessary hacks to find libsnmp:
-.if ${OSVERSION} < 501000
-EXTRALDFLAGS=   -lcipher
-.endif
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${EXTRALDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-pre-everything::
-.if !defined(WITH_X11)
-	@${ECHO} "You can enable building of xojpanel (QT) through -DWITH_X11"
-.endif
-
-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
-	@${REINPLACE_CMD} -e 's,/etc/ptal,${PREFIX}/etc/ptal,'  ${WRKSRC}/${f}
-.endfor
-	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/scripts/ptal-init.in
-	@${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/scripts/ptal-init.in ${WRKSRC}/scripts/ptal-cups.in
-.for f in lib/ptal lib/sane lib/hpojip
-	@${REINPLACE_CMD} -e 's,CFLAGS=-O,CFLAGS+= @CFLAGS@,' ${WRKSRC}/${f}/Makefile.in
-.endfor
-
-pre-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/ptal-init ${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/ptal-cups ${PREFIX}/sbin
-
-post-install:
-.ifdef(WITH_X11)
-	@${INSTALL_PROGRAM} ${WRKSRC}/apps/xojpanel/xojpanel ${X11BASE}/bin
-.endif
-	@${MV} ${PREFIX}/etc/rc.d/ptal-init.sh ${PREFIX}/etc/rc.d/020.ptal-init.sh.sample
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message
-
-.include <bsd.port.post.mk>
diff --git a/graphics/hpoj/distinfo b/graphics/hpoj/distinfo
deleted file mode 100644
index 7a141b14a81b..000000000000
--- a/graphics/hpoj/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (hpoj-0.91.tgz) = 0e083aeab9b00495aa433fa9465456e0
-SHA256 (hpoj-0.91.tgz) = 4ddfc13e22bca7847f4f86f413fd258b1ee2f0642bc8972eeb5ff2d564235bf6
-SIZE (hpoj-0.91.tgz) = 542475
diff --git a/graphics/hpoj/files/extra-patch-mlcd-Makefile.in b/graphics/hpoj/files/extra-patch-mlcd-Makefile.in
deleted file mode 100644
index 8a8832a72373..000000000000
--- a/graphics/hpoj/files/extra-patch-mlcd-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mlcd/Makefile.in.orig	Sat Dec 20 19:36:00 2003
-+++ mlcd/Makefile.in	Sat Dec 20 19:36:10 2003
-@@ -31,7 +31,7 @@
- all:		$(GOAL)
- 
- $(GOAL):	$(OBJS)
--		$(CXX) $(LFLAGS) -o $(GOAL) $(OBJS)
-+		$(CXX) $(LFLAGS) -lio -o $(GOAL) $(OBJS)
- 
- clean:
- 		rm -f $(OBJS) $(GOAL)
diff --git a/graphics/hpoj/files/extra-patch-mlcd-ParPort.h b/graphics/hpoj/files/extra-patch-mlcd-ParPort.h
deleted file mode 100644
index ae352910e700..000000000000
--- a/graphics/hpoj/files/extra-patch-mlcd-ParPort.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- mlcd/ParPort.h.orig	Sat May 24 08:02:19 2003
-+++ mlcd/ParPort.h	Sat May 24 07:59:13 2003
-@@ -27,6 +27,11 @@
- 
- #define ERROR_NO_DATA ERROR	/* TODO: Remove. */
- 
-+extern "C" {
-+extern u_char inb (u_int port);
-+extern void outb(u_int port, u_char data);
-+}
-+
- class ParPort {
-     protected:		// ATTRIB
- 	int portType;
diff --git a/graphics/hpoj/files/patch-Makefile.in b/graphics/hpoj/files/patch-Makefile.in
deleted file mode 100644
index 5a16fff1befe..000000000000
--- a/graphics/hpoj/files/patch-Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -5,6 +5,9 @@
- SUBDIRS=@SUBDIRS@
- DISTCLEANS=Makefile config.cache config.log config.status scripts/ptal-init
- 
-+CFLAGS+= @CFLAGS@
-+LDFLAGS+= @LDFLAGS@
-+
- all:	check_generated just_compile
- 
- check_generated:
-@@ -71,7 +74,7 @@
- sbindir_program=@sbindir_program@
- 
- libdir=@libdir@
--libdir_program=lib/hpojip/libhpojip.so.*.* lib/ptal/libptal.so.*.* lib/sane/libsane-hpoj.so.*.*
-+libdir_program=lib/hpojip/libhpojip.so.[0-9] lib/ptal/libptal.so.[0-9] lib/sane/libsane-hpoj.so.[0-9]
- 
- includedir=@includedir@
- includedir_data=@includedir_data@
-@@ -101,9 +104,9 @@
- 	@ cd lib ; \
- 	  for comp in hpojip ptal sane ; do \
- 	  	cd $$comp ; \
--			for file in lib$$comp* ; do \
-+			for file in lib$$comp*.so ; do \
- 				if test -L $$file ; then \
--					$(LN_S) -f lib$$comp*.so.*.* $(libdir)/$$file ; \
-+					$(LN_S) -f lib$$comp*.so.[0-9] $(libdir)/$$file ; \
- 				fi ; \
- 			done ; \
- 		cd .. ; \
-@@ -133,8 +136,8 @@
- 					echo "Refer to setup-build-details.html for instructions on manually"; \
- 					echo "setting ptal-init to start at bootup."; \
- 				else \
--					echo "Setting /usr/local/etc/rc.d/ptal-init.sh symlink." ; \
--					$(LN_S) -f $(sbindir)/ptal-init /usr/local/etc/rc.d/ptal-init.sh ; \
-+					echo "Setting $(PREFIX)/etc/rc.d/ptal-init.sh symlink." ; \
-+					$(LN_S) -f $(sbindir)/ptal-init $(PREFIX)/etc/rc.d/ptal-init.sh ; \
- 				fi ; \
- 			elif test -d $$dir ; then \
- 				echo "Setting $$dir/ptal-init symlink." ; \
-@@ -164,11 +167,6 @@
- 			fi ; \
- 		fi ; \
- 		echo ; \
--		if ! grep $(libdir) /etc/ld.so.conf >/dev/null 2>/dev/null ; then \
--			echo "Adding $(libdir) to /etc/ld.so.conf." ; \
--			echo $(libdir) >>/etc/ld.so.conf ; \
--		fi ; \
--		ldconfig ; \
- 	else \
- 		if ! test -d /etc/profile.d || ! test -f /etc/profile.d/hpoj.sh || ! test -f /etc/profile.d/hpoj.csh ; then \
- 			echo "You may need to add $(bindir) and $(sbindir) to your PATH." ; \
-@@ -193,11 +191,6 @@
- 		fi ; \
- 	fi
- 	@ echo
--	@ for file in /bin/bash /usr/bin/perl ; do \
--		if ! test -x $$file ; then \
--			echo "As root, please install and/or create a symlink to \"$$file\"." ; \
--		fi ; \
--	done
- 	@ echo
- 	@ for file in bin/hpo bin/ieee12844_print bin/ptal-printd bin/addpjl lib/ieee12844.o lib/ieee12844pp.o etc/ptal-start.conf etc/ptal-start.conf.new etc/ptal-stop.conf etc/ptal-stop.conf.new share/pixmaps/hpoj doc/hpoj ; do \
- 		if test -f $(prefix)/$$file ; then \
diff --git a/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in b/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in
deleted file mode 100644
index a130bae2af30..000000000000
--- a/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/cmdline/Makefile.in.bak	Fri Jun 14 03:49:49 2002
-+++ apps/cmdline/Makefile.in	Fri Jul  4 09:40:18 2003
-@@ -5,7 +5,7 @@
- DISTCLEANS=Makefile
- INCLUDES=Makefile ../../include/ptal.h ../../include/hpojip.h
- 
--CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
-+CFLAGS+= @CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @LIBSNMP_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
- 
- all:		$(GOALS)
- 
diff --git a/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in b/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in
deleted file mode 100644
index 18ad3199542f..000000000000
--- a/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- apps/xojpanel/Makefile.in.orig	Thu Jun 13 02:40:44 2002
-+++ apps/xojpanel/Makefile.in	Tue Feb  4 09:58:29 2003
-@@ -2,8 +2,8 @@
- 
- MOC=@QT_MOC@
- 
--LFLAGS = @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ -lptal
--CFLAGS = -O -Wall -g -I/usr/X11R6/include @INCLUDE_CMDLINE@
-+LFLAGS += @LDFLAGS@ @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ @LIBSNMP_CMDLINE@ -lptal
-+CFLAGS += @CFLAGS@ -Wall -g @INCLUDE_CMDLINE@
- 
- PIXMAPS = hpojlcd.xpm hpoj_lcdmon.xpm hpoj_mini.xpm
- COMMON_HEADERS = Makefile xojpanel.h
diff --git a/graphics/hpoj/files/patch-configure b/graphics/hpoj/files/patch-configure
deleted file mode 100644
index 80a2a94879df..000000000000
--- a/graphics/hpoj/files/patch-configure
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.orig	Mon Nov  3 11:20:29 2003
-+++ configure	Thu Feb 17 10:04:29 2005
-@@ -1228,7 +1228,7 @@
- # Set up default make subdirectory and install file lists.
- SUBDIRS="lib/hpojip lib/ptal lib/sane mlcd apps/cmdline"
- bindir_program="apps/cmdline/ptal-connect apps/cmdline/ptal-device apps/cmdline/ptal-devid apps/cmdline/ptal-pml apps/cmdline/ptal-hp apps/cmdline/hpojip-test"
--sbindir_program="mlcd/ptal-mlcd apps/cmdline/ptal-printd apps/cmdline/ptal-photod scripts/ptal-init scripts/ptal-cups"
-+sbindir_program="mlcd/ptal-mlcd apps/cmdline/ptal-printd apps/cmdline/ptal-photod"
- includedir_data="include/hpojip.h include/ptal.h"
- 
- # Select compilers and utilities.
-@@ -2958,15 +2958,15 @@
- echo "${ECHO_T}$dir" >&6
- 
- 	    for lflagDir in "" "-L$dir/../lib" "-L$dir/../../lib" ; do
--	      for lflagCrypto in "" "-lcrypto" ; do
-+	      for lflagCrypto in "" "-lcrypto" "-lcrypto -ldes" ; do
- 		unset ac_cv_lib_snmp_snmp_open
--		echo "$as_me:$LINENO: checking for snmp_open in -lsnmp" >&5
--echo $ECHO_N "checking for snmp_open in -lsnmp... $ECHO_C" >&6
-+		echo "$as_me:$LINENO: checking for snmp_open in -lnetsnmp" >&5
-+echo $ECHO_N "checking for snmp_open in -lnetsnmp... $ECHO_C" >&6
- if test "${ac_cv_lib_snmp_snmp_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsnmp $lflagDir $lflagCrypto $LIBS"
-+LIBS="-lnetsnmp $lflagDir $lflagCrypto $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -3018,7 +3018,7 @@
- if test $ac_cv_lib_snmp_snmp_open = yes; then
-   DEFINES_CMDLINE="$DEFINES_CMDLINE -DHAVE_SNMP"
- 			 INCLUDE_PATH=$INCLUDE_PATH:$dir
--			 LIBSNMP_CMDLINE="$lflagDir -lsnmp $lflagCrypto"
-+			 LIBSNMP_CMDLINE="$lflagDir -lnetsnmp $lflagCrypto"
- 			 break 2
- 
- fi
-@@ -3293,7 +3293,6 @@
- 	if test -n "$QT_MOC" -a -n "$QT_INCLUDE_PATH" -a -n "$LIBQT_CMDLINE" ; then
- 		QT_PATH=$dir
- 		SUBDIRS="$SUBDIRS apps/xojpanel"
--		bindir_program="$bindir_program apps/xojpanel/xojpanel"
- 		INCLUDE_PATH=$INCLUDE_PATH:$QT_INCLUDE_PATH
- 		LIBRARY_PATH=$LIBRARY_PATH:$QT_PATH/lib
- 		break
diff --git a/graphics/hpoj/files/patch-mlcd-ParPort.h b/graphics/hpoj/files/patch-mlcd-ParPort.h
deleted file mode 100644
index 8d6eb41a4ce0..000000000000
--- a/graphics/hpoj/files/patch-mlcd-ParPort.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- mlcd/ParPort.h.orig	Tue Mar 30 18:42:02 2004
-+++ mlcd/ParPort.h	Tue Mar 30 18:51:23 2004
-@@ -32,6 +32,10 @@
- 	#include <unistd.h>
- 	#include <fcntl.h>
-     extern "C" {
-+	#undef fls
-+	#define fls iamdirtybutloved
-+	#undef ffs__ParPort
-+	#define ffs__ParPort iamdirtybutfancied
- 	#include <machine/cpufunc.h>
-     }
- #else
diff --git a/graphics/hpoj/pkg-descr b/graphics/hpoj/pkg-descr
deleted file mode 100644
index 30df50301e79..000000000000
--- a/graphics/hpoj/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is the FreeBSD port of the HP-sponsored project to
-develop Linux support for most Hewlett-Packard OfficeJet,
-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.
-
-Includes a xsane plugin.
-
-WWW: http://hpoj.sourceforge.net/
diff --git a/graphics/hpoj/pkg-message b/graphics/hpoj/pkg-message
deleted file mode 100644
index eebeef64c1ed..000000000000
--- a/graphics/hpoj/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-*****************************************************************
-You should now run '%%PREFIX%%/sbin/ptal-init setup' as root
-to configure your HP OfficeJet devices.
-*****************************************************************
diff --git a/graphics/hpoj/pkg-plist b/graphics/hpoj/pkg-plist
deleted file mode 100644
index 66106775cf48..000000000000
--- a/graphics/hpoj/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/ptal-connect
-bin/ptal-device
-bin/ptal-devid
-bin/ptal-pml
-bin/ptal-print
-bin/ptal-hp
-bin/hpojip-test
-sbin/ptal-mlcd
-sbin/ptal-printd
-sbin/ptal-photod
-sbin/ptal-init
-sbin/ptal-cups
-lib/libhpojip.so
-lib/libhpojip.so.0
-lib/libptal.so
-lib/libptal.so.0
-lib/libsane-hpoj.so
-lib/libsane-hpoj.so.1
-lib/sane/libsane-hpoj.so.1
-include/hpojip.h
-include/ptal.h
-etc/rc.d/020.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
-%%PORTDOCS%%share/doc/hpoj/README
-%%PORTDOCS%%share/doc/hpoj/index.html
-%%PORTDOCS%%share/doc/hpoj/info-devname.html
-%%PORTDOCS%%share/doc/hpoj/info-pml-objects.html
-%%PORTDOCS%%share/doc/hpoj/info-protocols.html
-%%PORTDOCS%%share/doc/hpoj/libptal.html
-%%PORTDOCS%%share/doc/hpoj/libsane-hpoj.html
-%%PORTDOCS%%share/doc/hpoj/ptal-connect.html
-%%PORTDOCS%%share/doc/hpoj/ptal-device.html
-%%PORTDOCS%%share/doc/hpoj/ptal-devid.html
-%%PORTDOCS%%share/doc/hpoj/ptal-hp.html
-%%PORTDOCS%%share/doc/hpoj/ptal-init.html
-%%PORTDOCS%%share/doc/hpoj/ptal-mlcd.html
-%%PORTDOCS%%share/doc/hpoj/ptal-photod.html
-%%PORTDOCS%%share/doc/hpoj/ptal-pml.html
-%%PORTDOCS%%share/doc/hpoj/ptal-printd.html
-%%PORTDOCS%%share/doc/hpoj/setup-build-details.html
-%%PORTDOCS%%share/doc/hpoj/setup-build.html
-%%PORTDOCS%%share/doc/hpoj/setup-connect-details.html
-%%PORTDOCS%%share/doc/hpoj/setup-connect.html
-%%PORTDOCS%%share/doc/hpoj/setup-photo-details.html
-%%PORTDOCS%%share/doc/hpoj/setup-photo.html
-%%PORTDOCS%%share/doc/hpoj/setup-print-details.html
-%%PORTDOCS%%share/doc/hpoj/setup-print.html
-%%PORTDOCS%%share/doc/hpoj/setup-scan-details.html
-%%PORTDOCS%%share/doc/hpoj/setup-scan.html
-%%PORTDOCS%%share/doc/hpoj/xojpanel.html
-%%PORTDOCS%%@dirrm share/doc/hpoj
-%%X11%%@cwd %%X11BASE%%
-%%X11%%bin/xojpanel
-@exec /bin/echo >>%D/etc/sane.d/dll.conf hpoj
-@unexec /usr/bin/sed -i '' -e '/^hpoj$/d' %D/etc/sane.d/dll.conf