7 files changed, 0 insertions, 181 deletions
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