Date: Tue, 19 Feb 2008 03:00:19 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/120817: Update port: graphics/sane-backends to 1.0.19 Message-ID: <20080219030019.b4dfa713.tkato432@yahoo.com> Resent-Message-ID: <200802181810.m1IIA2SX084984@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120817 >Category: ports >Synopsis: Update port: graphics/sane-backends to 1.0.19 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 18 18:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.3-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to version 1.0.19 Remove file: files/patch-backend__dell1600n_net.c files/patch-backend__pixma.h files/patch-configure >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/sane-backends/Makefile graphics/sane-backends/Makefile --- /usr/ports/graphics/sane-backends/Makefile 2007-08-13 23:31:49.000000000 +0900 +++ graphics/sane-backends/Makefile 2008-02-13 01:12:52.000000000 +0900 @@ -6,10 +6,9 @@ # PORTNAME= sane-backends -PORTVERSION= 1.0.18 -PORTREVISION= 1 +PORTVERSION= 1.0.19 CATEGORIES= graphics -MASTER_SITES= http://alioth.debian.org/download.php/1669/ \ +MASTER_SITES= http://alioth.debian.org/frs/download.php/2318/ \ ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \ ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \ ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \ @@ -66,7 +65,8 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|= \.\./libtool|= @LIBTOOL@|g' - @${REINPLACE_CMD} -e 's|} -D_REENT|} ${PTHREAD_CFLAGS} -D_REENT|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g; s|echo aout|echo elf|' ${WRKSRC}/configure + @${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 .include <bsd.port.post.mk> diff -urN /usr/ports/graphics/sane-backends/Makefile.man graphics/sane-backends/Makefile.man --- /usr/ports/graphics/sane-backends/Makefile.man 2006-09-27 02:29:23.000000000 +0900 +++ graphics/sane-backends/Makefile.man 2008-02-13 02:12:54.000000000 +0900 @@ -13,6 +13,7 @@ MAN5+= sane-canon.5 MAN5+= sane-canon630u.5 MAN5+= sane-canon_pp.5 +MAN5+= sane-cardscan.5 MAN5+= sane-coolscan.5 MAN5+= sane-coolscan2.5 MAN5+= sane-dc210.5 @@ -20,6 +21,7 @@ MAN5+= sane-dc25.5 MAN5+= sane-dll.5 MAN5+= sane-dmc.5 +MAN5+= sane-epjitsu.5 MAN5+= sane-epson.5 MAN5+= sane-fujitsu.5 MAN5+= sane-genesys.5 @@ -27,9 +29,13 @@ MAN5+= sane-gt68xx.5 MAN5+= sane-hp.5 MAN5+= sane-hp3500.5 +MAN5+= sane-hp3900.5 MAN5+= sane-hp4200.5 MAN5+= sane-hp5400.5 +MAN5+= sane-hp5590.5 +MAN5+= sane-hpljm1005.5 MAN5+= sane-hpsj5s.5 +MAN5+= sane-hs2p.5 MAN5+= sane-ibm.5 MAN5+= sane-leo.5 MAN5+= sane-lexmark.5 diff -urN /usr/ports/graphics/sane-backends/distinfo graphics/sane-backends/distinfo --- /usr/ports/graphics/sane-backends/distinfo 2006-09-27 02:29:23.000000000 +0900 +++ graphics/sane-backends/distinfo 2008-02-13 01:11:56.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (sane-backends-1.0.18.tar.gz) = 7ca7e2908e24721471de92cf40c75e60 -SHA256 (sane-backends-1.0.18.tar.gz) = d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3 -SIZE (sane-backends-1.0.18.tar.gz) = 3789493 +MD5 (sane-backends-1.0.19.tar.gz) = 8c0936272dcfd4e98c51512699f1c06f +SHA256 (sane-backends-1.0.19.tar.gz) = 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e +SIZE (sane-backends-1.0.19.tar.gz) = 4293184 diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__dell1600n_net.c graphics/sane-backends/files/patch-backend__dell1600n_net.c --- /usr/ports/graphics/sane-backends/files/patch-backend__dell1600n_net.c 2006-09-26 21:35:08.000000000 +0900 +++ graphics/sane-backends/files/patch-backend__dell1600n_net.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- 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; diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__pixma.h graphics/sane-backends/files/patch-backend__pixma.h --- /usr/ports/graphics/sane-backends/files/patch-backend__pixma.h 2006-09-26 21:35:08.000000000 +0900 +++ graphics/sane-backends/files/patch-backend__pixma.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- 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 diff -urN /usr/ports/graphics/sane-backends/files/patch-configure graphics/sane-backends/files/patch-configure --- /usr/ports/graphics/sane-backends/files/patch-configure 2005-08-30 11:14:38.000000000 +0900 +++ graphics/sane-backends/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- configure.orig Sun Aug 7 18:50:27 2005 -+++ configure Mon Aug 8 03:17:30 2005 -@@ -6868,7 +6868,7 @@ - - - --for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \ -+for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \ - sys/time.h sys/shm.h sys/ipc.h sys/signal.h \ - sys/scanio.h scsi.h sys/scsi.h sys/scsicmd.h sys/scsiio.h \ - bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h \ diff -urN /usr/ports/graphics/sane-backends/pkg-plist graphics/sane-backends/pkg-plist --- /usr/ports/graphics/sane-backends/pkg-plist 2007-05-20 13:51:46.000000000 +0900 +++ graphics/sane-backends/pkg-plist 2008-02-13 02:06:15.000000000 +0900 @@ -11,21 +11,27 @@ @unexec if cmp -s %D/etc/sane.d/bh.conf %D/etc/sane.d/dist/bh.conf; then rm -f %D/etc/sane.d/bh.conf; fi @unexec if cmp -s %D/etc/sane.d/canon.conf %D/etc/sane.d/dist/canon.conf; then rm -f %D/etc/sane.d/canon.conf; fi @unexec if cmp -s %D/etc/sane.d/canon630u.conf %D/etc/sane.d/dist/canon630u.conf; then rm -f %D/etc/sane.d/canon630u.conf; fi +@unexec if cmp -s %D/etc/sane.d/cardscan.conf %D/etc/sane.d/dist/cardscan.conf; then rm -f %D/etc/sane.d/cardscan.conf; fi @unexec if cmp -s %D/etc/sane.d/coolscan.conf %D/etc/sane.d/dist/coolscan.conf; then rm -f %D/etc/sane.d/coolscan.conf; fi @unexec if cmp -s %D/etc/sane.d/coolscan2.conf %D/etc/sane.d/dist/coolscan2.conf; then rm -f %D/etc/sane.d/coolscan2.conf; fi @unexec if cmp -s %D/etc/sane.d/dc210.conf %D/etc/sane.d/dist/dc210.conf; then rm -f %D/etc/sane.d/dc210.conf; fi @unexec if cmp -s %D/etc/sane.d/dc240.conf %D/etc/sane.d/dist/dc240.conf; then rm -f %D/etc/sane.d/dc240.conf; fi @unexec if cmp -s %D/etc/sane.d/dc25.conf %D/etc/sane.d/dist/dc25.conf; then rm -f %D/etc/sane.d/dc25.conf; fi +@unexec if cmp -s %D/etc/sane.d/dell1600n_net.conf %D/etc/sane.d/dist/dell1600n_net.conf; then rm -f %D/etc/sane.d/dell1600n_net.conf; fi @unexec if cmp -s %D/etc/sane.d/dll.conf %D/etc/sane.d/dist/dll.conf; then rm -f %D/etc/sane.d/dll.conf; fi @unexec if cmp -s %D/etc/sane.d/dmc.conf %D/etc/sane.d/dist/dmc.conf; then rm -f %D/etc/sane.d/dmc.conf; fi +@unexec if cmp -s %D/etc/sane.d/epjitsu.conf %D/etc/sane.d/dist/epjitsu.conf; then rm -f %D/etc/sane.d/epjitsu.conf; fi @unexec if cmp -s %D/etc/sane.d/epson.conf %D/etc/sane.d/dist/epson.conf; then rm -f %D/etc/sane.d/epson.conf; fi +@unexec if cmp -s %D/etc/sane.d/epson2.conf %D/etc/sane.d/dist/epson2.conf; then rm -f %D/etc/sane.d/epson2.conf; fi @unexec if cmp -s %D/etc/sane.d/fujitsu.conf %D/etc/sane.d/dist/fujitsu.conf; then rm -f %D/etc/sane.d/fujitsu.conf; fi @unexec if cmp -s %D/etc/sane.d/genesys.conf %D/etc/sane.d/dist/genesys.conf; then rm -f %D/etc/sane.d/genesys.conf; fi %%GPHOTO2%%@unexec if cmp -s %D/etc/sane.d/gphoto2.conf %D/etc/sane.d/dist/gphoto2.conf; then rm -f %D/etc/sane.d/gphoto2.conf; fi @unexec if cmp -s %D/etc/sane.d/gt68xx.conf %D/etc/sane.d/dist/gt68xx.conf; then rm -f %D/etc/sane.d/gt68xx.conf; fi @unexec if cmp -s %D/etc/sane.d/hp.conf %D/etc/sane.d/dist/hp.conf; then rm -f %D/etc/sane.d/hp.conf; fi +@unexec if cmp -s %D/etc/sane.d/hp3900.conf %D/etc/sane.d/dist/hp3900.conf; then rm -f %D/etc/sane.d/hp3900.conf; fi @unexec if cmp -s %D/etc/sane.d/hp4200.conf %D/etc/sane.d/dist/hp4200.conf; then rm -f %D/etc/sane.d/hp4200.conf; fi @unexec if cmp -s %D/etc/sane.d/hp5400.conf %D/etc/sane.d/dist/hp5400.conf; then rm -f %D/etc/sane.d/hp5400.conf; fi +@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/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 @@ -68,22 +74,28 @@ etc/sane.d/dist/bh.conf etc/sane.d/dist/canon.conf etc/sane.d/dist/canon630u.conf +etc/sane.d/dist/cardscan.conf etc/sane.d/dist/coolscan.conf etc/sane.d/dist/coolscan2.conf etc/sane.d/dist/dc210.conf etc/sane.d/dist/dc240.conf etc/sane.d/dist/dc25.conf +etc/sane.d/dist/dell1600n_net.conf etc/sane.d/dist/dll.conf @exec if test ! -e %D/etc/sane.d/dll.conf; then cp %D/etc/sane.d/dist/dll.conf %D/etc/sane.d/dll.conf; fi etc/sane.d/dist/dmc.conf +etc/sane.d/dist/epjitsu.conf etc/sane.d/dist/epson.conf +etc/sane.d/dist/epson2.conf etc/sane.d/dist/fujitsu.conf etc/sane.d/dist/genesys.conf %%GPHOTO2%%etc/sane.d/dist/gphoto2.conf etc/sane.d/dist/gt68xx.conf etc/sane.d/dist/hp.conf +etc/sane.d/dist/hp3900.conf etc/sane.d/dist/hp4200.conf etc/sane.d/dist/hp5400.conf +etc/sane.d/dist/hs2p.conf etc/sane.d/dist/ibm.conf etc/sane.d/dist/leo.conf etc/sane.d/dist/lexmark.conf @@ -152,6 +164,9 @@ lib/sane/libsane-canon630u.la lib/sane/libsane-canon630u.so lib/sane/libsane-canon630u.so.1 +lib/sane/libsane-cardscan.la +lib/sane/libsane-cardscan.so +lib/sane/libsane-cardscan.so.1 lib/sane/libsane-coolscan.la lib/sane/libsane-coolscan.so lib/sane/libsane-coolscan.so.1 @@ -176,9 +191,15 @@ lib/sane/libsane-dmc.la lib/sane/libsane-dmc.so lib/sane/libsane-dmc.so.1 +lib/sane/libsane-epjitsu.la +lib/sane/libsane-epjitsu.so +lib/sane/libsane-epjitsu.so.1 lib/sane/libsane-epson.la lib/sane/libsane-epson.so lib/sane/libsane-epson.so.1 +lib/sane/libsane-epson2.la +lib/sane/libsane-epson2.so +lib/sane/libsane-epson2.so.1 lib/sane/libsane-fujitsu.la lib/sane/libsane-fujitsu.so lib/sane/libsane-fujitsu.so.1 @@ -197,12 +218,24 @@ lib/sane/libsane-hp3500.la lib/sane/libsane-hp3500.so lib/sane/libsane-hp3500.so.1 +lib/sane/libsane-hp3900.la +lib/sane/libsane-hp3900.so +lib/sane/libsane-hp3900.so.1 lib/sane/libsane-hp4200.la lib/sane/libsane-hp4200.so lib/sane/libsane-hp4200.so.1 lib/sane/libsane-hp5400.la lib/sane/libsane-hp5400.so lib/sane/libsane-hp5400.so.1 +lib/sane/libsane-hp5590.la +lib/sane/libsane-hp5590.so +lib/sane/libsane-hp5590.so.1 +lib/sane/libsane-hpljm1005.la +lib/sane/libsane-hpljm1005.so +lib/sane/libsane-hpljm1005.so.1 +lib/sane/libsane-hs2p.la +lib/sane/libsane-hs2p.so +lib/sane/libsane-hs2p.so.1 lib/sane/libsane-ibm.la lib/sane/libsane-ibm.so lib/sane/libsane-ibm.so.1 @@ -397,22 +430,25 @@ %%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo +%%NLS%%share/locale/eo/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/fr/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo +%%NLS%%share/locale/nb/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo -%%NLS%%share/locale/no/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/pl/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo %%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo @exec mkdir %D/share/sane @exec mkdir %D/share/sane/artec_eplus48u +@exec mkdir %D/share/sane/epjitsu @exec mkdir %D/share/sane/gt68xx @exec mkdir %D/share/sane/snapscan @dirrmtry share/sane/snapscan @dirrmtry share/sane/gt68xx +@dirrmtry share/sane/epjitsu @dirrmtry share/sane/artec_eplus48u @dirrmtry share/sane %%PORTDOCS%%@dirrm %%DOCSDIR%%/umax >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080219030019.b4dfa713.tkato432>