Attachment #117398 for bug #159479

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




#

PORTNAME=	sane-backends
PORTVERSION=	1.0.22
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	http://alioth.debian.org/frs/download.php/3503/ \
		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/
		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
		ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \
		http://gd.tuwien.ac.at/hci/sane/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org

OPTIONS=	USB "USB support" on \
		NLS "NLS support" on \
		GPHOTO2 "gPhoto2 support" off \
		SNMP "SNMP support" off \
		AVAHI "Avahi support" off \
		IEEE1284 "libieee1284 support" off \
		IPV6 "IPV6 support" off

LICENSE=	GPLv2 GPLv3
LICENSE_COMB=	dual

USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
		--disable-latex \
		--disable-locking \
		--enable-pthread
MAKE_JOBS_UNSAFE=	yes
USE_LDCONFIG=	yes
MAKE_JOBS_UNSAFE=	yes

USE_RC_SUBR=	saned
SUB_FILES+=	pkg-message

USERS=	saned
GROUPS=	saned

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.include "Makefile.man"
.include <bsd.port.pre.mk>

.if defined(NOPORTDOCS)
MAKE_ENV+=	NOPORTDOCS=1
.endif

.if defined(WITHOUT_USB)

PLIST_SUB+=		GPHOTO2="@comment "
.endif

.if defined(WITH_SNMP)
LIB_DEPENDS=		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
.else
CONFIGURE_ARGS+=	--without-snmp
.endif

.if defined(WITH_AVAHI)
LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
CONFIGURE_ARGS+=	--enable-avahi


post-patch:
	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h||g ; \
		 s|} -D_REENT|} ${PTHREAD_CFLAGS} -D_REENT|g ; \
		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
	@(cd ${WRKSRC}/po; ${BASENAME} -s .po `${LS} *.po` > LINGUAS)

post-install:
	@${CAT} ${PKGMESSAGE}

Lines 39-47 Link Here

(-)graphics/sane-backends/Makefile.man (+2 lines)
39	MAN5+= sane-ibm.5	39	MAN5+= sane-ibm.5
40	MAN5+= sane-kodak.5	40	MAN5+= sane-kodak.5
41	MAN5+= sane-kvs1025.5	41	MAN5+= sane-kvs1025.5
		42	MAN5+= sane-kvs20xx.5
42	MAN5+= sane-leo.5	43	MAN5+= sane-leo.5
43	MAN5+= sane-lexmark.5	44	MAN5+= sane-lexmark.5
44	MAN5+= sane-ma1509.5	45	MAN5+= sane-ma1509.5
		46	MAN5+= sane-magicolor.5
45	MAN5+= sane-matsushita.5	47	MAN5+= sane-matsushita.5
46	MAN5+= sane-microtek.5	48	MAN5+= sane-microtek.5
47	MAN5+= sane-microtek2.5	49	MAN5+= sane-microtek2.5

Lines 1-2 Link Here

(-)graphics/sane-backends/distinfo (-2 / +2 lines)
1	SHA256 (sane-backends-1.0.21.tar.gz) = e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b	1	SHA256 (sane-backends-1.0.22.tar.gz) = 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
2	SIZE (sane-backends-1.0.21.tar.gz) = 5050344	2	SIZE (sane-backends-1.0.22.tar.gz) = 5150661

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-backend__genesys.c (-11 lines)
1	--- backend/genesys.c.orig 2011-06-07 13:06:00.000000000 +0200
2	+++ backend/genesys.c 2011-06-07 13:06:46.000000000 +0200
3	@@ -5436,7 +5436,7 @@
4	* @param size maximum size of the range
5	* @return a poiter to a valid range or NULL
6	*/
7	-static create_range(SANE_Fixed size)
8	+static SANE_Range *create_range(SANE_Fixed size)
9	{
10	SANE_Range *range=NULL;
11

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__magicolor.c (+11 lines)
	1	--- backend/magicolor.c.orig 2011-01-31 03:49:46.000000000 +0900
	2	+++ backend/magicolor.c 2011-08-02 02:38:15.000000000 +0900
	3	@@ -50,6 +50,8 @@
	4	#include <unistd.h>
	5	#include <errno.h>
	6	#include <sys/time.h>
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9	#include <math.h>
	10	#include <poll.h>
	11

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c (+11 lines)
	1	--- backend/xerox_mfp-tcp.c.orig 2010-12-02 08:49:58.000000000 +0900
	2	+++ backend/xerox_mfp-tcp.c 2011-08-02 02:37:27.000000000 +0900
	3	@@ -27,6 +27,8 @@
	4	#include <unistd.h>
	5	#include <errno.h>
	6	#include <sys/time.h>
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9
	10	#include "sane/saneopts.h"
	11	#include "sane/sanei_scsi.h"

Lines 41-46 Link Here

(-)graphics/sane-backends/pkg-plist (+8 lines)
41	@unexec if cmp -s %D/etc/sane.d/leo.conf %D/etc/sane.d/dist/leo.conf; then rm -f %D/etc/sane.d/leo.conf; fi	41	@unexec if cmp -s %D/etc/sane.d/leo.conf %D/etc/sane.d/dist/leo.conf; then rm -f %D/etc/sane.d/leo.conf; fi
42	@unexec if cmp -s %D/etc/sane.d/lexmark.conf %D/etc/sane.d/dist/lexmark.conf; then rm -f %D/etc/sane.d/lexmark.conf; fi	42	@unexec if cmp -s %D/etc/sane.d/lexmark.conf %D/etc/sane.d/dist/lexmark.conf; then rm -f %D/etc/sane.d/lexmark.conf; fi
43	@unexec if cmp -s %D/etc/sane.d/ma1509.conf %D/etc/sane.d/dist/ma1509.conf; then rm -f %D/etc/sane.d/ma1509.conf; fi	43	@unexec if cmp -s %D/etc/sane.d/ma1509.conf %D/etc/sane.d/dist/ma1509.conf; then rm -f %D/etc/sane.d/ma1509.conf; fi
		44	@unexec if cmp -s %D/etc/sane.d/magicolor.conf %D/etc/sane.d/dist/magicolor.conf; then rm -f %D/etc/sane.d/magicolor.conf; fi
44	@unexec if cmp -s %D/etc/sane.d/matsushita.conf %D/etc/sane.d/dist/matsushita.conf; then rm -f %D/etc/sane.d/matsushita.conf; fi	45	@unexec if cmp -s %D/etc/sane.d/matsushita.conf %D/etc/sane.d/dist/matsushita.conf; then rm -f %D/etc/sane.d/matsushita.conf; fi
45	@unexec if cmp -s %D/etc/sane.d/microtek.conf %D/etc/sane.d/dist/microtek.conf; then rm -f %D/etc/sane.d/microtek.conf; fi	46	@unexec if cmp -s %D/etc/sane.d/microtek.conf %D/etc/sane.d/dist/microtek.conf; then rm -f %D/etc/sane.d/microtek.conf; fi
46	@unexec if cmp -s %D/etc/sane.d/microtek2.conf %D/etc/sane.d/dist/microtek2.conf; then rm -f %D/etc/sane.d/microtek2.conf; fi	47	@unexec if cmp -s %D/etc/sane.d/microtek2.conf %D/etc/sane.d/dist/microtek2.conf; then rm -f %D/etc/sane.d/microtek2.conf; fi
Lines 115-120 Link Here
115	etc/sane.d/dist/leo.conf	116	etc/sane.d/dist/leo.conf
116	etc/sane.d/dist/lexmark.conf	117	etc/sane.d/dist/lexmark.conf
117	etc/sane.d/dist/ma1509.conf	118	etc/sane.d/dist/ma1509.conf
		119	etc/sane.d/dist/magicolor.conf
118	etc/sane.d/dist/matsushita.conf	120	etc/sane.d/dist/matsushita.conf
119	etc/sane.d/dist/microtek.conf	121	etc/sane.d/dist/microtek.conf
120	etc/sane.d/dist/microtek2.conf	122	etc/sane.d/dist/microtek2.conf
Lines 277-282 Link Here
277	lib/sane/libsane-kvs1025.la	279	lib/sane/libsane-kvs1025.la
278	lib/sane/libsane-kvs1025.so	280	lib/sane/libsane-kvs1025.so
279	lib/sane/libsane-kvs1025.so.1	281	lib/sane/libsane-kvs1025.so.1
		282	lib/sane/libsane-kvs20xx.la
		283	lib/sane/libsane-kvs20xx.so
		284	lib/sane/libsane-kvs20xx.so.1
280	lib/sane/libsane-leo.la	285	lib/sane/libsane-leo.la
281	lib/sane/libsane-leo.so	286	lib/sane/libsane-leo.so
282	lib/sane/libsane-leo.so.1	287	lib/sane/libsane-leo.so.1
Lines 286-291 Link Here
286	lib/sane/libsane-ma1509.la	291	lib/sane/libsane-ma1509.la
287	lib/sane/libsane-ma1509.so	292	lib/sane/libsane-ma1509.so
288	lib/sane/libsane-ma1509.so.1	293	lib/sane/libsane-ma1509.so.1
		294	lib/sane/libsane-magicolor.la
		295	lib/sane/libsane-magicolor.so
		296	lib/sane/libsane-magicolor.so.1
289	lib/sane/libsane-matsushita.la	297	lib/sane/libsane-matsushita.la
290	lib/sane/libsane-matsushita.so	298	lib/sane/libsane-matsushita.so
291	lib/sane/libsane-matsushita.so.1	299	lib/sane/libsane-matsushita.so.1

Return to bug 159479

Lines 6-20 Link Here

(-)graphics/sane-backends/Makefile (-14 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= sane-backends	8	PORTNAME= sane-backends
9	PORTVERSION= 1.0.21	9	PORTVERSION= 1.0.22
10	PORTREVISION= 3
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://alioth.debian.org/frs/download.php/3258/ \	11	MASTER_SITES= http://alioth.debian.org/frs/download.php/3503/ \
13	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \	12	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/
14	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
15	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
16	ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \
17	http://gd.tuwien.ac.at/hci/sane/%SUBDIR%/
18	MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}	13	MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
19		14
20	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
Lines 26-45 Link Here
26	OPTIONS= USB "USB support" on \	21	OPTIONS= USB "USB support" on \
27	NLS "NLS support" on \	22	NLS "NLS support" on \
28	GPHOTO2 "gPhoto2 support" off \	23	GPHOTO2 "gPhoto2 support" off \
		24	SNMP "SNMP support" off \
29	AVAHI "Avahi support" off \	25	AVAHI "Avahi support" off \
30	IEEE1284 "libieee1284 support" off \	26	IEEE1284 "libieee1284 support" off \
31	IPV6 "IPV6 support" off	27	IPV6 "IPV6 support" off
32		28
		29	LICENSE= GPLv2 GPLv3
		30	LICENSE_COMB= dual
		31
33	USE_GMAKE= yes	32	USE_GMAKE= yes
34	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes
35	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	34	CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
36	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
37	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \	35	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
38	--disable-latex \	36	--disable-latex \
39	--disable-locking \	37	--disable-locking \
40	--enable-pthread	38	--enable-pthread
41	MAKE_JOBS_UNSAFE= yes
42	USE_LDCONFIG= yes	39	USE_LDCONFIG= yes
		40	MAKE_JOBS_UNSAFE= yes
43		41
44	USE_RC_SUBR= saned	42	USE_RC_SUBR= saned
45	SUB_FILES+= pkg-message	43	SUB_FILES+= pkg-message
Lines 47-57 Link Here
47	USERS= saned	45	USERS= saned
48	GROUPS= saned	46	GROUPS= saned
49		47
		48	CPPFLAGS= -I${LOCALBASE}/include
		49	LDFLAGS= -L${LOCALBASE}/lib
		50
50	.include "Makefile.man"	51	.include "Makefile.man"
51	.include <bsd.port.pre.mk>	52	.include <bsd.port.pre.mk>
52		53
53	.if defined(NOPORTDOCS)	54	.if defined(NOPORTDOCS)
54	MAKE_ENV= NOPORTDOCS=1	55	MAKE_ENV+= NOPORTDOCS=1
55	.endif	56	.endif
56		57
57	.if defined(WITHOUT_USB)	58	.if defined(WITHOUT_USB)
Lines 83-88 Link Here
83	PLIST_SUB+= GPHOTO2="@comment "	84	PLIST_SUB+= GPHOTO2="@comment "
84	.endif	85	.endif
85		86
		87	.if defined(WITH_SNMP)
		88	LIB_DEPENDS= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
		89	.else
		90	CONFIGURE_ARGS+= --without-snmp
		91	.endif
		92
86	.if defined(WITH_AVAHI)	93	.if defined(WITH_AVAHI)
87	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app	94	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app
88	CONFIGURE_ARGS+= --enable-avahi	95	CONFIGURE_ARGS+= --enable-avahi
Lines 98-106 Link Here
98		105
99	post-patch:	106	post-patch:
100	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|\|g ; \	107	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|\|g ; \
101	s\|} -D_REENT\|} ${PTHREAD_CFLAGS} -D_REENT\|g ; \
102	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure	108	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure
103	@(cd ${WRKSRC}/po; ${BASENAME} -s .po `${LS} *.po` > LINGUAS)
104		109
105	post-install:	110	post-install:
106	@${CAT} ${PKGMESSAGE}	111	@${CAT} ${PKGMESSAGE}