From owner-svn-ports-head@freebsd.org Fri Jan 15 05:39:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 484F3A837D3; Fri, 15 Jan 2016 05:39:47 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23E431723; Fri, 15 Jan 2016 05:39:47 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0F5dkCU099597; Fri, 15 Jan 2016 05:39:46 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0F5djOq099592; Fri, 15 Jan 2016 05:39:45 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201601150539.u0F5djOq099592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 15 Jan 2016 05:39:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406133 - in head: . graphics graphics/sane-epkowa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2016 05:39:47 -0000 Author: cy Date: Fri Jan 15 05:39:45 2016 New Revision: 406133 URL: https://svnweb.freebsd.org/changeset/ports/406133 Log: Resurrect graphics/sane-epkowa@r363261. Stagify. Take ownership for now. Added: head/graphics/sane-epkowa/ - copied from r363261, head/graphics/sane-epkowa/ Modified: head/MOVED head/graphics/Makefile head/graphics/sane-epkowa/Makefile head/graphics/sane-epkowa/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Jan 15 00:52:01 2016 (r406132) +++ head/MOVED Fri Jan 15 05:39:45 2016 (r406133) @@ -6609,7 +6609,6 @@ graphics/mingplot||2014-09-01|Not staged graphics/orca||2014-09-01|Not staged graphics/php5-chartdirector||2014-09-01|Not staged graphics/ruby-rmagick||2014-09-01|Not staged -graphics/sane-epkowa||2014-09-01|Not staged graphics/uDrawGraph||2014-09-01|Not staged graphics/visionworkbench||2014-09-01|Not staged irc/bobot++||2014-09-01|Not staged Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Jan 15 00:52:01 2016 (r406132) +++ head/graphics/Makefile Fri Jan 15 05:39:45 2016 (r406133) @@ -954,6 +954,7 @@ SUBDIR += sam2p SUBDIR += sampleicc SUBDIR += sane-backends + SUBDIR += sane-epkowa SUBDIR += sane-frontends SUBDIR += scale2x SUBDIR += scantailor Modified: head/graphics/sane-epkowa/Makefile ============================================================================== --- head/graphics/sane-epkowa/Makefile Mon Jul 28 21:54:33 2014 (r363261) +++ head/graphics/sane-epkowa/Makefile Fri Jan 15 05:39:45 2016 (r406133) @@ -19,7 +19,6 @@ # Given that there is no other way for us to get version 2.11.0, # and since this is allowed by the license, we go straight at the # URL for the .tar.gz we need. -NO_STAGE= yes # The various versions of the code are at: # # http://lx1.avasys.jp/iscan/2.7.0/iscan-2.7.0-1.c2.tar.gz @@ -47,7 +46,7 @@ CATEGORIES= graphics MASTER_SITES= http://lx1.avasys.jp/iscan/${PORTVERSION}/ DISTNAME= iscan_${PORTVERSION}-1 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= The sane-epkowa driver for FreeBSD # use the following two lines for 2.15.0 @@ -56,8 +55,6 @@ COMMENT= The sane-epkowa driver for Free WRKSRC=${WRKDIR}/iscan-${PORTVERSION} -MAN5= sane-epkowa.5 - # We use LIB_DEPENDS, but the dependency is also at build time LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl LIB_DEPENDS+= libgetline.so:${PORTSDIR}/devel/libgetline @@ -86,6 +83,7 @@ do-build: ( cd ${WRKSRC}/sanei ; ${MAKE_CMD} ) ( cd ${WRKSRC}/backend ; ${MAKE_CMD} ) ( cd ${WRKSRC}/doc ; ${MAKE_CMD} ) + @${GZIP_CMD} ${WRKSRC}/doc/sane-epkowa.5 .else .warning version 2.15.0 not working yet # Remove versioned symbols to link with FreeBSD's [g]libc @@ -97,14 +95,15 @@ post-patch: do-build: ( cd ${WRKSRC}/backend ; ${MAKE_CMD} ) ( cd ${WRKSRC}/doc ; ${MAKE_CMD} ) + @${GZIP_CMD} ${WRKSRC}/doc/sane-epkowa.5 .endif do-install: - @${INSTALL_MAN} ${WRKSRC}/doc/sane-epkowa.5 ${PREFIX}/man/man5 + @${INSTALL_MAN} ${WRKSRC}/doc/sane-epkowa.5.gz ${STAGEDIR}${PREFIX}/man/man5 + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/sane ${STAGEDIR}${PREFIX}/etc/sane.d @${INSTALL_DATA} ${WRKSRC}/backend/.libs/libsane-epkowa.so.1 \ - ${PREFIX}/lib/sane/ - @(cd ${PREFIX}/lib/sane; ${LN} -s libsane-epkowa.so.1 libsane-epkowa.so ) - @echo "usb /dev/uscanner0" > ${PREFIX}/etc/sane.d/epkowa.conf - @echo "epkowa" >> ${PREFIX}/etc/sane.d/dll.conf + ${STAGEDIR}${PREFIX}/lib/sane/ + @(cd ${STAGEDIR}${PREFIX}/lib/sane; ${LN} -s libsane-epkowa.so.1 libsane-epkowa.so ) + @echo "usb /dev/uscanner0" > ${STAGEDIR}${PREFIX}/etc/sane.d/epkowa.conf.sample .include Modified: head/graphics/sane-epkowa/pkg-plist ============================================================================== --- head/graphics/sane-epkowa/pkg-plist Mon Jul 28 21:54:33 2014 (r363261) +++ head/graphics/sane-epkowa/pkg-plist Fri Jan 15 05:39:45 2016 (r406133) @@ -1,4 +1,7 @@ -etc/sane.d/epkowa.conf lib/sane/libsane-epkowa.so lib/sane/libsane-epkowa.so.1 -@unexec sed -i "" -e '/^epkowa$/d' %D/etc/sane.d/dll.conf +man/man5/sane-epkowa.5.gz +@postexec echo "epkowa" >> %D/etc/sane.d/dll.conf +@postexec echo "usb /dev/uscanner0" > %D/etc/sane.d/epkowa.conf.sample +@preunexec sed -i "" -e '/^epkowa$/d' %D/etc/sane.d/dll.conf +@sample etc/sane.d/epkowa.conf.sample