Attachment 28690 Details for Bug 48145 – file.diff

[patch] file.diff

file.diff (text/plain), 7.15 KB, created by tkato on 2003-02-10 15:40:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-02-10 15:40:06 UTC

Size: 7.15 KB

patch

obsolete

>diff -urN /usr/ports/graphics/sane-backends/Makefile graphics/sane-backends/Makefile
>--- /usr/ports/graphics/sane-backends/Makefile	Mon Dec  9 19:00:25 2002
>+++ graphics/sane-backends/Makefile	Mon Feb 10 20:04:37 2003
>@@ -6,22 +6,23 @@
> #
> 
> PORTNAME=	sane-backends
>-PORTVERSION=	1.0.9
>-PORTREVISION=	1
>+PORTVERSION=	1.0.11
> CATEGORIES=	graphics
> MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
> 		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
> 		ftp://ftp.no.mostang.com/pub/sane/%SUBDIR%/
>-MASTER_SITE_SUBDIR=	sane-${PORTVERSION}
>+MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb \
>+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
>+		usb-0.1.7:${PORTSDIR}/devel/libusb \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg
> 
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LIBS="-L${LOCALBASE}/lib"
> MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
>diff -urN /usr/ports/graphics/sane-backends/Makefile.man graphics/sane-backends/Makefile.man
>--- /usr/ports/graphics/sane-backends/Makefile.man	Sat Oct 26 06:13:39 2002
>+++ graphics/sane-backends/Makefile.man	Wed Feb  5 00:54:43 2003
>@@ -7,6 +7,7 @@
> MAN5+=	sane-agfafocus.5
> MAN5+=	sane-apple.5
> MAN5+=	sane-artec.5
>+MAN5+=	sane-artec_eplus48u.5
> MAN5+=	sane-as6e.5
> MAN5+=	sane-avision.5
> MAN5+=	sane-bh.5
>@@ -23,6 +24,7 @@
> MAN5+=	sane-epson.5
> MAN5+=	sane-fujitsu.5
> MAN5+=	sane-gphoto2.5
>+MAN5+=	sane-gt68xx.5
> MAN5+=	sane-hp.5
> MAN5+=	sane-hpsj5s.5
> MAN5+=	sane-leo.5
>diff -urN /usr/ports/graphics/sane-backends/distinfo graphics/sane-backends/distinfo
>--- /usr/ports/graphics/sane-backends/distinfo	Sat Oct 26 06:13:40 2002
>+++ graphics/sane-backends/distinfo	Mon Feb 10 20:12:31 2003
>@@ -1 +1 @@
>-MD5 (sane-backends-1.0.9.tar.gz) = b1869b7d333ab826b3aa9edde9820a96
>+MD5 (sane-backends-1.0.11.tar.gz) = 7f0f1a7dbc1cf164f7adc2f1cb4ec13b
>diff -urN /usr/ports/graphics/sane-backends/files/patch-doc_Makefile.in graphics/sane-backends/files/patch-doc_Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-doc_Makefile.in	Sat Oct 26 06:13:40 2002
>+++ graphics/sane-backends/files/patch-doc_Makefile.in	Wed Feb  5 00:26:09 2003
>@@ -1,6 +1,6 @@
>---- doc/Makefile.in.orig	Tue Oct 15 07:52:38 2002
>-+++ doc/Makefile.in	Fri Oct 25 15:21:46 2002
>-@@ -24,7 +24,7 @@
>+--- doc/Makefile.in.orig	Sat Feb  1 05:04:56 2003
>++++ doc/Makefile.in	Wed Feb  5 00:25:50 2003
>+@@ -25,7 +25,7 @@
>  includedir = @includedir@
>  oldincludedir = /usr/include
>  configdir = ${sysconfdir}/sane.d
>@@ -9,25 +9,25 @@
>  
>  MKDIR = $(top_srcdir)/mkinstalldirs
>  INSTALL = @INSTALL@
>-@@ -52,7 +52,7 @@
>-           sane-coolscan2.5 sane-hpsj5s.5
>+@@ -53,7 +53,7 @@
>+           sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5
>  SECT7   = sane.7
>  MANPAGES = $(SECT1) $(SECT5) $(SECT7)
>--READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
>-+READMES = README AUTHORS ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
>+-READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \
>++READMES = README AUTHORS ChangeLog LICENSE NEWS PROBLEMS \
>            PROJECTS README README.aix README.beos README.darwin README.freebsd \
>            README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
>            README.solaris README.unixware2 README.unixware7 TODO
>-@@ -92,7 +92,7 @@
>+@@ -93,7 +93,7 @@
>  .PHONY: all clean depend dist distclean html html-man install \
>    install-mostang sane-html uninstall
>  
>--all: sane.ps $(MANPAGES) 
>-+all: $(MANPAGES) 
>+-all: sane.ps $(MANPAGES)
>++all: $(MANPAGES)
>  
>  %.1 %.5 %.7: %.man
>  	@sed -e 's|@DATADIR@|$(datadir)|g' \
>-@@ -118,6 +118,7 @@
>+@@ -120,6 +120,7 @@
>  	  echo installing $${page} in $(mandir)/man7/$${page}...; \
>  	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man7/$${page} || exit 1; \
>  	done
>@@ -35,7 +35,7 @@
>  	$(MKDIR) $(DESTDIR)$(docdir)
>  	@for readme in $(READMES); do \
>  	  echo installing $${readme} in $(docdir)/$${readme}...; \
>-@@ -138,6 +139,7 @@
>+@@ -140,6 +141,7 @@
>  	    echo installing $${doc} in $(docdir)/$${doc}...; \
>  	    $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
>  	  done
>diff -urN /usr/ports/graphics/sane-backends/pkg-plist graphics/sane-backends/pkg-plist
>--- /usr/ports/graphics/sane-backends/pkg-plist	Sat Oct 26 06:13:40 2002
>+++ graphics/sane-backends/pkg-plist	Wed Feb  5 00:57:21 2003
>@@ -6,6 +6,7 @@
> etc/sane.d/agfafocus.conf
> etc/sane.d/apple.conf
> etc/sane.d/artec.conf
>+etc/sane.d/artec_eplus48u.conf
> etc/sane.d/avision.conf
> etc/sane.d/bh.conf
> etc/sane.d/canon.conf
>@@ -20,6 +21,7 @@
> etc/sane.d/epson.conf
> etc/sane.d/fujitsu.conf
> %%GPHOTO2%%etc/sane.d/gphoto2.conf
>+etc/sane.d/gt68xx.conf
> etc/sane.d/hp.conf
> etc/sane.d/leo.conf
> etc/sane.d/matsushita.conf
>@@ -65,6 +67,9 @@
> lib/sane/libsane-artec.a
> lib/sane/libsane-artec.so
> lib/sane/libsane-artec.so.1
>+lib/sane/libsane-artec_eplus48u.a
>+lib/sane/libsane-artec_eplus48u.so
>+lib/sane/libsane-artec_eplus48u.so.1
> lib/sane/libsane-as6e.a
> lib/sane/libsane-as6e.so
> lib/sane/libsane-as6e.so.1
>@@ -110,6 +115,9 @@
> %%GPHOTO2%%lib/sane/libsane-gphoto2.a
> %%GPHOTO2%%lib/sane/libsane-gphoto2.so
> %%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
>+lib/sane/libsane-gt68xx.a
>+lib/sane/libsane-gt68xx.so
>+lib/sane/libsane-gt68xx.so.1
> lib/sane/libsane-hp.a
> lib/sane/libsane-hp.so
> lib/sane/libsane-hp.so.1
>@@ -197,7 +205,6 @@
> sbin/saned
> %%PORTDOCS%%share/doc/sane/AUTHORS
> %%PORTDOCS%%share/doc/sane/ChangeLog
>-%%PORTDOCS%%share/doc/sane/LEVEL2
> %%PORTDOCS%%share/doc/sane/LICENSE
> %%PORTDOCS%%share/doc/sane/NEWS
> %%PORTDOCS%%share/doc/sane/PROBLEMS
>@@ -219,10 +226,16 @@
> %%PORTDOCS%%share/doc/sane/backend-writing.txt
> %%PORTDOCS%%share/doc/sane/canon/canon.changes
> %%PORTDOCS%%share/doc/sane/canon/canon.install2700F.txt
>+%%PORTDOCS%%share/doc/sane/gt68xx/gt68xx.CHANGES
>+%%PORTDOCS%%share/doc/sane/leo/leo.txt
> %%PORTDOCS%%share/doc/sane/matsushita/matsushita.txt
> %%PORTDOCS%%share/doc/sane/mustek/mustek.CHANGES
> %%PORTDOCS%%share/doc/sane/mustek_usb/mustek_usb.CHANGES
> %%PORTDOCS%%share/doc/sane/mustek_usb/mustek_usb.TODO
>+%%PORTDOCS%%share/doc/sane/plustek/Plustek-PARPORT.txt
>+%%PORTDOCS%%share/doc/sane/plustek/Plustek-USB-TODO.txt
>+%%PORTDOCS%%share/doc/sane/plustek/Plustek-USB.txt
>+%%PORTDOCS%%share/doc/sane/plustek/Plustek.changes
> %%PORTDOCS%%share/doc/sane/sceptre/s1200.txt
> %%PORTDOCS%%share/doc/sane/teco/teco1.txt
> %%PORTDOCS%%share/doc/sane/teco/teco2.txt
>@@ -263,11 +276,20 @@
> %%PORTDOCS%%@dirrm share/doc/sane/umax
> %%PORTDOCS%%@dirrm share/doc/sane/teco
> %%PORTDOCS%%@dirrm share/doc/sane/sceptre
>+%%PORTDOCS%%@dirrm share/doc/sane/plustek
> %%PORTDOCS%%@dirrm share/doc/sane/mustek_usb
> %%PORTDOCS%%@dirrm share/doc/sane/mustek
> %%PORTDOCS%%@dirrm share/doc/sane/matsushita
>+%%PORTDOCS%%@dirrm share/doc/sane/leo
>+%%PORTDOCS%%@dirrm share/doc/sane/gt68xx
> %%PORTDOCS%%@dirrm share/doc/sane/canon
> %%PORTDOCS%%@dirrm share/doc/sane
>+share/locale/de/LC_MESSAGES/sane-backends.mo
>+share/locale/es/LC_MESSAGES/sane-backends.mo
>+share/locale/fr/LC_MESSAGES/sane-backends.mo
>+share/locale/pt/LC_MESSAGES/sane-backends.mo
>+share/locale/ru/LC_MESSAGES/sane-backends.mo
>+share/locale/sv/LC_MESSAGES/sane-backends.mo
> @dirrm lib/sane
> @dirrm include/sane
> @dirrm etc/sane.d

Actions: View | Diff

Attachments on bug 48145: 28690