cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to hplip-3.15.11.

Browse Source
This commit is contained in:
ajacoutot 2015-11-17 08:57:45 +00:00
parent 5c3346e489
commit 50e768dee1
11 changed files with 112 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.134 2015/10/09 18:21:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.135 2015/11/17 08:57:45 ajacoutot Exp $
PORTROACH= skipv:${V}_py2.5
@ -11,7 +11,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.15.9
V= 3.15.11
DISTNAME= hplip-${V}
SUBST_VARS= V
@ -22,8 +22,7 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-hpaio= 0
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud 2.0 # 0.6
SHARED_LIBS += hpipp 0.0 # 0.1
SHARED_LIBS += hpip 2.0 # 0.1
@ -52,7 +51,7 @@ cWANTLIB += crypto m pthread
WANTLIB-main += ${WANTLIB} ${cWANTLIB}
WANTLIB-main += avahi-client avahi-common cups dbus-1 hpmud netsnmp
WANTLIB-main += ffi gmp gnutls hogweed nettle p11-kit tasn1 usb-1.0 z
WANTLIB-main += hpipp
WANTLIB-main += hpdiscovery hpipp
LIB_DEPENDS-main= ${LIB_DEPENDS} \
print/cups,-libs \
@ -82,7 +81,7 @@ RUN_DEPENDS-common= #empty
WANTLIB-hpaio += ${WANTLIB} ${cWANTLIB}
WANTLIB-hpaio += avahi-client avahi-common cups dbus-1 ffi gmp gnutls
WANTLIB-hpaio += hogweed hpip hpipp hpmud jpeg netsnmp nettle p11-kit
WANTLIB-hpaio += sane tasn1 tiff usb usb-1.0 z
WANTLIB-hpaio += sane tasn1 tiff usb usb-1.0 z hpdiscovery
LIB_DEPENDS-hpaio= print/hplip,-common \
print/cups,-libs \
@ -91,7 +90,7 @@ LIB_DEPENDS-hpaio= print/hplip,-common \
RUN_DEPENDS-hpaio= ${MODGETTEXT_RUN_DEPENDS}
### -hpcups
WANTLIB-hpcups += ${WANTLIB} ${cWANTLIB} z netsnmp
WANTLIB-hpcups += ${WANTLIB} ${cWANTLIB} z netsnmp hpdiscovery
WANTLIB-hpcups += c jpeg stdc++ hpip cups cupsimage dbus-1
WANTLIB-hpcups += z usb-1.0 avahi-client avahi-common hpmud
WANTLIB-hpcups += ffi gmp gnutls hogweed nettle p11-kit tasn1
@ -104,7 +103,7 @@ LIB_DEPENDS-hpcups= graphics/jpeg \
RUN_DEPENDS-hpcups= ${MODGETTEXT_RUN_DEPENDS}
### -hpijs
WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0
WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0 hpdiscovery
WANTLIB-hpijs += c jpeg netsnmp stdc++ dbus-1 hpmud
LIB_DEPENDS-hpijs= print/hplip,-common \

4
print/hplip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hplip-3.15.9.tar.gz) = ofWP6HBzc8GTcop/2CZSPpnDDjyn9mD6p1UxrN/4nW0=
SIZE (hplip-3.15.9.tar.gz) = 22027325
SHA256 (hplip-3.15.11.tar.gz) = M8RxG94Eo0uB8/cOYnegN13e0XFGnlqouc7xoUpAfG0=
SIZE (hplip-3.15.11.tar.gz) = 22277756

80
print/hplip/patches/patch-Makefile_in
View File

@ -1,36 +1,47 @@
$OpenBSD: patch-Makefile_in,v 1.39 2015/09/16 06:25:39 ajacoutot Exp $
--- Makefile.in.orig Mon Sep 14 15:42:57 2015
+++ Makefile.in Wed Sep 16 08:18:18 2015
@@ -4586,16 +4586,16 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h
$OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
--- Makefile.in.orig Thu Nov 12 11:30:23 2015
+++ Makefile.in Tue Nov 17 09:26:50 2015
@@ -92,7 +92,7 @@ DIST_COMMON = $(am__configure_deps) \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_3 = io/hpmud/musb_libusb01.c
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_4 = -lusb
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_5 = io/hpmud/musb.c
-@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_6 = -I/usr/include/libusb-1.0
+@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_6 = -I${LOCALBASE}/include/libusb-1.0
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = -lusb-1.0
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_8 = -l$(SNMPLIB) -lcrypto
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_9 = \
@@ -115,7 +115,7 @@ DIST_COMMON = $(am__configure_deps) \
# IPP library
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_12 = libhpipp.la
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_13 = -I/usr/include/libusb-1.0
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_13 = -I${LOCALBASE}/include/libusb-1.0
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_14 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
@@ -4663,10 +4663,10 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c
-@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -avoid-version
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol
# hpmud library
@HPLIP_BUILD_TRUE@MUDNAME = hpmud
-@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_CFLAGS = -I${LOCALBASE}/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
@@ -4608,7 +4608,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ common/utils.c common/utils.h
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol -Iprotocol/discovery
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h
@@ -4680,7 +4680,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@ -DCONFDIR=\"$(hplip_confdir)\" -Iprotocol \
@HPLIP_BUILD_TRUE@ -Iprotocol/discovery $(am__append_6)
@HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \
-@HPLIP_BUILD_TRUE@ -ldl $(am__append_2) $(am__append_3) \
+@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) \
@HPLIP_BUILD_TRUE@ $(am__append_4)
@HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -version-info 0:1:0
@HPLIP_BUILD_TRUE@libhpip_la_LIBADD = -lm
@@ -4638,7 +4638,7 @@ cups_drv = prnt/drv/hpcups.drv
-@HPLIP_BUILD_TRUE@ -ldl $(am__append_4) $(am__append_7) \
+@HPLIP_BUILD_TRUE@ $(am__append_4) $(am__append_7) \
@HPLIP_BUILD_TRUE@ $(am__append_8)
@HPLIP_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c \
@HPLIP_BUILD_TRUE@ io/hpmud/mlc.c io/hpmud/model.c \
@@ -4721,7 +4721,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -39,16 +50,7 @@ $OpenBSD: patch-Makefile_in,v 1.39 2015/09/16 06:25:39 ajacoutot Exp $
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
@@ -4770,7 +4770,7 @@ cups_drv = prnt/drv/hpcups.drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LDFLAGS = -module -avoid-version
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_SOURCES = io/mudext/hpmudext.c
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@hpmudext_la_CFLAGS = -I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@hpmudext_la_CFLAGS = -I${LOCALBASE}/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
# ui (qt3)
@@ -4822,7 +4822,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4917,7 +4917,7 @@ cups_drv = prnt/drv/hpcups.drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@ -57,7 +59,7 @@ $OpenBSD: patch-Makefile_in,v 1.39 2015/09/16 06:25:39 ajacoutot Exp $
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4887,8 +4887,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4982,8 +4982,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@ -68,7 +70,7 @@ $OpenBSD: patch-Makefile_in,v 1.39 2015/09/16 06:25:39 ajacoutot Exp $
# hpcups
#if NEW_HPCUPS
@@ -4928,7 +4928,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5023,7 +5023,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -77,7 +79,7 @@ $OpenBSD: patch-Makefile_in,v 1.39 2015/09/16 06:25:39 ajacoutot Exp $
#else
#hpcupsdir = $(cupsfilterdir)
@@ -4937,15 +4937,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5032,15 +5032,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD

10
print/hplip/patches/patch-common_utils_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_utils_h,v 1.2 2015/04/17 04:18:13 ajacoutot Exp $
--- common/utils.h.orig Tue Apr 14 11:53:06 2015
+++ common/utils.h Fri Apr 17 05:53:22 2015
@@ -23,7 +23,7 @@
#define SCAN_PLUGIN_SOAP "bb_soap.so"
$OpenBSD: patch-common_utils_h,v 1.3 2015/11/17 08:57:45 ajacoutot Exp $
--- common/utils.h.orig Thu Nov 12 11:28:47 2015
+++ common/utils.h Tue Nov 17 09:23:50 2015
@@ -24,7 +24,7 @@
#define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
#define SCAN_PLUGIN_ESCL "bb_escl.so"
-#define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state"
+#define HPLIP_PLUGIN_STATE "/var/db/hp/hplip.state"

10
print/hplip/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.14 2014/03/13 22:37:27 ajacoutot Exp $
--- configure.orig Thu Mar 6 06:11:19 2014
+++ configure Thu Mar 13 23:24:11 2014
@@ -11406,6 +11406,11 @@ else
$OpenBSD: patch-configure,v 1.15 2015/11/17 08:57:45 ajacoutot Exp $
--- configure.orig Thu Nov 12 11:30:24 2015
+++ configure Tue Nov 17 09:23:50 2015
@@ -11415,6 +11415,11 @@ else
lt_cv_dlopen_libs=
;;
@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.14 2014/03/13 22:37:27 ajacoutot Exp $
darwin*)
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
@@ -15344,50 +15349,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
@@ -15353,50 +15358,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
else
as_fn_error 102 "\"cannot find libjpeg support\"" "$LINENO" 5
fi

38
print/hplip/patches/patch-installer_core_install_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot Exp $
--- installer/core_install.py.orig Sun Jun 7 21:25:11 2015
+++ installer/core_install.py Thu Jun 11 08:15:21 2015
$OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot Exp $
--- installer/core_install.py.orig Thu Nov 12 11:28:50 2015
+++ installer/core_install.py Tue Nov 17 09:23:50 2015
@@ -110,7 +110,7 @@ HPLIP_LIST=['*.py','*.pyc', 'base', 'copier','data','i
PLUGIN_LIST=['fax/plugins/','prnt/plugins/','scan/plugins/']
@ -10,7 +10,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
# end
@@ -218,7 +218,7 @@ class CoreInstall(object):
@@ -225,7 +225,7 @@ class CoreInstall(object):
self.endian = utils.LITTLE_ENDIAN
self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
self.distro_version_supported = False
@ -19,7 +19,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
self.hplip_present = False
self.have_dependencies = {}
self.native_cups = True
@@ -327,7 +327,7 @@ class CoreInstall(object):
@@ -335,7 +335,7 @@ class CoreInstall(object):
'cups-devel': (True, ['base'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
'cups-image': (True, ['base'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP),
'gcc' : (True, ['base'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-','gcc --version',COMPILEDEP),
@ -28,7 +28,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
'libpthread' : (True, ['base'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libpthread_version', GENERALDEP),
'gs': (True, ['base'], GS_STR, self.check_gs, DEPENDENCY_RUN_TIME, '7.05','gs --version', EXTERNALDEP),
'libusb': (True, ['base'], USB_STR, self.check_libusb, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libusb_version', GENERALDEP),
@@ -358,13 +358,13 @@ class CoreInstall(object):
@@ -366,13 +366,13 @@ class CoreInstall(object):
}
python2_dep = {
@ -44,7 +44,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
'pil': (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME,'-','FUNC#get_pil_version',GENERALDEP),
# Optional fax packages
'reportlab': (False, ['fax'], REPORTLAB_STR, self.check_reportlab, DEPENDENCY_RUN_TIME,'2.0','FUNC#get_reportlab_version',GENERALDEP),
@@ -838,7 +838,7 @@ class CoreInstall(object):
@@ -846,7 +846,7 @@ class CoreInstall(object):
def check_make(self):
@ -53,7 +53,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_libusb(self):
@@ -847,14 +847,14 @@ class CoreInstall(object):
@@ -855,14 +855,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -70,7 +70,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
else:
return True
@@ -864,11 +864,10 @@ class CoreInstall(object):
@@ -872,11 +872,10 @@ class CoreInstall(object):
def check_libcrypto(self):
@ -84,7 +84,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_libnetsnmp(self):
@@ -914,7 +913,7 @@ class CoreInstall(object):
@@ -922,7 +921,7 @@ class CoreInstall(object):
def check_sane_devel(self):
@ -93,7 +93,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_xsane(self):
@@ -971,7 +970,7 @@ class CoreInstall(object):
@@ -979,7 +978,7 @@ class CoreInstall(object):
def check_python_devel(self):
@ -102,7 +102,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
Found = False
for p in dir_list:
if check_file('Python.h',dir=p):
@@ -1025,9 +1024,8 @@ class CoreInstall(object):
@@ -1033,9 +1032,8 @@ class CoreInstall(object):
def check_dbus(self):
@ -114,7 +114,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_cups_devel(self):
@@ -1045,12 +1043,12 @@ class CoreInstall(object):
@@ -1053,12 +1051,12 @@ class CoreInstall(object):
def check_cups_image(self):
@ -129,7 +129,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_libtool(self):
@@ -1070,7 +1068,7 @@ class CoreInstall(object):
@@ -1078,7 +1076,7 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
@ -138,7 +138,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
@@ -1121,7 +1119,7 @@ class CoreInstall(object):
@@ -1129,7 +1127,7 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
@ -147,7 +147,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
log.debug("'Checking for hpaio' in '%s'..." % path)
try:
f = open(path, 'r')
@@ -1150,12 +1148,12 @@ class CoreInstall(object):
@@ -1158,12 +1156,12 @@ class CoreInstall(object):
if pat.match(home_dir) is not None:
usrlib_dir= pat.match(home_dir).group(1) + "lib/"
if os.path.exists(usrlib_dir+'sane/libsane-hpaio.so.1'):
@ -164,7 +164,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
log.debug("cmd=%s"%cmd)
utils.run(cmd, self.passwordObj)
else:
@@ -1168,19 +1166,19 @@ class CoreInstall(object):
@@ -1176,19 +1174,19 @@ class CoreInstall(object):
f.close()
if not found:
@ -189,7 +189,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
cmd= self.passwordObj.getAuthCmd()%cmd
log.debug("cmd=%s"%cmd)
utils.run(cmd, self.passwordObj)
@@ -1573,11 +1571,14 @@ class CoreInstall(object):
@@ -1610,11 +1608,14 @@ class CoreInstall(object):
def check_wget(self):
@ -208,7 +208,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.24 2015/06/11 06:25:07 ajacoutot E
def check_avahi_utils(self):
if utils.which("avahi-browse"):
@@ -1663,7 +1664,7 @@ class CoreInstall(object):
@@ -1700,7 +1701,7 @@ class CoreInstall(object):
def pre_build(self,distro_ver=None):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False,distro_ver):

10
print/hplip/patches/patch-io_hpmud_musb_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-io_hpmud_musb_c,v 1.9 2015/04/17 04:18:13 ajacoutot Exp $
$OpenBSD: patch-io_hpmud_musb_c,v 1.10 2015/11/17 08:57:45 ajacoutot Exp $
backwards memcpy
--- io/hpmud/musb.c.orig Tue Apr 14 11:53:07 2015
+++ io/hpmud/musb.c Fri Apr 17 05:54:22 2015
@@ -770,7 +770,7 @@ static int device_id(int fd, unsigned char *buffer, in
--- io/hpmud/musb.c.orig Thu Nov 12 11:29:02 2015
+++ io/hpmud/musb.c Tue Nov 17 09:23:50 2015
@@ -774,7 +774,7 @@ static int device_id(int fd, unsigned char *buffer, in
len = size-1; /* leave byte for zero termination */
if (len > 2)
len -= 2;
@ -13,7 +13,7 @@ backwards memcpy
buffer[len]=0;
DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);
@@ -1256,7 +1256,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"
@@ -1261,7 +1261,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"
if (*len)
{

8
print/hplip/patches/patch-scan_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scan_py,v 1.13 2015/04/17 04:18:13 ajacoutot Exp $
--- scan.py.orig Tue Apr 14 11:53:21 2015
+++ scan.py Fri Apr 17 05:53:22 2015
@@ -1132,7 +1132,7 @@ try:
$OpenBSD: patch-scan_py,v 1.14 2015/11/17 08:57:45 ajacoutot Exp $
--- scan.py.orig Thu Nov 12 11:29:04 2015
+++ scan.py Tue Nov 17 09:23:50 2015
@@ -1143,7 +1143,7 @@ try:
elif d == 'print':
hp_print = utils.which("hp-print", True)
if not hp_print:

5
print/hplip/pkg/PLIST-common
View File

@ -1,10 +1,13 @@
@comment $OpenBSD: PLIST-common,v 1.4 2015/04/17 04:18:13 ajacoutot Exp $
@comment $OpenBSD: PLIST-common,v 1.5 2015/11/17 08:57:45 ajacoutot Exp $
@conflict hplip-libs-*
@conflict hplip-<3.13.7p4
@pkgpath print/hplip,-libs
@newgroup _cups:541
@extraunexec rm -rf /var/log/hp/tmp/*
@extraunexec rm -f /var/log/hp/* 2>/dev/null || true
lib/libhpdiscovery.a
lib/libhpdiscovery.la
@lib lib/libhpdiscovery.so.${LIBhpdiscovery_VERSION}
lib/libhpip.a
lib/libhpip.la
@lib lib/libhpip.so.${LIBhpip_VERSION}

4
print/hplip/pkg/PLIST-hpcups
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-hpcups,v 1.10 2013/09/22 19:00:42 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpcups,v 1.11 2015/11/17 08:57:45 ajacoutot Exp $
@conflict hpijs-<=3.2.11
@conflict hplip-<3.13.8p1
@bin libexec/cups/backend/hp
@mode 0700
@bin libexec/cups/backend/hp
libexec/cups/backend/hpfax
@mode
@bin libexec/cups/filter/hpcups

19
print/hplip/pkg/PLIST-hpijs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-hpijs,v 1.43 2015/09/16 06:25:39 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpijs,v 1.44 2015/11/17 08:57:45 ajacoutot Exp $
@conflict hplip-libs-<=3.9.8
@conflict hpcups-<=3.2.11
@pkgpath print/hpijs
@ -158,17 +158,23 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452d-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m552-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m553-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m651-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m750-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_m855-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-cp1160-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_4000ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-designjet_4020ps-ps.ppd.gz
@ -259,10 +265,15 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_3940-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_400-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_400l-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4510_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4530_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_460-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4610_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4620_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4640_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4670_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_4720_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5570_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_5640_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_500-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_500c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_505j-hpijs.ppd.gz
@ -630,6 +641,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m506-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m806-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
@ -638,7 +650,9 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m521-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m527-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m630-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_mfp_m725-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p1005-hpijs.ppd.gz
@ -689,6 +703,8 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p4515x-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m701-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m706-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz
@ -1022,3 +1038,4 @@ share/foomatic/db/source/PPD/HP/hp-psc_920-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-psc_950-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-psc_950vr-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-psc_950xi-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-scanjet_pro_3500_f1-hpijs.ppd.gz