Date: Tue, 19 Feb 2013 11:30:54 +0000 From: Max Brazhnikov <makc@freebsd.org> To: freebsd-ports-bugs@freebsd.org, Anish Mistry <amistry@unitedware.com> Subject: Re: ports/173826: New Port: print/hplip-plugin Message-ID: <2565010.8VBY5kcWbz@mercury.ph.man.ac.uk> In-Reply-To: <201212101934.qBAJYvM2098384@freefall.freebsd.org> References: <201212101934.qBAJYvM2098384@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --nextPart1871288.O6AWpuW1BX Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Hi Anish, I've made a couple amendment to the port (see the patch), and there's one issue I want to discuss before committing the port. hplip-plugin installs linux binaries for i386 and amd64. Since FreeBSD linuxolator supports only i386, amd64 version of plugins are useless now. But I'm also not sure about i386 binaries, do they really work with hplip compiled from ports? Sorry for belated response, Max --nextPart1871288.O6AWpuW1BX Content-Disposition: attachment; filename="hplip-plugin.diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="hplip-plugin.diff" diff -ruN --exclude=.svn --exclude=CVS hplip-plugin.orig/Makefile hplip-plugin/Makefile --- hplip-plugin.orig/Makefile 2013-02-19 11:11:52.521721438 +0000 +++ hplip-plugin/Makefile 2012-12-12 19:11:39.360782726 +0000 @@ -1,15 +1,11 @@ -# New ports collection makefile for: hplip-plugin -# Date created: 21 November 2012 -# Whom: amistry@am-productions.biz -# +# Created by: amistry@am-productions.biz # $FreeBSD$ -# PORTNAME= hplip-plugin -PORTVERSION= 3.12.10a +PORTVERSION= 3.12.11 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/ -DISTNAME= hplip-3.12.10a-plugin +DISTNAME= hplip-${DISTVERSION}-plugin EXTRACT_SUFX= .run MAINTAINER= amistry@am-productions.biz @@ -18,21 +14,19 @@ RUN_DEPENDS= hp-plugin:${PORTSDIR}/print/hplip USE_PYTHON= 2.5+ - +NO_BUILD= yes +RESTRICTED= User must accept the license terms for the plugin +NO_PACKAGE= ${RESTRICTED} WRKSRC= ${WRKDIR}/plugin_tmp -MAKE_JOBS_SAFE= yes - -FILES4FIX= hplip-plugin-install \ - plugin_install.py ONLY_FOR_ARCHS= amd64 i386 -.include <bsd.port.pre.mk> - .if !defined(PACKAGE_BUILDING) IS_INTERACTIVE= yes .endif +.include <bsd.port.pre.mk> + .if ${ARCH} == "i386" PLIST_SUB+= LINARCH="x86_32" .elif ${ARCH} == "amd64" @@ -46,14 +40,18 @@ && ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} --keep --noexec post-patch: - ${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \ +.if defined(PACKAGE_BUILDING) + ${REINPLACE_CMD} -e 's|ok, ans = tui.enter_yes_no.*|ok, ans = 1, 1|' \ + ${WRKSRC}/plugin_install.py +.endif + ${REINPLACE_CMD} -e 's,/etc/hp,${LOCALBASE}&,g' \ + ${WRKSRC}/plugin_install.py + ${REINPLACE_CMD} -e 's,python,${PYTHON_CMD} -B,' \ -e 's,/bin/bash,/bin/sh,g' \ - ${FILES4FIX:S,^,${WRKSRC}/,} - -do-build: + ${WRKSRC}/hplip-plugin-install do-install: - if ! (cd ${WRKSRC} && ./${PORTNAME}-install -i); \ + if ! (cd ${WRKSRC} && ./hplip-plugin-install -i); \ then \ exit 1; \ fi diff -ruN --exclude=.svn --exclude=CVS hplip-plugin.orig/distinfo hplip-plugin/distinfo --- hplip-plugin.orig/distinfo 2013-02-19 11:11:52.528723833 +0000 +++ hplip-plugin/distinfo 2012-12-11 21:51:18.413025308 +0000 @@ -1,2 +1,2 @@ -SHA256 (hplip-3.12.10a-plugin.run) = eaaa99f702398620f84e7c354c0d5928ba8e20eb0ee526c4cf79549231aa8af6 -SIZE (hplip-3.12.10a-plugin.run) = 1808039 +SHA256 (hplip-3.12.11-plugin.run) = de7d2b5cc2e90b27d540685ab9e4855f6205ba52ac1366d4ef672c2a3b4d2e65 +SIZE (hplip-3.12.11-plugin.run) = 1809130 diff -ruN --exclude=.svn --exclude=CVS hplip-plugin.orig/files/patch-plugin.spec hplip-plugin/files/patch-plugin.spec --- hplip-plugin.orig/files/patch-plugin.spec 1970-01-01 00:00:00.000000000 +0000 +++ hplip-plugin/files/patch-plugin.spec 2012-12-12 17:36:08.827787218 +0000 @@ -0,0 +1,15 @@ +--- ./plugin.spec.orig 2012-11-20 10:02:02.000000000 +0000 ++++ ./plugin.spec 2012-12-12 17:36:01.442783843 +0000 +@@ -135,12 +135,8 @@ + link=$HOMEDIR/prnt/plugins/ij.so + + [rules] +-src=data/rules/86-hpmud-$PRODUCT.rules +-trg=$RULESDIR/86-hpmud-$PRODUCT.rules + + [rules_alt] +-src=data/rules/86-hpmud-sysfs_$PRODUCT.rules +-trg=$RULESDIR/86-hpmud-$PRODUCT.rules + + [license] + src=prnt/plugins/license.txt diff -ruN --exclude=.svn --exclude=CVS hplip-plugin.orig/pkg-descr hplip-plugin/pkg-descr --- hplip-plugin.orig/pkg-descr 2013-02-19 11:11:52.518723401 +0000 +++ hplip-plugin/pkg-descr 2012-12-11 22:49:06.618023288 +0000 @@ -1,3 +1,3 @@ -Binary drivers from some HPLIP supported printers. +Firmware and binary drivers from some HPLIP supported printers. WWW: http://hplipopensource.com/hplip-web/index.html --nextPart1871288.O6AWpuW1BX--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2565010.8VBY5kcWbz>