From 394b25975044d743e2882379ded09c757f609fc9 Mon Sep 17 00:00:00 2001 From: khorben Date: Thu, 27 Aug 2015 23:53:24 +0000 Subject: Import a few fixes to print/hplip These changes: - fix paths for /etc and /var after those of Python installer files - while there, fix paths in additional files - locate libraries on systems without ldconfig(8) This is particularly relevant for some of the tools installed, like hp-check (which still doesn't complete). With these changes, I can print again with my M276n printer. --- print/hplip/Makefile | 50 ++++++++++++++------------- print/hplip/distinfo | 7 ++-- print/hplip/patches/patch-aa | 10 +++--- print/hplip/patches/patch-ae | 8 ++--- print/hplip/patches/patch-installer_dcheck.py | 17 +++++++++ 5 files changed, 56 insertions(+), 36 deletions(-) create mode 100644 print/hplip/patches/patch-installer_dcheck.py (limited to 'print') diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 4fc86cf231b..43548d17108 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2015/08/16 22:00:38 leot Exp $ +# $NetBSD: Makefile,v 1.46 2015/08/27 23:53:24 khorben Exp $ DISTNAME= hplip-3.15.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} @@ -90,31 +90,33 @@ SUBST_SED.fix-paths-0= -e 's,run=/var/run,run=${VARBASE}/run,g' SUBST_CLASSES+= fix-paths-1 SUBST_STAGE.fix-paths-1= post-configure -SUBST_MESSAGE.fix-paths-1= Fixing /etc and /var paths in Python and C++ files. -SUBST_FILES.fix-paths-1= check.py base/codes.py base/g.py base/utils.py -SUBST_FILES.fix-paths-1+= installer/core_install.py -SUBST_FILES.fix-paths-1+= fax/backend/hpfax.py prnt/cups.py -SUBST_FILES.fix-paths-1+= ui/devmgr4.py ui4/devmgr5.py -SUBST_FILES.fix-paths-1+= prnt/filters/hpps -SUBST_FILES.fix-paths-1+= prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp -SUBST_FILES.fix-paths-1+= prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp -SUBST_FILES.fix-paths-1+= prnt/hpijs/hpijs.cpp -SUBST_SED.fix-paths-1= -e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g' -SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g' -SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g' -SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g' -SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g' -SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g' +SUBST_MESSAGE.fix-paths-1= Fixing paths in Python installer files. +SUBST_FILES.fix-paths-1= installer/core_install.py +SUBST_FILES.fix-paths-1+= installer/dcheck.py +SUBST_SED.fix-paths-1= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g' +SUBST_SED.fix-paths-1+= -e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g' +SUBST_SED.fix-paths-1+= -e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g' +SUBST_SED.fix-paths-1+= -e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g' +SUBST_SED.fix-paths-1+= -e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g' SUBST_CLASSES+= fix-paths-2 SUBST_STAGE.fix-paths-2= post-configure -SUBST_MESSAGE.fix-paths-2= Fixing additional paths in installer/core_install.py. -SUBST_FILES.fix-paths-2= installer/core_install.py -SUBST_SED.fix-paths-2= -e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g' -SUBST_SED.fix-paths-2+= -e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g' -SUBST_SED.fix-paths-2+= -e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g' -SUBST_SED.fix-paths-2+= -e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g' -SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g' +SUBST_MESSAGE.fix-paths-2= Fixing /etc and /var paths in Python and C++ files. +SUBST_FILES.fix-paths-2= check.py base/codes.py base/g.py base/utils.py +SUBST_FILES.fix-paths-2+= base/codes.py base/g.py base/queues.py base/utils.py +SUBST_FILES.fix-paths-2+= installer/core_install.py +SUBST_FILES.fix-paths-2+= fax/backend/hpfax.py prnt/cups.py +SUBST_FILES.fix-paths-2+= ui/devmgr4.py ui4/devmgr5.py +SUBST_FILES.fix-paths-2+= prnt/filters/hpps +SUBST_FILES.fix-paths-2+= prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp +SUBST_FILES.fix-paths-2+= prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp +SUBST_FILES.fix-paths-2+= prnt/hpijs/hpijs.cpp +SUBST_SED.fix-paths-2= -e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g' +SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g' +SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g' +SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g' +SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g' +SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g' SUBST_CLASSES+= fix-paths-3 SUBST_STAGE.fix-paths-3= post-configure diff --git a/print/hplip/distinfo b/print/hplip/distinfo index e7cc5fc9c30..52eb3a332fb 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.18 2015/08/14 19:45:29 schnoebe Exp $ +$NetBSD: distinfo,v 1.19 2015/08/27 23:53:24 khorben Exp $ SHA1 (hplip-3.15.7.tar.gz) = f84e33b749ef34939c11b253767686c00ca2c30c RMD160 (hplip-3.15.7.tar.gz) = b8f5b9be838ed9261cb208df46b5aa7ef6680e31 Size (hplip-3.15.7.tar.gz) = 21979938 bytes -SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e +SHA1 (patch-aa) = 8eb162708a48e9b1720245f65f01177418a4ed85 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462 -SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7 +SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605 +SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb diff --git a/print/hplip/patches/patch-aa b/print/hplip/patches/patch-aa index 1ea1950b438..96f6c654063 100644 --- a/print/hplip/patches/patch-aa +++ b/print/hplip/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $ +$NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $ # lots of portability changes to configure.in, removing hard-coded paths # and pulling in the dynamic library loading modules.. # pushed upstream as https://bugs.launchpad.net/hplip/+bug/726207 ---- configure.in.orig 2013-10-11 09:40:26.000000000 +0000 +--- configure.in.orig 2015-06-07 19:25:40.000000000 +0000 +++ configure.in @@ -34,14 +34,15 @@ AC_DISABLE_STATIC # Checks for programs. @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $ # Checks for required header files. AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)]) -@@ -324,25 +325,25 @@ else +@@ -316,25 +317,25 @@ else fi AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes) @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $ fi AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]), mimedir=$withval, mimedir="$abs_mimedir") -@@ -471,12 +472,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x +@@ -467,12 +468,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x # Determine where the PolicyKit policy file goes if test "$policykit" = "yes"; then @@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $ fi else policykit_dir= -@@ -582,6 +583,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir]) +@@ -581,6 +582,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir]) AC_DEFINE_DIR([abs_hpppddir], [hpppddir]) AC_DEFINE_DIR([abs_docdir], [hpdocdir]) AC_DEFINE_DIR([abs_htmldir], [hphtmldir]) diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae index bdb1f116138..07f9de24245 100644 --- a/print/hplip/patches/patch-ae +++ b/print/hplip/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $ +$NetBSD: patch-ae,v 1.9 2015/08/27 23:53:24 khorben Exp $ # Conform to autoconf's standard variable usage, making it easier # to install on pkgsrc platforms @@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $ # still needs to handle the buildlink path for libusb-1.0 :( # schnoebe -- Fri May 24 14:55:57 CDT 2013 ---- Makefile.am.orig 2013-10-11 09:40:14.000000000 +0000 +--- Makefile.am.orig 2015-06-07 19:25:33.000000000 +0000 +++ Makefile.am @@ -105,22 +105,22 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x @@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $ dist_hplip_state_DATA = if FULL_BUILD -@@ -344,9 +344,9 @@ endif +@@ -359,9 +359,9 @@ endif # PolicyKit if POLICYKIT_INSTALL @@ -58,7 +58,7 @@ $NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $ dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service policykit_policydir = $(policykit_dir) dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy -@@ -525,13 +525,13 @@ install-data-hook: +@@ -541,13 +541,13 @@ install-data-hook: if HPLIP_BUILD # If scanner build, add hpaio entry to sane dll.conf. if [ "$(scan_build)" = "yes" ]; then \ diff --git a/print/hplip/patches/patch-installer_dcheck.py b/print/hplip/patches/patch-installer_dcheck.py new file mode 100644 index 00000000000..f2b33a7af84 --- /dev/null +++ b/print/hplip/patches/patch-installer_dcheck.py @@ -0,0 +1,17 @@ +$NetBSD: patch-installer_dcheck.py,v 1.1 2015/08/27 23:53:24 khorben Exp $ + +Locate libraries on systems without ldconfig(8) + +This only looks for libraries in pkgsrc's own library folder. + +--- installer/dcheck.py.orig 2015-06-07 19:25:11.000000000 +0000 ++++ installer/dcheck.py +@@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0): + # pass + #else: + return True ++ elif check_file(lib+".so","/usr/lib"): ++ return True + else: + log.debug("Not found.") + return False -- cgit v1.2.3