Attachment #56548 for bug #85383

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

Lines 6-14 Link Here

(-)graphics/sane-backends/Makefile (-16 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= sane-backends	8	PORTNAME= sane-backends
9	PORTVERSION= 1.0.15	9	PORTVERSION= 1.0.16
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \	11	MASTER_SITES= http://alioth.debian.org/download.php/1079/ \
		12	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
12	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \	13	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
13	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \	14	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
14	ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \	15	ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \
Lines 20-39 Link Here
20		21
21	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg	22	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
22		23
23	USE_GNOME= gnometarget lthack	24	OPTIONS= USB "USB support" on \
24	USE_GMAKE= yes	25	NLS "NLS support" on \
25	USE_LIBTOOL_VER=15	26	GPHOTO2 "gPhoto2 support" off
		27
		28	USE_GNOME= gnometarget
26	USE_REINPLACE= yes	29	USE_REINPLACE= yes
		30	USE_GMAKE= yes
		31	USE_LIBTOOL_VER= 15
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
28	LDFLAGS="-L${LOCALBASE}/lib"	33	LDFLAGS="-L${LOCALBASE}/lib"
29	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} \	34	CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
30	DOCSDIR="${DOCSDIR}"	35	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}
31	INSTALLS_SHLIB= yes	36	INSTALLS_SHLIB= yes
32		37
33	OPTIONS= USB "USB support" on \	38	.include "Makefile.man"
34	NLS "NLS support" on \
35	GPHOTO2 "gPhoto2 support" off
36
37	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
38		40
39	.if defined(WITHOUT_USB)	41	.if defined(WITHOUT_USB)
Lines 61-70 Link Here
61	.endif	63	.endif
62		64
63	post-patch:	65	post-patch:
64	@${REINPLACE_CMD} -e 's\|LIBTOOL =.*\|LIBTOOL = ${LIBTOOL}\|' \	66	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
65	${WRKSRC}/backend/Makefile.in ${WRKSRC}/frontend/Makefile.in \	67	's\|= \.\./libtool\|= @LIBTOOL@\|g'
66	${WRKSRC}/japi/Makefile.in ${WRKSRC}/lib/Makefile.in \
67	${WRKSRC}/sanei/Makefile.in ${WRKSRC}/tools/Makefile.in
68		68
69	.include "Makefile.man"
70	.include <bsd.port.post.mk>	69	.include <bsd.port.post.mk>

Lines 22-27 Link Here

(-)graphics/sane-backends/Makefile.man (+2 lines)
22	MAN5+= sane-dmc.5	22	MAN5+= sane-dmc.5
23	MAN5+= sane-epson.5	23	MAN5+= sane-epson.5
24	MAN5+= sane-fujitsu.5	24	MAN5+= sane-fujitsu.5
		25	MAN5+= sane-genesys.5
25	MAN5+= sane-gphoto2.5	26	MAN5+= sane-gphoto2.5
26	MAN5+= sane-gt68xx.5	27	MAN5+= sane-gt68xx.5
27	MAN5+= sane-hp.5	28	MAN5+= sane-hp.5
Lines 51-56 Link Here
51	MAN5+= sane-scsi.5	52	MAN5+= sane-scsi.5
52	MAN5+= sane-sharp.5	53	MAN5+= sane-sharp.5
53	MAN5+= sane-sm3600.5	54	MAN5+= sane-sm3600.5
		55	MAN5+= sane-sm3840.5
54	MAN5+= sane-snapscan.5	56	MAN5+= sane-snapscan.5
55	MAN5+= sane-sp15c.5	57	MAN5+= sane-sp15c.5
56	MAN5+= sane-st400.5	58	MAN5+= sane-st400.5

Lines 1-2 Link Here

(-)graphics/sane-backends/distinfo (-2 / +2 lines)
1	MD5 (sane-backends-1.0.15.tar.gz) = 3b804f35cdfbc5ad2d201ffe078bbac9	1	MD5 (sane-backends-1.0.16.tar.gz) = bec9b9262246316b4ebfe2bc7451aa28
2	SIZE (sane-backends-1.0.15.tar.gz) = 3231759	2	SIZE (sane-backends-1.0.16.tar.gz) = 3409799

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-configure (-5 / +5 lines)
1	--- configure.orig Thu Jul 8 18:29:34 2004	1	--- configure.orig Sun Aug 7 18:50:27 2005
2	+++ configure Thu Jul 8 18:29:51 2004	2	+++ configure Mon Aug 8 03:17:30 2005
3	@@ -6464,7 +6464,7 @@	3	@@ -6868,7 +6868,7 @@
4		4
5		5
6		6
7	-for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \	7	-for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
8	+for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \	8	+for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \
9	sys/time.h sys/shm.h \	9	sys/time.h sys/shm.h sys/ipc.h sys/signal.h \
10	sys/scanio.h scsi.h sys/scsi.h sys/scsicmd.h sys/scsiio.h \	10	sys/scanio.h scsi.h sys/scsi.h sys/scsicmd.h sys/scsiio.h \
11	bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h io/cam/cam.h \	11	bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h \




--- doc/Makefile.in.orig	Sat Jul 16 06:19:07 2005
+++ doc/Makefile.in	Mon Aug  8 03:19:18 2005
@@ -25,7 +25,7 @@
 includedir = @includedir@
 oldincludedir = /usr/include
 configdir = ${sysconfdir}/sane.d
-docdir=$(prefix)/doc/sane-@VERSION@
+docdir=$(DOCSDIR)
 
 MKDIR = $(top_srcdir)/mkinstalldirs
 INSTALL = @INSTALL@
@@ -56,7 +56,7 @@
 SECT7   = sane.7
 SECT8	= saned.8

Lines 20-25 Link Here

(-)graphics/sane-backends/pkg-plist (+8 lines)
20	etc/sane.d/dmc.conf	20	etc/sane.d/dmc.conf
21	etc/sane.d/epson.conf	21	etc/sane.d/epson.conf
22	etc/sane.d/fujitsu.conf	22	etc/sane.d/fujitsu.conf
		23	etc/sane.d/genesys.conf
23	%%GPHOTO2%%etc/sane.d/gphoto2.conf	24	%%GPHOTO2%%etc/sane.d/gphoto2.conf
24	etc/sane.d/gt68xx.conf	25	etc/sane.d/gt68xx.conf
25	etc/sane.d/hp.conf	26	etc/sane.d/hp.conf
Lines 42-47 Link Here
42	etc/sane.d/saned.conf	43	etc/sane.d/saned.conf
43	etc/sane.d/sceptre.conf	44	etc/sane.d/sceptre.conf
44	etc/sane.d/sharp.conf	45	etc/sane.d/sharp.conf
		46	etc/sane.d/sm3840.conf
45	etc/sane.d/snapscan.conf	47	etc/sane.d/snapscan.conf
46	etc/sane.d/sp15c.conf	48	etc/sane.d/sp15c.conf
47	etc/sane.d/st400.conf	49	etc/sane.d/st400.conf
Lines 97-102 Link Here
97	lib/sane/libsane-epson.so.1	99	lib/sane/libsane-epson.so.1
98	lib/sane/libsane-fujitsu.so	100	lib/sane/libsane-fujitsu.so
99	lib/sane/libsane-fujitsu.so.1	101	lib/sane/libsane-fujitsu.so.1
		102	lib/sane/libsane-genesys.so
		103	lib/sane/libsane-genesys.so.1
100	%%GPHOTO2%%lib/sane/libsane-gphoto2.so	104	%%GPHOTO2%%lib/sane/libsane-gphoto2.so
101	%%GPHOTO2%%lib/sane/libsane-gphoto2.so.1	105	%%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
102	lib/sane/libsane-gt68xx.so	106	lib/sane/libsane-gt68xx.so
Lines 143-148 Link Here
143	lib/sane/libsane-sharp.so.1	147	lib/sane/libsane-sharp.so.1
144	%%USB%%lib/sane/libsane-sm3600.so	148	%%USB%%lib/sane/libsane-sm3600.so
145	%%USB%%lib/sane/libsane-sm3600.so.1	149	%%USB%%lib/sane/libsane-sm3600.so.1
		150	lib/sane/libsane-sm3840.so
		151	lib/sane/libsane-sm3840.so.1
146	lib/sane/libsane-snapscan.so	152	lib/sane/libsane-snapscan.so
147	lib/sane/libsane-snapscan.so.1	153	lib/sane/libsane-snapscan.so.1
148	lib/sane/libsane-sp15c.so	154	lib/sane/libsane-sp15c.so
Lines 189-194 Link Here
189	%%PORTDOCS%%%%DOCSDIR%%/README.unixware2	195	%%PORTDOCS%%%%DOCSDIR%%/README.unixware2
190	%%PORTDOCS%%%%DOCSDIR%%/README.unixware7	196	%%PORTDOCS%%%%DOCSDIR%%/README.unixware7
191	%%PORTDOCS%%%%DOCSDIR%%/README.windows	197	%%PORTDOCS%%%%DOCSDIR%%/README.windows
		198	%%PORTDOCS%%%%DOCSDIR%%/README.zeta
192	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes	199	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes
193	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt	200	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt
194	%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES	201	%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES
Lines 256-261 Link Here
256	%%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo	263	%%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
257	%%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo	264	%%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
258	%%NLS%%share/locale/no/LC_MESSAGES/sane-backends.mo	265	%%NLS%%share/locale/no/LC_MESSAGES/sane-backends.mo
		266	%%NLS%%share/locale/pl/LC_MESSAGES/sane-backends.mo
259	%%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo	267	%%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
260	%%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo	268	%%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
261	%%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo	269	%%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo

Return to bug 85383

Lines 1-14 Link Here

(-)graphics/sane-backends/files/patch-doc_Makefile.in (-11 / +2 lines)
1	--- doc/Makefile.in.orig Wed Aug 4 01:22:28 2004	1	--- doc/Makefile.in.orig Sat Jul 16 06:19:07 2005
2	+++ doc/Makefile.in Tue Nov 9 12:19:47 2004	2	+++ doc/Makefile.in Mon Aug 8 03:19:18 2005
3	@@ -25,7 +25,7 @@
4	includedir = @includedir@
5	oldincludedir = /usr/include
6	configdir = ${sysconfdir}/sane.d
7	-docdir=$(prefix)/doc/sane-@VERSION@
8	+docdir=$(DOCSDIR)
9
10	MKDIR = $(top_srcdir)/mkinstalldirs
11	INSTALL = @INSTALL@
12	@@ -56,7 +56,7 @@	3	@@ -56,7 +56,7 @@
13	SECT7 = sane.7	4	SECT7 = sane.7
14	SECT8 = saned.8	5	SECT8 = saned.8