From 6b87643471d79364d5a8009edbcc4d4d3ccb921e Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 19 Oct 2001 21:31:09 +0000 Subject: - Strongly-buildlinkify. - Add a missing dependency on libusb. - Add a buildlink.mk file for use by other package Makefiles. - Don't install sane.{dvi,ps} as they require teTeX to be installed to build the documentation files. --- graphics/sane-backends/Makefile | 23 +++--- graphics/sane-backends/buildlink.mk | 37 ++++++++++ graphics/sane-backends/distinfo | 4 +- graphics/sane-backends/patches/patch-aa | 31 ++++++++ graphics/sane-backends/patches/patch-ab | 13 ---- graphics/sane-backends/pkg/PLIST | 126 ++++++++++++++++---------------- 6 files changed, 143 insertions(+), 91 deletions(-) create mode 100644 graphics/sane-backends/buildlink.mk create mode 100644 graphics/sane-backends/patches/patch-aa delete mode 100644 graphics/sane-backends/patches/patch-ab (limited to 'graphics/sane-backends') diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 9396db3e731..e5a6fa84ca4 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/16 16:39:07 tron Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/19 21:31:09 jlam Exp $ DISTNAME= sane-backends-1.0.5 CATEGORIES= graphics @@ -9,20 +9,19 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/sane-1.0.5/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mostang.com/sane/ -COMMENT= API for access to scanners, digitals camera, frame grabbers etc - -DEPENDS+= jpeg-6b:../../graphics/jpeg +COMMENT= API for access to scanners, digitals camera, frame grabbers etc. CONFLICTS+= sane<=1.0.3 -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig -CPPFLAGS+= -I${PREFIX}/include - -# -O to work around a bug with -O2 and egcs. -CFLAGS= -O -I${LOCALBASE}/include +USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_GMAKE= YES +USE_LIBTOOL= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../devel/libusb/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../mk/bsd.pkg.mk" + +# -O to work around a bug with -O2 and egcs. +CFLAGS+= -O diff --git a/graphics/sane-backends/buildlink.mk b/graphics/sane-backends/buildlink.mk new file mode 100644 index 00000000000..831e5a408d0 --- /dev/null +++ b/graphics/sane-backends/buildlink.mk @@ -0,0 +1,37 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/10/19 21:31:09 jlam Exp $ +# +# This Makefile fragment is included by packages that use sane. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.sane to the dependency pattern +# for the version of sane desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(SANE_BUILDLINK_MK) +SANE_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.sane?= sane-backends>=1.0.3 +DEPENDS+= ${BUILDLINK_DEPENDS.sane}:../../graphics/sane-backends + +EVAL_PREFIX+= BUILDLINK_PREFIX.sane=sane-backends +BUILDLINK_PREFIX.sane_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.sane= include/sane/*.h +BUILDLINK_FILES.sane+= lib/libsane.* + +.include "../../devel/libusb/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" + +BUILDLINK_TARGETS.sane= sane-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.sane} + +pre-configure: ${BUILDLINK_TARGETS.sane} +sane-buildlink: _BUILDLINK_USE + +.endif # SANE_BUILDLINK_MK diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 98cd15ba2b7..3c5a2f097c1 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/10/15 21:27:18 veego Exp $ +$NetBSD: distinfo,v 1.5 2001/10/19 21:31:09 jlam Exp $ SHA1 (sane-backends-1.0.5.tar.gz) = d9f43e1df14de410a47fbed5a6403d61df551eb3 Size (sane-backends-1.0.5.tar.gz) = 1623024 bytes -SHA1 (patch-ab) = 688b21ec2e43a5c34a287b766a07e544f7f06c87 +SHA1 (patch-aa) = 631ff8b3f24daa73a8a8902756ae6c7ee645c76c SHA1 (patch-ad) = 5ce224b90802658a7861c7acb7e48971ece40286 diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa new file mode 100644 index 00000000000..0de0554f42f --- /dev/null +++ b/graphics/sane-backends/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.3 2001/10/19 21:31:10 jlam Exp $ + +--- doc/Makefile.in.orig Sun Jun 10 14:20:55 2001 ++++ doc/Makefile.in +@@ -20,7 +20,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + configdir = ${sysconfdir}/sane.d +-docdir=$(prefix)/doc/sane-@VERSION@ ++docdir=$(prefix)/share/doc/sane-@VERSION@ + + MKDIR = $(top_srcdir)/mkinstalldirs + INSTALL = @INSTALL@ +@@ -45,7 +45,7 @@ + READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \ + PROJECTS README README.aix README.hp-ux README.linux README.os2 \ + README.solaris README.unixware2 README.unixware7 TODO +-DOCS = backend-writing.txt sane.ps sane.dvi ++DOCS = backend-writing.txt + BACKDIRS= canon mustek umax + LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex + DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh +@@ -55,7 +55,7 @@ + EMACS = xemacs + WWW_PATH= /home/httpd/html/sane/ + +-all: sane.ps $(MANPAGES) ++all: $(MANPAGES) + + %.1 %.5 %.7: %.man + @sed -e 's|@DATADIR@|$(datadir)|g' \ diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab deleted file mode 100644 index 869b9b159b0..00000000000 --- a/graphics/sane-backends/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/10/15 21:27:19 veego Exp $ - ---- configure-orig Sun Oct 14 12:34:54 2001 -+++ configure Sun Oct 14 12:46:23 2001 -@@ -2642,7 +2642,7 @@ - EOF - if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_lib_$ac_lib_var=no" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 diff --git a/graphics/sane-backends/pkg/PLIST b/graphics/sane-backends/pkg/PLIST index 47add0cbcd7..c7111b4b970 100644 --- a/graphics/sane-backends/pkg/PLIST +++ b/graphics/sane-backends/pkg/PLIST @@ -1,64 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2001/10/15 21:27:20 veego Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/10/19 21:31:10 jlam Exp $ bin/sane-config bin/sane-find-scanner bin/scanimage -doc/sane-1.0.5/AUTHORS -doc/sane-1.0.5/COPYING -doc/sane-1.0.5/ChangeLog -doc/sane-1.0.5/LEVEL2 -doc/sane-1.0.5/LICENSE -doc/sane-1.0.5/NEWS -doc/sane-1.0.5/PROBLEMS -doc/sane-1.0.5/PROJECTS -doc/sane-1.0.5/README -doc/sane-1.0.5/README.aix -doc/sane-1.0.5/README.hp-ux -doc/sane-1.0.5/README.linux -doc/sane-1.0.5/README.os2 -doc/sane-1.0.5/README.solaris -doc/sane-1.0.5/README.unixware2 -doc/sane-1.0.5/README.unixware7 -doc/sane-1.0.5/TODO -doc/sane-1.0.5/backend-writing.txt -doc/sane-1.0.5/canon/canon.changes -doc/sane-1.0.5/canon/canon.install2700F.txt -doc/sane-1.0.5/mustek/mustek.CHANGES -doc/sane-1.0.5/sane.dvi -doc/sane-1.0.5/sane.ps -doc/sane-1.0.5/umax/negative-types.txt -doc/sane-1.0.5/umax/sane-logo.jpg -doc/sane-1.0.5/umax/sane-logo2.jpg -doc/sane-1.0.5/umax/sane-umax-advanced-options-doc.html -doc/sane-1.0.5/umax/sane-umax-advanced.jpg -doc/sane-1.0.5/umax/sane-umax-astra-doc.html -doc/sane-1.0.5/umax/sane-umax-config-doc.html -doc/sane-1.0.5/umax/sane-umax-doc.dvi -doc/sane-1.0.5/umax/sane-umax-doc.html -doc/sane-1.0.5/umax/sane-umax-doc.tex -doc/sane-1.0.5/umax/sane-umax-histogram.jpg -doc/sane-1.0.5/umax/sane-umax-mailinglist.html -doc/sane-1.0.5/umax/sane-umax-mirage-doc.html -doc/sane-1.0.5/umax/sane-umax-not-listed-doc.html -doc/sane-1.0.5/umax/sane-umax-old-scanners-doc.html -doc/sane-1.0.5/umax/sane-umax-options-doc.html -doc/sane-1.0.5/umax/sane-umax-others-doc.html -doc/sane-1.0.5/umax/sane-umax-parport-doc.html -doc/sane-1.0.5/umax/sane-umax-powerlook-doc.html -doc/sane-1.0.5/umax/sane-umax-scanner-clones-doc.html -doc/sane-1.0.5/umax/sane-umax-scanners-doc.html -doc/sane-1.0.5/umax/sane-umax-speed-doc.html -doc/sane-1.0.5/umax/sane-umax-standard-options-doc.html -doc/sane-1.0.5/umax/sane-umax-standard.jpg -doc/sane-1.0.5/umax/sane-umax-text.jpg -doc/sane-1.0.5/umax/sane-umax-text2.jpg -doc/sane-1.0.5/umax/sane-umax-text4.jpg -doc/sane-1.0.5/umax/sane-umax-uc-doc.html -doc/sane-1.0.5/umax/sane-umax-vista-doc.html -doc/sane-1.0.5/umax/sane-umax.jpg -doc/sane-1.0.5/umax/umax.BUGS -doc/sane-1.0.5/umax/umax.CHANGES -doc/sane-1.0.5/umax/umax.FAQ -doc/sane-1.0.5/umax/umax.TODO etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf etc/sane.d/apple.conf @@ -324,10 +267,65 @@ man/man5/sane-umax_pp.5 man/man5/sane-v4l.5 man/man7/sane.7 sbin/saned -@dirrm doc/sane-1.0.5/umax -@dirrm doc/sane-1.0.5/mustek -@dirrm doc/sane-1.0.5/canon -@dirrm doc/sane-1.0.5 -@dirrm etc/sane.d -@dirrm include/sane +share/doc/sane-1.0.5/AUTHORS +share/doc/sane-1.0.5/COPYING +share/doc/sane-1.0.5/ChangeLog +share/doc/sane-1.0.5/LEVEL2 +share/doc/sane-1.0.5/LICENSE +share/doc/sane-1.0.5/NEWS +share/doc/sane-1.0.5/PROBLEMS +share/doc/sane-1.0.5/PROJECTS +share/doc/sane-1.0.5/README +share/doc/sane-1.0.5/README.aix +share/doc/sane-1.0.5/README.hp-ux +share/doc/sane-1.0.5/README.linux +share/doc/sane-1.0.5/README.os2 +share/doc/sane-1.0.5/README.solaris +share/doc/sane-1.0.5/README.unixware2 +share/doc/sane-1.0.5/README.unixware7 +share/doc/sane-1.0.5/TODO +share/doc/sane-1.0.5/backend-writing.txt +share/doc/sane-1.0.5/canon/canon.changes +share/doc/sane-1.0.5/canon/canon.install2700F.txt +share/doc/sane-1.0.5/mustek/mustek.CHANGES +share/doc/sane-1.0.5/umax/negative-types.txt +share/doc/sane-1.0.5/umax/sane-logo.jpg +share/doc/sane-1.0.5/umax/sane-logo2.jpg +share/doc/sane-1.0.5/umax/sane-umax-advanced-options-doc.html +share/doc/sane-1.0.5/umax/sane-umax-advanced.jpg +share/doc/sane-1.0.5/umax/sane-umax-astra-doc.html +share/doc/sane-1.0.5/umax/sane-umax-config-doc.html +share/doc/sane-1.0.5/umax/sane-umax-doc.dvi +share/doc/sane-1.0.5/umax/sane-umax-doc.html +share/doc/sane-1.0.5/umax/sane-umax-doc.tex +share/doc/sane-1.0.5/umax/sane-umax-histogram.jpg +share/doc/sane-1.0.5/umax/sane-umax-mailinglist.html +share/doc/sane-1.0.5/umax/sane-umax-mirage-doc.html +share/doc/sane-1.0.5/umax/sane-umax-not-listed-doc.html +share/doc/sane-1.0.5/umax/sane-umax-old-scanners-doc.html +share/doc/sane-1.0.5/umax/sane-umax-options-doc.html +share/doc/sane-1.0.5/umax/sane-umax-others-doc.html +share/doc/sane-1.0.5/umax/sane-umax-parport-doc.html +share/doc/sane-1.0.5/umax/sane-umax-powerlook-doc.html +share/doc/sane-1.0.5/umax/sane-umax-scanner-clones-doc.html +share/doc/sane-1.0.5/umax/sane-umax-scanners-doc.html +share/doc/sane-1.0.5/umax/sane-umax-speed-doc.html +share/doc/sane-1.0.5/umax/sane-umax-standard-options-doc.html +share/doc/sane-1.0.5/umax/sane-umax-standard.jpg +share/doc/sane-1.0.5/umax/sane-umax-text.jpg +share/doc/sane-1.0.5/umax/sane-umax-text2.jpg +share/doc/sane-1.0.5/umax/sane-umax-text4.jpg +share/doc/sane-1.0.5/umax/sane-umax-uc-doc.html +share/doc/sane-1.0.5/umax/sane-umax-vista-doc.html +share/doc/sane-1.0.5/umax/sane-umax.jpg +share/doc/sane-1.0.5/umax/umax.BUGS +share/doc/sane-1.0.5/umax/umax.CHANGES +share/doc/sane-1.0.5/umax/umax.FAQ +share/doc/sane-1.0.5/umax/umax.TODO +@dirrm share/doc/sane-1.0.5/umax +@dirrm share/doc/sane-1.0.5/mustek +@dirrm share/doc/sane-1.0.5/canon +@dirrm share/doc/sane-1.0.5 @dirrm lib/sane +@dirrm include/sane +@dirrm etc/sane.d -- cgit v1.2.3