From owner-freebsd-ports Fri Mar 15 21:50:50 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5C1DF37B41A for ; Fri, 15 Mar 2002 21:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2G5o1S72838; Fri, 15 Mar 2002 21:50:01 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 344A737B400 for ; Fri, 15 Mar 2002 21:40:47 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2G5elP62663; Fri, 15 Mar 2002 21:40:47 -0800 (PST) (envelope-from nobody) Message-Id: <200203160540.g2G5elP62663@freefall.freebsd.org> Date: Fri, 15 Mar 2002 21:40:47 -0800 (PST) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/35961: Update port: graphics/sane-backends Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35961 >Category: ports >Synopsis: Update port: graphics/sane-backends >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 15 21:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Add option for enabling gphoto2 support >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/sane-backends/Makefile graphics/sane-backends/Makefile --- /usr/ports/graphics/sane-backends/Makefile Sun Feb 24 11:05:35 2002 +++ graphics/sane-backends/Makefile Sat Mar 16 05:38:56 2002 @@ -23,7 +23,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_UNION_SEMUN" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gphoto2=no MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} INSTALLS_SHLIB= yes @@ -39,5 +38,25 @@ sane-tamarack.5 sane-umax.5 sane-umax1220u.5 sane-umax_pp.5 \ sane-usb.5 sane-v4l.5 MAN7= sane.7 + +.if defined(WITH_GPHOTO2) +LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/gphoto2 +CONFIGURE_ARGS+= --with-gphoto2=yes +PLIST_SUB+= GPHOTO2="" +.else +PLIST_SUB+= GPHOTO2="@comment " +.endif + +pre-everything:: +.if !defined(WITH_GPHOTO2) + @${ECHO_MSG} + @${ECHO_MSG} "If you want to compile with gPhoto2 support," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GPHOTO2=yes\"" + @${ECHO_MSG} +.endif + +post-patch: + @${PERL} -pi -e 's| -I/usr/local/include||g ; \ + s|2.0beta5dev1|2.0|g' ${WRKSRC}/configure .include diff -urN /usr/ports/graphics/sane-backends/pkg-plist graphics/sane-backends/pkg-plist --- /usr/ports/graphics/sane-backends/pkg-plist Sun Feb 10 10:10:39 2002 +++ graphics/sane-backends/pkg-plist Sat Mar 16 05:35:32 2002 @@ -15,6 +15,7 @@ etc/sane.d/dll.conf etc/sane.d/dmc.conf etc/sane.d/epson.conf +%%GPHOTO2%%etc/sane.d/gphoto2.conf etc/sane.d/hp.conf etc/sane.d/m3096g.conf etc/sane.d/microtek.conf @@ -87,6 +88,9 @@ lib/sane/libsane-epson.a lib/sane/libsane-epson.so lib/sane/libsane-epson.so.1 +%%GPHOTO2%%lib/sane/libsane-gphoto2.a +%%GPHOTO2%%lib/sane/libsane-gphoto2.so +%%GPHOTO2%%lib/sane/libsane-gphoto2.so.1 lib/sane/libsane-hp.a lib/sane/libsane-hp.so lib/sane/libsane-hp.so.1 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message