mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Unbreak for current.

Browse Source 
Submitted by:	sprice
This commit is contained in:
Justin M. Seger 1998-10-12 04:25:34 +00:00
parent 6b1e39b5fd
commit 65cf9d05d7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=13890
6 changed files with 114 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/hpscan/Makefile
View File

@ -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>

20
graphics/hpscan/files/Imakefile Normal file
View File

@ -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)

32
graphics/hpscan/files/patch-ad
View File

@ -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);

9
graphics/hpscan/files/patch-ae
View File

@ -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

71
graphics/hpscan/files/patch-af
View File

@ -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
--- 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;
}
- 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
-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;
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
+#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;

20
graphics/hpscan/files/patch-ah Normal file
View File

@ -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;