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

Update to hplip-3.16.11.

Browse Source
This commit is contained in:
ajacoutot 2016-11-26 09:48:11 +00:00
parent b8d601770d
commit 4390e86c36
5 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.149 2016/11/14 15:29:24 dcoppa Exp $
# $OpenBSD: Makefile,v 1.150 2016/11/26 09:48:11 ajacoutot Exp $
PORTROACH= skipv:${V}_py2.5
@ -9,7 +9,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.16.10
V= 3.16.11
DISTNAME= hplip-${V}
SUBST_VARS= V
@ -20,9 +20,6 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 0
REVISION-hpijs= 0
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud 2.0 # 0.6
SHARED_LIBS += hpipp 0.0 # 0.1

4
print/hplip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hplip-3.16.10.tar.gz) = RbROAzT3YGlRGwsqQIhaEtBVATvJWmIlDeXRq8EN7oQ=
SIZE (hplip-3.16.10.tar.gz) = 23096030
SHA256 (hplip-3.16.11.tar.gz) = 9uIMrLSJHk5g/F3iIToQ+NDGiED5tRGqOM/KDLKfmyQ=
SIZE (hplip-3.16.11.tar.gz) = 23096060

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
--- Makefile.in.orig Fri Oct 21 12:49:06 2016
+++ Makefile.in Thu Oct 27 10:27:48 2016
@@ -104,7 +104,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1)
$OpenBSD: patch-Makefile_in,v 1.48 2016/11/26 09:48:11 ajacoutot Exp $
--- Makefile.in.orig Wed Nov 23 07:03:46 2016
+++ Makefile.in Sat Nov 26 10:36:53 2016
@@ -95,7 +95,7 @@ DIST_COMMON = $(am__configure_deps) \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_5 = io/hpmud/musb_libusb01.c
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_6 = -lusb
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = io/hpmud/musb.c
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb-1.0
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_10 = -Iprotocol/discovery
@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_11 = -l$(SNMPLIB) -lcrypto
@@ -130,7 +130,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1)
@@ -121,7 +121,7 @@ DIST_COMMON = $(am__configure_deps) \
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_15 = libhpipp.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_16 = libhpdiscovery.la
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_17 = -Iprotocol/discovery
@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_19 = 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 \
@@ -4888,13 +4888,13 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4772,13 +4772,13 @@ 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
@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(DBUS_CFLAGS) -Iprotocol \
@@ -4910,7 +4910,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4794,7 +4794,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@ -DCONFDIR=\"$(hplip_confdir)\" -Iprotocol \
@HPLIP_BUILD_TRUE@ $(am__append_8) $(am__append_10)
@HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \
@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
@HPLIP_BUILD_TRUE@ $(am__append_11)
@HPLIP_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c \
@HPLIP_BUILD_TRUE@ io/hpmud/mlc.c io/hpmud/model.c \
@@ -4951,7 +4951,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4835,7 +4835,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -53,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 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)
@@ -5156,7 +5156,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -5040,7 +5040,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)
@ -62,7 +62,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -5221,8 +5221,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5105,8 +5105,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)
@ -73,7 +73,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
# hpcups
#if NEW_HPCUPS
@@ -5262,7 +5262,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5146,7 +5146,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)
@ -82,7 +82,7 @@ $OpenBSD: patch-Makefile_in,v 1.47 2016/10/27 08:35:26 ajacoutot Exp $
#else
#hpcupsdir = $(cupsfilterdir)
@@ -5271,15 +5271,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5155,15 +5155,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.19 2016/10/27 08:35:26 ajacoutot Exp $
--- configure.orig Fri Oct 21 12:49:07 2016
+++ configure Thu Oct 27 10:27:48 2016
@@ -12157,6 +12157,11 @@ else
$OpenBSD: patch-configure,v 1.20 2016/11/26 09:48:11 ajacoutot Exp $
--- configure.orig Wed Nov 23 07:03:46 2016
+++ configure Sat Nov 26 10:36:54 2016
@@ -11421,6 +11421,11 @@ else
lt_cv_dlopen_libs=
;;
@ -11,9 +11,9 @@ $OpenBSD: patch-configure,v 1.19 2016/10/27 08:35:26 ajacoutot Exp $
+ ;;
+
darwin*)
# if libdl is installed we need to link against it
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
@@ -16222,50 +16227,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
@@ -15359,50 +15364,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

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-hpijs,v 1.52 2016/11/14 12:58:23 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpijs,v 1.53 2016/11/26 09:48:11 ajacoutot Exp $
@conflict hplip-libs-<=3.9.8
@conflict hpcups-<=3.2.11
@pkgpath print/hpijs
@ -620,6 +620,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1005-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m101-m106-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1319f_mfp-hpijs.ppd.gz
@ -656,6 +657,7 @@ 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_m129-m134-hpijs.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
@ -709,6 +711,7 @@ 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_m203_m206-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_m501dn-ps.ppd.gz
@ -730,6 +733,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz