Attachment #71103 for bug #103638

View | Details | Raw Unified | Return to bug 103638
Collapse All | Expand All

Lines 6-15 Link Here

(-)graphics/sane-backends/Makefile (-12 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= sane-backends	8	PORTNAME= sane-backends
9	PORTVERSION= 1.0.17	9	PORTVERSION= 1.0.18
10	PORTREVISION= 3
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://alioth.debian.org/download.php/1347/ \	11	MASTER_SITES= http://alioth.debian.org/download.php/1669/ \
13	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \	12	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
14	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \	13	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
15	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \	14	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
Lines 20-26 Link Here
20	MAINTAINER= ports@FreeBSD.org	19	MAINTAINER= ports@FreeBSD.org
21	COMMENT= API for access to scanners, digitals camera, frame grabbers etc	20	COMMENT= API for access to scanners, digitals camera, frame grabbers etc
22		21
23	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg	22	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
		23	tiff.4:${PORTSDIR}/graphics/tiff
24		24
25	OPTIONS= USB "USB support" on \	25	OPTIONS= USB "USB support" on \
26	NLS "NLS support" on \	26	NLS "NLS support" on \
Lines 31-37 Link Here
31	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
33	LDFLAGS="-L${LOCALBASE}/lib"	33	LDFLAGS="-L${LOCALBASE}/lib"
34	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --disable-locking	34	CONFIGURE_ARGS= --mandir=${PREFIX}/man --with-docdir=${DOCSDIR} \
		35	--disable-locking
		36
35	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}	37	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}
36	USE_LDCONFIG= yes	38	USE_LDCONFIG= yes
37		39
Lines 60-72 Link Here
60	PLIST_SUB+= GPHOTO2="@comment "	62	PLIST_SUB+= GPHOTO2="@comment "
61	.endif	63	.endif
62		64
63	pre-fetch:	65	pre-everithing::
64	@${ECHO} ""	66	@${ECHO_MSG} ""
65	@${ECHO} "* ATTENTION *"	67	@${ECHO_MSG} "* ATTENTION *"
66	@${ECHO} ""	68	@${ECHO_MSG} ""
67	@${ECHO} "Older versions than 1.0.17_1 do not check if you change config files."	69	@${ECHO_MSG} "Older versions than 1.0.17_1 do not check if you change config files."
68	@${ECHO} "If that's the case for you, press CTRL+C and backup your config files."	70	@${ECHO_MSG} "If that's the case for you, press CTRL+C and backup your config files."
69	@${ECHO} ""	71	@${ECHO_MSG} ""
70		72
71	post-patch:	73	post-patch:
72	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	74	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \




MAN5+=	sane-gphoto2.5
MAN5+=	sane-gt68xx.5
MAN5+=	sane-hp.5
MAN5+=	sane-hp3500.5
MAN5+=	sane-hp4200.5
MAN5+=	sane-hp5400.5
MAN5+=	sane-hpsj5s.5

MAN5+=	sane-niash.5
MAN5+=	sane-pie.5
MAN5+=	sane-pint.5
MAN5+=	sane-pixma.5
MAN5+=	sane-plustek.5
MAN5+=	sane-plustek_pp.5
MAN5+=	sane-pnm.5

MAN5+=	sane-snapscan.5
MAN5+=	sane-sp15c.5
MAN5+=	sane-st400.5
MAN5+=	sane-stv680.5
MAN5+=	sane-tamarack.5
MAN5+=	sane-teco1.5
MAN5+=	sane-teco2.5

Lines 1-3 Link Here

(-)graphics/sane-backends/distinfo (-3 / +3 lines)
1	MD5 (sane-backends-1.0.17.tar.gz) = b51c10da8a81a04e1bae88c9e6556df2	1	MD5 (sane-backends-1.0.18.tar.gz) = 7ca7e2908e24721471de92cf40c75e60
2	SHA256 (sane-backends-1.0.17.tar.gz) = f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77	2	SHA256 (sane-backends-1.0.18.tar.gz) = d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
3	SIZE (sane-backends-1.0.17.tar.gz) = 3588993	3	SIZE (sane-backends-1.0.18.tar.gz) = 3789493




--- backend/dell1600n_net.c.orig	Tue Jun 20 06:07:52 2006
+++ backend/dell1600n_net.c	Fri Sep 15 01:42:26 2006
@@ -73,6 +73,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
+#include <sys/time.h>
+
 #include <jpeglib.h>
 #include <tiffio.h>
 
@@ -1762,7 +1764,7 @@
 ProcessPageData (struct ScannerState *pState)
 {
 
-  char tempFilename[TMP_MAX] = "scan.dat";
+  char tempFilename[L_tmpnam] = "scan.dat";
   FILE *fTmp;
   int fdTmp;
   struct jpeg_source_mgr jpegSrcMgr;




--- backend/pixma.h.orig	Mon Jun 12 05:56:42 2006
+++ backend/pixma.h	Fri Sep 15 01:11:40 2006
@@ -104,14 +104,14 @@
 
 #include <errno.h>
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>		/* available in ISO C99 */
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
 #else
 # include <sys/types.h>
 typedef u_int8_t uint8_t;
 typedef u_int16_t uint16_t;
 typedef u_int32_t uint32_t;
-#endif /* HAVE_STDINT_H */
+#endif /* HAVE_INTTYPES_H */
 
 #ifndef EPROTO
 # define EPROTO        10000

Lines 49-54 Link Here

(-)graphics/sane-backends/pkg-plist (+14 lines)
49	@unexec if cmp -s %D/etc/sane.d/snapscan.conf %D/etc/sane.d/dist/snapscan.conf; then rm -f %D/etc/sane.d/snapscan.conf; fi	49	@unexec if cmp -s %D/etc/sane.d/snapscan.conf %D/etc/sane.d/dist/snapscan.conf; then rm -f %D/etc/sane.d/snapscan.conf; fi
50	@unexec if cmp -s %D/etc/sane.d/sp15c.conf %D/etc/sane.d/dist/sp15c.conf; then rm -f %D/etc/sane.d/sp15c.conf; fi	50	@unexec if cmp -s %D/etc/sane.d/sp15c.conf %D/etc/sane.d/dist/sp15c.conf; then rm -f %D/etc/sane.d/sp15c.conf; fi
51	@unexec if cmp -s %D/etc/sane.d/st400.conf %D/etc/sane.d/dist/st400.conf; then rm -f %D/etc/sane.d/st400.conf; fi	51	@unexec if cmp -s %D/etc/sane.d/st400.conf %D/etc/sane.d/dist/st400.conf; then rm -f %D/etc/sane.d/st400.conf; fi
		52	@unexec if cmp -s %D/etc/sane.d/stv680.conf %D/etc/sane.d/dist/stv680.conf; then rm -f %D/etc/sane.d/stv680.conf; fi
52	@unexec if cmp -s %D/etc/sane.d/tamarack.conf %D/etc/sane.d/dist/tamarack.conf; then rm -f %D/etc/sane.d/tamarack.conf; fi	53	@unexec if cmp -s %D/etc/sane.d/tamarack.conf %D/etc/sane.d/dist/tamarack.conf; then rm -f %D/etc/sane.d/tamarack.conf; fi
53	@unexec if cmp -s %D/etc/sane.d/teco1.conf %D/etc/sane.d/dist/teco1.conf; then rm -f %D/etc/sane.d/teco1.conf; fi	54	@unexec if cmp -s %D/etc/sane.d/teco1.conf %D/etc/sane.d/dist/teco1.conf; then rm -f %D/etc/sane.d/teco1.conf; fi
54	@unexec if cmp -s %D/etc/sane.d/teco2.conf %D/etc/sane.d/dist/teco2.conf; then rm -f %D/etc/sane.d/teco2.conf; fi	55	@unexec if cmp -s %D/etc/sane.d/teco2.conf %D/etc/sane.d/dist/teco2.conf; then rm -f %D/etc/sane.d/teco2.conf; fi
Lines 106-111 Link Here
106	etc/sane.d/dist/snapscan.conf	107	etc/sane.d/dist/snapscan.conf
107	etc/sane.d/dist/sp15c.conf	108	etc/sane.d/dist/sp15c.conf
108	etc/sane.d/dist/st400.conf	109	etc/sane.d/dist/st400.conf
		110	etc/sane.d/dist/stv680.conf
109	etc/sane.d/dist/tamarack.conf	111	etc/sane.d/dist/tamarack.conf
110	etc/sane.d/dist/teco1.conf	112	etc/sane.d/dist/teco1.conf
111	etc/sane.d/dist/teco2.conf	113	etc/sane.d/dist/teco2.conf
Lines 165-170 Link Here
165	lib/sane/libsane-dc25.la	167	lib/sane/libsane-dc25.la
166	lib/sane/libsane-dc25.so	168	lib/sane/libsane-dc25.so
167	lib/sane/libsane-dc25.so.1	169	lib/sane/libsane-dc25.so.1
		170	lib/sane/libsane-dell1600n_net.la
		171	lib/sane/libsane-dell1600n_net.so
		172	lib/sane/libsane-dell1600n_net.so.1
168	lib/sane/libsane-dll.la	173	lib/sane/libsane-dll.la
169	lib/sane/libsane-dll.so	174	lib/sane/libsane-dll.so
170	lib/sane/libsane-dll.so.1	175	lib/sane/libsane-dll.so.1
Lines 189-194 Link Here
189	lib/sane/libsane-hp.la	194	lib/sane/libsane-hp.la
190	lib/sane/libsane-hp.so	195	lib/sane/libsane-hp.so
191	lib/sane/libsane-hp.so.1	196	lib/sane/libsane-hp.so.1
		197	lib/sane/libsane-hp3500.la
		198	lib/sane/libsane-hp3500.so
		199	lib/sane/libsane-hp3500.so.1
192	lib/sane/libsane-hp4200.la	200	lib/sane/libsane-hp4200.la
193	lib/sane/libsane-hp4200.so	201	lib/sane/libsane-hp4200.so
194	lib/sane/libsane-hp4200.so.1	202	lib/sane/libsane-hp4200.so.1
Lines 237-242 Link Here
237	lib/sane/libsane-pie.la	245	lib/sane/libsane-pie.la
238	lib/sane/libsane-pie.so	246	lib/sane/libsane-pie.so
239	lib/sane/libsane-pie.so.1	247	lib/sane/libsane-pie.so.1
		248	lib/sane/libsane-pixma.la
		249	lib/sane/libsane-pixma.so
		250	lib/sane/libsane-pixma.so.1
240	lib/sane/libsane-plustek.la	251	lib/sane/libsane-plustek.la
241	lib/sane/libsane-plustek.so	252	lib/sane/libsane-plustek.so
242	lib/sane/libsane-plustek.so.1	253	lib/sane/libsane-plustek.so.1
Lines 270-275 Link Here
270	lib/sane/libsane-st400.la	281	lib/sane/libsane-st400.la
271	lib/sane/libsane-st400.so	282	lib/sane/libsane-st400.so
272	lib/sane/libsane-st400.so.1	283	lib/sane/libsane-st400.so.1
		284	lib/sane/libsane-stv680.la
		285	lib/sane/libsane-stv680.so
		286	lib/sane/libsane-stv680.so.1
273	lib/sane/libsane-tamarack.la	287	lib/sane/libsane-tamarack.la
274	lib/sane/libsane-tamarack.so	288	lib/sane/libsane-tamarack.so
275	lib/sane/libsane-tamarack.so.1	289	lib/sane/libsane-tamarack.so.1

Return to bug 103638

Lines 26-31 Link Here

(-)graphics/sane-backends/Makefile.man (+3 lines)
26	MAN5+= sane-gphoto2.5	26	MAN5+= sane-gphoto2.5
27	MAN5+= sane-gt68xx.5	27	MAN5+= sane-gt68xx.5
28	MAN5+= sane-hp.5	28	MAN5+= sane-hp.5
		29	MAN5+= sane-hp3500.5
29	MAN5+= sane-hp4200.5	30	MAN5+= sane-hp4200.5
30	MAN5+= sane-hp5400.5	31	MAN5+= sane-hp5400.5
31	MAN5+= sane-hpsj5s.5	32	MAN5+= sane-hpsj5s.5
Lines 45-50 Link Here
45	MAN5+= sane-niash.5	46	MAN5+= sane-niash.5
46	MAN5+= sane-pie.5	47	MAN5+= sane-pie.5
47	MAN5+= sane-pint.5	48	MAN5+= sane-pint.5
		49	MAN5+= sane-pixma.5
48	MAN5+= sane-plustek.5	50	MAN5+= sane-plustek.5
49	MAN5+= sane-plustek_pp.5	51	MAN5+= sane-plustek_pp.5
50	MAN5+= sane-pnm.5	52	MAN5+= sane-pnm.5
Lines 59-64 Link Here
59	MAN5+= sane-snapscan.5	61	MAN5+= sane-snapscan.5
60	MAN5+= sane-sp15c.5	62	MAN5+= sane-sp15c.5
61	MAN5+= sane-st400.5	63	MAN5+= sane-st400.5
		64	MAN5+= sane-stv680.5
62	MAN5+= sane-tamarack.5	65	MAN5+= sane-tamarack.5
63	MAN5+= sane-teco1.5	66	MAN5+= sane-teco1.5
64	MAN5+= sane-teco2.5	67	MAN5+= sane-teco2.5

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__dell1600n_net.c (+20 lines)
	1	--- backend/dell1600n_net.c.orig Tue Jun 20 06:07:52 2006
	2	+++ backend/dell1600n_net.c Fri Sep 15 01:42:26 2006
	3	@@ -73,6 +73,8 @@
	4	#include <netinet/in.h>
	5	#include <netdb.h>
	6
	7	+#include <sys/time.h>
	8	+
	9	#include <jpeglib.h>
	10	#include <tiffio.h>
	11
	12	@@ -1762,7 +1764,7 @@
	13	ProcessPageData (struct ScannerState *pState)
	14	{
	15
	16	- char tempFilename[TMP_MAX] = "scan.dat";
	17	+ char tempFilename[L_tmpnam] = "scan.dat";
	18	FILE *fTmp;
	19	int fdTmp;
	20	struct jpeg_source_mgr jpegSrcMgr;

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__pixma.h (+20 lines)
	1	--- backend/pixma.h.orig Mon Jun 12 05:56:42 2006
	2	+++ backend/pixma.h Fri Sep 15 01:11:40 2006
	3	@@ -104,14 +104,14 @@
	4
	5	#include <errno.h>
	6
	7	-#ifdef HAVE_STDINT_H
	8	-# include <stdint.h> /* available in ISO C99 */
	9	+#ifdef HAVE_INTTYPES_H
	10	+# include <inttypes.h>
	11	#else
	12	# include <sys/types.h>
	13	typedef u_int8_t uint8_t;
	14	typedef u_int16_t uint16_t;
	15	typedef u_int32_t uint32_t;
	16	-#endif /* HAVE_STDINT_H */
	17	+#endif /* HAVE_INTTYPES_H */
	18
	19	#ifndef EPROTO
	20	# define EPROTO 10000