aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1998-10-12 04:25:34 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1998-10-12 04:25:34 +0000
commit65cf9d05d7f549e22d7c65dadac2a2eb77fc09d4 (patch)
tree017946890c189fb498904d3a2ba78a26b35deca9 /graphics
parent6b1e39b5fde17434ef3ce33fbe2538be83df2f3d (diff)
downloadports-65cf9d05d7f549e22d7c65dadac2a2eb77fc09d4.tar.gz
ports-65cf9d05d7f549e22d7c65dadac2a2eb77fc09d4.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/hpscan/Makefile8
-rw-r--r--graphics/hpscan/files/Imakefile20
-rw-r--r--graphics/hpscan/files/patch-ad32
-rw-r--r--graphics/hpscan/files/patch-ae9
-rw-r--r--graphics/hpscan/files/patch-af75
-rw-r--r--graphics/hpscan/files/patch-ah20
6 files changed, 116 insertions, 48 deletions
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index ff3b1a26f36e..f4962a06a0a0 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -16,14 +16,12 @@ MAINTAINER= jkh@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-OSVERSION!= sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN= scsi.h
-.endif
-
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
+pre-configure:
+ ${CP} -f ${FILESDIR}/Imakefile ${WRKSRC}
+
.include <bsd.port.mk>
diff --git a/graphics/hpscan/files/Imakefile b/graphics/hpscan/files/Imakefile
new file mode 100644
index 000000000000..a1f49e6fe5c4
--- /dev/null
+++ b/graphics/hpscan/files/Imakefile
@@ -0,0 +1,20 @@
+XCOMM
+XCOMM Imakefile for Richard Tobin's HP scanner utility,
+XCOMM written by Jörg Wunsch, 96/01/12.
+XCOMM
+
+#if OSMajorVersion < 3
+ EXTRA_INCLUDES = -I/sys -I/usr/local/include
+#else
+ EXTRA_INCLUDES = -I/usr/include/cam -I/sys -I/usr/local/include
+#endif
+ EXTRA_DEFINES = -DJPEG
+ DEPLIBS = XawClientDepLibs /usr/local/lib/libjpeg.a
+LOCAL_LIBRARIES = XawClientLibs MathLibrary -L/usr/local/lib -ljpeg
+
+ SRCS = main.c scsi.c scanner.c scl.c gui.c colour.c Plain.c
+ OBJS = main.o scsi.o scanner.o scl.o gui.o colour.o Plain.o
+
+ComplexProgramTarget(hpscan)
+InstallAppDefaults(HPscan)
+InstallAppDefaultsLong(HPscan-co,HPscan-color)
diff --git a/graphics/hpscan/files/patch-ad b/graphics/hpscan/files/patch-ad
index f933508eaf2c..69a9d4be7687 100644
--- a/graphics/hpscan/files/patch-ad
+++ b/graphics/hpscan/files/patch-ad
@@ -1,17 +1,15 @@
---- /dev/null Sat Jan 13 17:05:14 1996
-+++ Imakefile Fri Jan 12 17:49:11 1996
-@@ -0,0 +1,14 @@
-+XCOMM
-+XCOMM Imakefile for Richard Tobin's HP scanner utility,
-+XCOMM written by Jörg Wunsch, 96/01/12.
-+XCOMM
-+
-+ EXTRA_INCLUDES = -I/sys
-+
-+ DEPLIBS = XawClientDepLibs
-+LOCAL_LIBRARIES = XawClientLibs MathLibrary
-+
-+ SRCS = main.c scsi.c scanner.c scl.c gui.c colour.c Plain.c
-+ OBJS = main.o scsi.o scanner.o scl.o gui.o colour.o Plain.o
-+
-+ComplexProgramTarget(hpscan)
+--- scsi.h.orig Sun Oct 11 21:30:07 1998
++++ scsi.h Sun Oct 11 21:32:11 1998
+@@ -6,8 +6,8 @@
+ typedef struct scsi_sense_data *ScsiSense;
+ typedef struct scsi_inquiry_data *ScsiInquiry;
+
+-ScsiStatus scsi_test_unit_ready(int fd, ScsiSense *sense);
+-ScsiStatus scsi_inquiry(int fd, ScsiSense *sense, ScsiInquiry *inquiry);
+-ScsiStatus scsi_send(int fd, ScsiSense *sense, u_char *data, int *len);
+-ScsiStatus scsi_receive(int fd, ScsiSense *sense, u_char *data, int *len);
++ScsiStatus Scsi_test_unit_ready(int fd, ScsiSense *sense);
++ScsiStatus Scsi_inquiry(int fd, ScsiSense *sense, ScsiInquiry *inquiry);
++ScsiStatus Scsi_send(int fd, ScsiSense *sense, u_char *data, int *len);
++ScsiStatus Scsi_receive(int fd, ScsiSense *sense, u_char *data, int *len);
+
diff --git a/graphics/hpscan/files/patch-ae b/graphics/hpscan/files/patch-ae
index 8790f1551304..f3a14bcf0699 100644
--- a/graphics/hpscan/files/patch-ae
+++ b/graphics/hpscan/files/patch-ae
@@ -1,12 +1,3 @@
-diff -u -N ../old/Imakefile ./Imakefile
---- ../old/Imakefile Wed Mar 6 13:25:47 1996
-+++ ./Imakefile Thu Mar 7 21:22:07 1996
-@@ -12,3 +12,5 @@
- OBJS = main.o scsi.o scanner.o scl.o gui.o colour.o Plain.o
-
- ComplexProgramTarget(hpscan)
-+InstallAppDefaults(HPscan)
-+InstallAppDefaultsLong(HPscan-co,HPscan-color)
diff -u -N ../old/colour.c ./colour.c
--- ../old/colour.c Wed Mar 6 13:25:47 1996
+++ ./colour.c Thu Mar 7 16:41:36 1996
diff --git a/graphics/hpscan/files/patch-af b/graphics/hpscan/files/patch-af
index 789355cc3257..9af351349a89 100644
--- a/graphics/hpscan/files/patch-af
+++ b/graphics/hpscan/files/patch-af
@@ -1,17 +1,58 @@
---- Imakefile.old Fri Sep 13 00:19:22 1996
-+++ Imakefile Fri Sep 13 00:19:36 1996
-@@ -3,10 +3,10 @@
- XCOMM written by Jörg Wunsch, 96/01/12.
- XCOMM
-
-- EXTRA_INCLUDES = -I/sys
--
-- DEPLIBS = XawClientDepLibs
--LOCAL_LIBRARIES = XawClientLibs MathLibrary
-+ EXTRA_INCLUDES = -I/sys -I/usr/local/include
-+ EXTRA_DEFINES = -DJPEG
-+ DEPLIBS = XawClientDepLibs /usr/local/lib/libjpeg.a
-+LOCAL_LIBRARIES = XawClientLibs MathLibrary -L/usr/local/lib -ljpeg
-
- SRCS = main.c scsi.c scanner.c scl.c gui.c colour.c Plain.c
- OBJS = main.o scsi.o scanner.o scl.o gui.o colour.o Plain.o
+--- scsi.c.orig Fri Jun 3 07:26:15 1994
++++ scsi.c Sun Oct 11 21:44:37 1998
+@@ -31,19 +31,23 @@
+ return req->status;
+ }
+
+-ScsiStatus scsi_test_unit_ready(int fd, ScsiSense *sense)
++ScsiStatus Scsi_test_unit_ready(int fd, ScsiSense *sense)
+ {
+ static scsireq_t req;
+ struct scsi_test_unit_ready *cmd = (struct scsi_test_unit_ready *)&req.cmd;
+
++#if __FreeBSD__ < 3
+ cmd->op_code= TEST_UNIT_READY;
++#else
++ cmd->opcode = TEST_UNIT_READY;
++#endif
+ req.cmdlen = sizeof(*cmd);
+
+ return scsi_do_command(fd, &req, sense);
+ }
+
+
+-ScsiStatus scsi_inquiry(int fd, ScsiSense *sense, ScsiInquiry *inquiry)
++ScsiStatus Scsi_inquiry(int fd, ScsiSense *sense, ScsiInquiry *inquiry)
+ {
+ static scsireq_t req;
+ struct scsi_inquiry *cmd = (struct scsi_inquiry *)&req.cmd;
+@@ -51,7 +55,11 @@
+
+ *inquiry = &buf;
+
++#if __FreeBSD__ < 3
+ cmd->op_code = INQUIRY;
++#else
++ cmd->opcode = INQUIRY;
++#endif
+ cmd->length = sizeof(buf);
+ req.cmdlen = sizeof(*cmd);
+ req.databuf = (u_char *)&buf;
+@@ -71,7 +79,7 @@
+ u_char unused;
+ };
+
+-ScsiStatus scsi_send(int fd, ScsiSense *sense, u_char *data, int *len)
++ScsiStatus Scsi_send(int fd, ScsiSense *sense, u_char *data, int *len)
+ {
+ static scsireq_t req;
+ struct scsi_send_receive *cmd = (struct scsi_send_receive *)&req.cmd;
+@@ -96,7 +104,7 @@
+ return status;
+ }
+
+-ScsiStatus scsi_receive(int fd, ScsiSense *sense, u_char *data, int *len)
++ScsiStatus Scsi_receive(int fd, ScsiSense *sense, u_char *data, int *len)
+ {
+ static scsireq_t req;
+ struct scsi_send_receive *cmd = (struct scsi_send_receive *)&req.cmd;
diff --git a/graphics/hpscan/files/patch-ah b/graphics/hpscan/files/patch-ah
new file mode 100644
index 000000000000..55e1cd41af46
--- /dev/null
+++ b/graphics/hpscan/files/patch-ah
@@ -0,0 +1,20 @@
+--- scanner.c.orig Sun Oct 11 21:46:19 1998
++++ scanner.c Sun Oct 11 21:46:42 1998
+@@ -84,7 +84,7 @@
+ ScsiStatus status;
+ ScsiSense sense;
+
+- status = scsi_send(fd, &sense, data, &length);
++ status = Scsi_send(fd, &sense, data, &length);
+
+ if(decode_status(status, sense, "scanner_send") == -1)
+ return -1;
+@@ -106,7 +106,7 @@
+ ScsiStatus status;
+ ScsiSense sense;
+
+- status = scsi_receive(fd, &sense, data, &length);
++ status = Scsi_receive(fd, &sense, data, &length);
+
+ if(decode_status(status, sense, "scanner_receive") == -1)
+ return -1;