svn commit: r309282 - in head/graphics/sane-backends: . files
Marcelo Araujo
araujo at FreeBSD.org
Thu Dec 20 05:40:04 UTC 2012
Author: araujo
Date: Thu Dec 20 05:40:01 2012
New Revision: 309282
URL: http://svnweb.freebsd.org/changeset/ports/309282
Log:
- Update to 1.0.23.
- Add MAKE_JOBS_SAFE.
- Trim header.
PR: ports/172022
Submitted by: KATO Tsuguru <tkato432 at yahoo.com>
Added:
head/graphics/sane-backends/files/patch-backend__kodakaio.c (contents, props changed)
head/graphics/sane-backends/files/patch-backend__kvs40xx.h (contents, props changed)
head/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c (contents, props changed)
head/graphics/sane-backends/files/patch-backend__niash.c (contents, props changed)
Deleted:
head/graphics/sane-backends/files/patch-Makefile.in
head/graphics/sane-backends/files/patch-backend-xerox_mfp.c
head/graphics/sane-backends/files/patch-backend__epson2-commands.c
head/graphics/sane-backends/files/patch-backend__epson2.c
head/graphics/sane-backends/files/patch-backend__magicolor.c
head/graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c
head/graphics/sane-backends/files/patch-doc_Makefile.in
head/graphics/sane-backends/files/patch-frontend__Makefile.in
head/graphics/sane-backends/files/patch-include_sane_sanei_tcp.h
head/graphics/sane-backends/files/patch-sanei_sanei_usb.c
Modified:
head/graphics/sane-backends/Makefile (contents, props changed)
head/graphics/sane-backends/Makefile.man (contents, props changed)
head/graphics/sane-backends/distinfo (contents, props changed)
head/graphics/sane-backends/pkg-plist (contents, props changed)
Modified: head/graphics/sane-backends/Makefile
==============================================================================
--- head/graphics/sane-backends/Makefile Thu Dec 20 05:37:46 2012 (r309281)
+++ head/graphics/sane-backends/Makefile Thu Dec 20 05:40:01 2012 (r309282)
@@ -1,17 +1,17 @@
-# New ports collection makefile for: sane-backends
-# Date created: Sat Jul 19 16:23:10 MET DST 1997
-# Whom: gary at hotlava.com
-#
+# Created by: gary at hotlava.com
# $FreeBSD$
-#
PORTNAME= sane-backends
-PORTVERSION= 1.0.22
-PORTREVISION= 2
+PORTVERSION= 1.0.23
CATEGORIES= graphics
-MASTER_SITES= http://alioth.debian.org/frs/download.php/3503/ \
- ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= http://alioth.debian.org/frs/download.php/3752/:3752 \
+ http://alioth.debian.org/frs/download.php/3753/:3753 \
+ http://alioth.debian.org/frs/download.php/3754/:3754 \
+ ftp://ftp2.sane-project.org/pub/sane/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}.1:3752,DEFAULT \
+ ${DISTNAME}${EXTRACT_SUFX}.2:3753,DEFAULT \
+ ${DISTNAME}${EXTRACT_SUFX}.3:3754,DEFAULT
+EXTRACT_ONLY= # need to concatenate before extraction
MAINTAINER= ports at FreeBSD.org
COMMENT= API for access to scanners, digitals camera, frame grabbers etc
@@ -22,21 +22,23 @@ LICENSE_COMB= dual
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-OPTIONS_DEFINE= USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 DOCS
+OPTIONS_DEFINE= USB GPHOTO2 SNMP AVAHI IEEE1284 IPV6 DOCS
OPTIONS_DEFAULT= USB
USB_DESC= USB support
GPHOTO2_DESC= gPhoto2 support
IEEE1284_DESC= libieee1284 support
+USE_GNOME= gnomehack
+USE_PKGCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
+CONFIGURE_ARGS= --with-docdir=${WRKDIR}/tmproot \
--disable-latex \
--disable-locking \
--enable-pthread
USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
USE_RC_SUBR= saned
SUB_FILES+= pkg-message
@@ -50,13 +52,9 @@ LDFLAGS+= -L${LOCALBASE}/lib
.include "Makefile.man"
.include <bsd.port.pre.mk>
-.if empty(PORT_OPTIONS:MDOCS)
-MAKE_ENV+= NOPORTDOCS=1
-.endif
-
.if ${PORT_OPTIONS:MUSB}
.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
+LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.endif
.else
CONFIGURE_ARGS+= --disable-libusb
@@ -75,7 +73,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.endif
.if ${PORT_OPTIONS:MGPHOTO2}
-LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2
MAN5+= sane-gphoto2.5
PLIST_SUB+= GPHOTO2=""
.else
@@ -84,29 +82,49 @@ PLIST_SUB+= GPHOTO2="@comment "
.endif
.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
.else
CONFIGURE_ARGS+= --without-snmp
.endif
.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app
CONFIGURE_ARGS+= --enable-avahi
.endif
.if ${PORT_OPTIONS:MIEEE1284}
-LIB_DEPENDS+= ieee1284.5:${PORTSDIR}/sysutils/libieee1284
+LIB_DEPENDS+= ieee1284:${PORTSDIR}/sysutils/libieee1284
PLIST_SUB+= IEEE1284=""
+MAN5+= sane-canon_pp.5 sane-hpsj5s.5 sane-mustek_pp.5
.else
CONFIGURE_ENV+= sane_cv_use_libieee1284=no
PLIST_SUB+= IEEE1284="@comment "
.endif
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
+.else
+CONFIGURE_ENV+= ac_cv_header_cups_cups_h=no
+.endif
+
+post-extract:
+ @((cd ${DISTDIR} && ${CAT} ${DISTFILES:C/:[^:]+$//}) | (cd ${WRKDIR} \
+ && ${EXTRACT_CMD} ${EXTRACT_BEFOR_ARGS} ${EXTRACT_AFTER_ARGS}))
+
post-patch:
- @${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h||g ; \
- s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h|cups/cups.h| ; \
+ s|-e .*/cups.h|"$$ac_cv_header_cups_cups_h" = "yes"| ; \
+ s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
+ ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e '/^pkgconfigdir/s|@libdir@|@prefix@/libdata|' \
+ ${WRKSRC}/tools/Makefile.in
post-install:
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${DOCSDIR}
+ @(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Modified: head/graphics/sane-backends/Makefile.man
==============================================================================
--- head/graphics/sane-backends/Makefile.man Thu Dec 20 05:37:46 2012 (r309281)
+++ head/graphics/sane-backends/Makefile.man Thu Dec 20 05:40:01 2012 (r309282)
@@ -38,8 +38,10 @@ MAN5+= sane-hpljm1005.5
MAN5+= sane-hs2p.5
MAN5+= sane-ibm.5
MAN5+= sane-kodak.5
+MAN5+= sane-kodakaio.5
MAN5+= sane-kvs1025.5
MAN5+= sane-kvs20xx.5
+MAN5+= sane-kvs40xx.5
MAN5+= sane-leo.5
MAN5+= sane-lexmark.5
MAN5+= sane-ma1509.5
Modified: head/graphics/sane-backends/distinfo
==============================================================================
--- head/graphics/sane-backends/distinfo Thu Dec 20 05:37:46 2012 (r309281)
+++ head/graphics/sane-backends/distinfo Thu Dec 20 05:40:01 2012 (r309282)
@@ -1,2 +1,6 @@
-SHA256 (sane-backends-1.0.22.tar.gz) = 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
-SIZE (sane-backends-1.0.22.tar.gz) = 5150661
+SHA256 (sane-backends-1.0.23.tar.gz.1) = 551d7e0c89d18ca438bfce4f1c242b59485195c493c5f935a3b11e724ee39537
+SIZE (sane-backends-1.0.23.tar.gz.1) = 1792000
+SHA256 (sane-backends-1.0.23.tar.gz.2) = b487df0d8dc921803577ee34ceaa676a4a3b6715cd4d9a229b43d6a501a1baab
+SIZE (sane-backends-1.0.23.tar.gz.2) = 1792000
+SHA256 (sane-backends-1.0.23.tar.gz.3) = af91e84cb72dc2b1fa4c7eaba948ae6ab8e2ab353f79805a21de4ac52de5b81a
+SIZE (sane-backends-1.0.23.tar.gz.3) = 1758350
Added: head/graphics/sane-backends/files/patch-backend__kodakaio.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend__kodakaio.c Thu Dec 20 05:40:01 2012 (r309282)
@@ -0,0 +1,13 @@
+--- backend/kodakaio.c.orig 2012-08-10 09:33:29.000000000 +0900
++++ backend/kodakaio.c 2012-08-29 16:35:36.000000000 +0900
+@@ -165,6 +165,10 @@
+ #include <math.h>
+ #include <poll.h>
+ #include <time.h>
++#include <sys/types.h>
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
+
+ #if HAVE_CUPS
+ /* used for auto detecting network printers */
Added: head/graphics/sane-backends/files/patch-backend__kvs40xx.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend__kvs40xx.h Thu Dec 20 05:40:01 2012 (r309282)
@@ -0,0 +1,19 @@
+--- backend/kvs40xx.h.orig 2012-08-20 05:27:18.000000000 +0900
++++ backend/kvs40xx.h 2012-08-29 17:01:58.000000000 +0900
+@@ -10,6 +10,7 @@
+
+ #include "../include/sane/config.h"
+ #include <semaphore.h>
++#include <pthread.h>
+
+ #undef BACKEND_NAME
+ #define BACKEND_NAME kvs40xx
+@@ -208,7 +209,7 @@
+ SANE_Status kvs40xx_document_exist (struct scanner *s);
+ SANE_Status get_buffer_status (struct scanner *s, unsigned *data_avalible);
+ SANE_Status kvs40xx_scan (struct scanner *s);
+-SANE_Status kvs40xx_sense_handler (int fd, u_char * sense_buffer, void *arg);
++SANE_Status kvs40xx_sense_handler (int fd, unsigned char * sense_buffer, void *arg);
+ SANE_Status stop_adf (struct scanner *s);
+ SANE_Status hopper_down (struct scanner *s);
+ SANE_Status inquiry (struct scanner *s, char *id);
Added: head/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c Thu Dec 20 05:40:01 2012 (r309282)
@@ -0,0 +1,10 @@
+--- backend/kvs40xx_opt.c.orig 2012-08-10 09:33:29.000000000 +0900
++++ backend/kvs40xx_opt.c 2012-08-29 16:57:47.000000000 +0900
+@@ -8,6 +8,7 @@
+
+ #include "../include/sane/config.h"
+
++#include <stdlib.h>
+ #include <string.h>
+ #define DEBUG_DECLARE_ONLY
+ #define BACKEND_NAME kvs40xx
Added: head/graphics/sane-backends/files/patch-backend__niash.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend__niash.c Thu Dec 20 05:40:01 2012 (r309282)
@@ -0,0 +1,24 @@
+--- backend/niash.c.orig 2006-02-04 12:34:28.000000000 +0100
++++ backend/niash.c 2007-02-21 15:38:12.000000000 +0100
+@@ -89,7 +89,9 @@ typedef enum
+ optLamp,
+
+ optCalibrate,
+- optGamma /* analog gamma = single number */
++ optGamma, /* analog gamma = single number */
++/* have optEndOfList only to define arrays with sufficient size */
++ optEndOfList
+ } EOptionIndex;
+
+
+@@ -105,8 +107,8 @@ typedef union
+
+ typedef struct
+ {
+- SANE_Option_Descriptor aOptions[optLast];
+- TOptionValue aValues[optLast];
++ SANE_Option_Descriptor aOptions[optEndOfList];
++ TOptionValue aValues[optEndOfList];
+
+ TScanParams ScanParams;
+ THWParams HWParams;
Modified: head/graphics/sane-backends/pkg-plist
==============================================================================
--- head/graphics/sane-backends/pkg-plist Thu Dec 20 05:37:46 2012 (r309281)
+++ head/graphics/sane-backends/pkg-plist Thu Dec 20 05:40:01 2012 (r309282)
@@ -38,6 +38,7 @@ bin/scanimage
@unexec if cmp -s %D/etc/sane.d/hs2p.conf %D/etc/sane.d/dist/hs2p.conf; then rm -f %D/etc/sane.d/hs2p.conf; fi
@unexec if cmp -s %D/etc/sane.d/ibm.conf %D/etc/sane.d/dist/ibm.conf; then rm -f %D/etc/sane.d/ibm.conf; fi
@unexec if cmp -s %D/etc/sane.d/kodak.conf %D/etc/sane.d/dist/kodak.conf; then rm -f %D/etc/sane.d/kodak.conf; fi
+ at unexec if cmp -s %D/etc/sane.d/kodakaio.conf %D/etc/sane.d/dist/kodakaio.conf; then rm -f %D/etc/sane.d/kodakaio.conf; fi
@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
@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
@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
@@ -113,6 +114,7 @@ etc/sane.d/dist/hp5400.conf
etc/sane.d/dist/hs2p.conf
etc/sane.d/dist/ibm.conf
etc/sane.d/dist/kodak.conf
+etc/sane.d/dist/kodakaio.conf
etc/sane.d/dist/leo.conf
etc/sane.d/dist/lexmark.conf
etc/sane.d/dist/ma1509.conf
@@ -276,12 +278,18 @@ lib/sane/libsane-ibm.so.1
lib/sane/libsane-kodak.la
lib/sane/libsane-kodak.so
lib/sane/libsane-kodak.so.1
+lib/sane/libsane-kodakaio.la
+lib/sane/libsane-kodakaio.so
+lib/sane/libsane-kodakaio.so.1
lib/sane/libsane-kvs1025.la
lib/sane/libsane-kvs1025.so
lib/sane/libsane-kvs1025.so.1
lib/sane/libsane-kvs20xx.la
lib/sane/libsane-kvs20xx.so
lib/sane/libsane-kvs20xx.so.1
+lib/sane/libsane-kvs40xx.la
+lib/sane/libsane-kvs40xx.so
+lib/sane/libsane-kvs40xx.so.1
lib/sane/libsane-leo.la
lib/sane/libsane-leo.so
lib/sane/libsane-leo.so.1
@@ -402,6 +410,7 @@ lib/sane/libsane-umax_pp.so.1
lib/sane/libsane-xerox_mfp.la
lib/sane/libsane-xerox_mfp.so
lib/sane/libsane-xerox_mfp.so.1
+libdata/pkgconfig/sane-backends.pc
sbin/saned
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
More information about the svn-ports-all
mailing list