mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-04 06:15:24 +00:00
- Update to 3.10.6
- Remove rc.d script (remains from hplip2, not used nowadays) and simplify pkg-message - Make fax and scanning support optional and off by default [1] - Respect PREFIX/LOCALBASE, other minor cleanups PR: ports/147346 [1] (based on) Submitted by: Christopher Petrik <chris at officialunix.com>
This commit is contained in:
parent
fb9211c207
commit
7f14679e6b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=260606
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= hplip
|
||||
PORTVERSION= 3.10.5
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 3.10.6
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= SF
|
||||
|
||||
@ -15,132 +14,156 @@ MAINTAINER= makc@FreeBSD.org
|
||||
COMMENT= Drivers and utilities for HP Printers and All-in-One devices
|
||||
|
||||
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
|
||||
sane.1:${PORTSDIR}/graphics/sane-backends \
|
||||
cupsdriver.1:${PORTSDIR}/print/cups-base \
|
||||
cups.2:${PORTSDIR}/print/cups-client \
|
||||
cupsimage.2:${PORTSDIR}/print/cups-image
|
||||
|
||||
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \
|
||||
espgs:${PORTSDIR}/print/cups-pstoraster \
|
||||
cupsimage.2:${PORTSDIR}/print/cups-image \
|
||||
dbus-1.3:${PORTSDIR}/devel/dbus
|
||||
RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster \
|
||||
foomatic-rip:${PORTSDIR}/print/foomatic-filters \
|
||||
mDNSClientPosix:${PORTSDIR}/net/mDNSResponder
|
||||
${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject \
|
||||
${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
|
||||
|
||||
LATEST_LINK= ${PORTNAME}3
|
||||
CONFLICTS= hpijs-[0-9]* hplip-2*
|
||||
CONFLICTS= hpijs-[0-9]*
|
||||
|
||||
USE_GHOSTSCRIPT_RUN= yes
|
||||
USE_PYTHON= 2.5+
|
||||
USE_GNOME= pkgconfig
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --disable-dependency-tracking \
|
||||
--disable-pp-build \
|
||||
--enable-foomatic-ppd-install \
|
||||
CONFIGURE_ARGS= --enable-foomatic-ppd-install \
|
||||
--enable-foomatic-rip-hplip-install \
|
||||
--enable-hpijs-install \
|
||||
--with-icondir=${LOCALBASE}/share/applications \
|
||||
--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
|
||||
--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
|
||||
--with-drvdir=${LOCALBASE}/libexec/cups/driver \
|
||||
--with-hpppddir=${LOCALBASE}/share/ppd/HP \
|
||||
--with-mimedir=${LOCALBASE}/etc/cups \
|
||||
--with-docdir=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
|
||||
--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
|
||||
--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
|
||||
--with-icondir=${DESKTOPDIR} \
|
||||
--with-systraydir=${PREFIX}/etc/xdg/autostart \
|
||||
--with-hpppddir=${PREFIX}/share/ppd/HP \
|
||||
--with-mimedir=${PREFIX}/etc/cups \
|
||||
--with-docdir=${DOCSDIR} \
|
||||
--with-drvdir=${PREFIX}/libexec/cups/driver
|
||||
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
USE_GHOSTSCRIPT_RUN= yes
|
||||
USE_PYTHON= 25+
|
||||
USE_RC_SUBR= hpssd
|
||||
MAKE_JOBS_SAFE= yes
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
USE_DOS2UNIX= yes
|
||||
DOS2UNIX_REGEX=.+\.(c|cpp|h|py)$
|
||||
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat
|
||||
FILES4FIX= Makefile.in \
|
||||
base/codes.py \
|
||||
base/g.py \
|
||||
base/pkit.py \
|
||||
base/status.py \
|
||||
base/utils.py \
|
||||
check.py \
|
||||
fax/backend/hpfax.py \
|
||||
hplip.list.in \
|
||||
installer/core_install.py \
|
||||
installer/dcheck.py \
|
||||
installer/distros.dat \
|
||||
io/hpmud/hp-mkuri.c \
|
||||
prnt/cups.py \
|
||||
prnt/hpcups/HPCupsFilter.cpp \
|
||||
prnt/hpcups/Utils.cpp \
|
||||
prnt/hpijs/globals.cpp \
|
||||
prnt/hpijs/hpcupsfax.cpp \
|
||||
prnt/hpijs/hpijs.cpp \
|
||||
setup.py \
|
||||
ui/devmgr4.py \
|
||||
ui/setupform.py \
|
||||
ui4/devmgr5.py
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
|
||||
OPTIONS= QT "Build QT4 gui" off \
|
||||
DBUS "D-Bus support (required for fax tools)" off \
|
||||
XSANE "Scanning support via XSane" off \
|
||||
SNMP "Support for Simple Network Management Protocol" off
|
||||
OPTIONS= QT "Graphical User Interface (Qt4)" on \
|
||||
FAX "PC Send Fax support" off \
|
||||
SNMP "Network/JetDirect support" off \
|
||||
SCAN "Scanning support" off \
|
||||
XSANE "Install XSane for scanning (requires SCAN)" off
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${OSVERSION} < 800069
|
||||
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SNMP) && (${ARCH} == i386)
|
||||
BROKEN= can't link with libsnmp, net-mgmt/net-snmp should be fixed first
|
||||
USB_INCLUDE= ${LOCALBASE}/include
|
||||
.else
|
||||
USB_INCLUDE= /usr/include
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_QT)
|
||||
USE_QT_VER= 4
|
||||
QT_COMPONENTS= gui
|
||||
CONFIGURE_ARGS+= --enable-qt4
|
||||
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
|
||||
LIB_DEPENDS+= pyglib-2.0:${PORTSDIR}/devel/py-gobject
|
||||
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
|
||||
${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
|
||||
CONFIGURE_ARGS+= --enable-qt4 \
|
||||
--enable-gui-build
|
||||
PLIST_SUB+= GUI=""
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4 \
|
||||
--disable-gui-build
|
||||
PLIST_SUB+= GUI="@comment "
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_DBUS)
|
||||
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
|
||||
${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
|
||||
LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
|
||||
# fax added as, no dbus no fax
|
||||
CONFIGURE_ARGS+= --enable-dbus-build \
|
||||
--enable-fax-build
|
||||
.if defined(WITH_FAX)
|
||||
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
|
||||
CONFIGURE_ARGS+= --enable-fax-build
|
||||
PLIST_SUB+= FAX=""
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-dbus-build \
|
||||
--disable-fax-build
|
||||
CONFIGURE_ARGS+= --disable-fax-build
|
||||
PLIST_SUB+= FAX="@comment "
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_XSANE)
|
||||
RUN_DEPENDS+= xsane:${PORTSDIR}/graphics/xsane
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SNMP)
|
||||
USE_OPENSSL= yes
|
||||
LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
|
||||
CONFIGURE_ARGS+= --enable-network-build
|
||||
. if ${ARCH} == i386
|
||||
# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144833
|
||||
CONFIGURE_ENV+= LIBS="-lssp_nonshared"
|
||||
. endif
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-network-build
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SCAN)
|
||||
. if defined(WITH_XSANE)
|
||||
RUN_DEPENDS+= xsane:${PORTSDIR}/graphics/xsane
|
||||
. endif
|
||||
LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends
|
||||
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
|
||||
CONFIGURE_ARGS+= --enable-scan-build
|
||||
PLIST_SUB+= SCAN=""
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-scan-build
|
||||
PLIST_SUB+= SCAN="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(NOPORTDOCS)
|
||||
CONFIGURE_ARGS+= --enable-doc-build=no
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|/etc/hp|${LOCALBASE}/etc/hp|g ; \
|
||||
s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g' \
|
||||
${WRKSRC}/Makefile.in \
|
||||
${WRKSRC}/check.py ${WRKSRC}/hpssd.py \
|
||||
${WRKSRC}/base/g.py ${WRKSRC}/fax/backend/hpfax.py \
|
||||
${WRKSRC}/installer/distros.dat \
|
||||
${WRKSRC}/installer/core_install.py \
|
||||
${WRKSRC}/prnt/hpijs/ljzjs.cpp \
|
||||
${WRKSRC}/prnt/hpijs/globals.cpp \
|
||||
${WRKSRC}/ui/devmgr4.py \
|
||||
${WRKSRC}/ui4/devmgr5.py
|
||||
@${REINPLACE_CMD} -e 's|/etc/dbus-1/system.d|${LOCALBASE}/etc/dbus-1/system.d|g ; \
|
||||
s|/usr/share/dbus-1/system-services|${LOCALBASE}/share/dbus-1/system-services|g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
@${REINPLACE_CMD} 's|/etc/xdg|${PREFIX}&|g; s|-lpthread|${PTHREAD_LIBS}|g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|install-dist_prntSCRIPTS install-dist_rulesDATA|install-dist_prntSCRIPTS|g ; \
|
||||
s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|-ldld||g; s|-ldl||g; s|-dld||g' \
|
||||
${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
|
||||
-e 's|-ldld||g; s|-ldl||g' \
|
||||
${WRKSRC}/configure \
|
||||
${WRKSRC}/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
|
||||
${WRKSRC}/hpssd.py
|
||||
${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
|
||||
-e '/[[:space:]]install-hplip_confDATA/ s,install-hplip_confDATA,,' \
|
||||
${WRKSRC}/Makefile.in
|
||||
${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \
|
||||
-e 's,/etc/cups,${LOCALBASE}&,g' \
|
||||
-e 's,/etc/init.d,${LOCALBASE}/etc/rc.d,g' \
|
||||
-e 's,/etc/sane.d,${LOCALBASE}&,g' \
|
||||
-e 's,/usr/share,${LOCALBASE}/share,g' \
|
||||
-e 's,/usr/include,${LOCALBASE}/include,g' \
|
||||
${FILES4FIX:S,^,${WRKSRC}/,}
|
||||
${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \
|
||||
${WRKSRC}/installer/core_install.py
|
||||
.if defined(NOPORTDOCS)
|
||||
@${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
|
||||
${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
|
||||
${WRKSRC}/Makefile.in
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd
|
||||
${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
|
||||
${MKDIR} ${PREFIX}/etc/hp
|
||||
${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample
|
||||
@ -148,7 +171,6 @@ post-install:
|
||||
${INSTALL_DATA} ${PREFIX}/etc/hp/hplip.conf.sample \
|
||||
${PREFIX}/etc/hp/hplip.conf; \
|
||||
fi
|
||||
${ECHO_CMD} hpaio >> ${PREFIX}/etc/sane.d/dll.conf
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (hplip-3.10.5.tar.gz) = a4a3679d5987520226ef70d834b63b88
|
||||
SHA256 (hplip-3.10.5.tar.gz) = 1701e32b01eb90ab5e90f301fb115ee4a8e3e48e4739c331230646d5b24dd4d3
|
||||
SIZE (hplip-3.10.5.tar.gz) = 21495175
|
||||
MD5 (hplip-3.10.6.tar.gz) = 96c36e3baf35e93cf9436a772f0c9ef4
|
||||
SHA256 (hplip-3.10.6.tar.gz) = 3ee0e68a613d2b966dcb6df9fd8e074c4c3e590249e61c0d792de3373b84fdeb
|
||||
SIZE (hplip-3.10.6.tar.gz) = 21577342
|
||||
|
@ -1,30 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# PROVIDE: hpssd
|
||||
# BEFORE: cupsd
|
||||
# KEYWORD: shutdown
|
||||
|
||||
. /etc/rc.subr
|
||||
|
||||
name=hpssd
|
||||
rcvar=${name}_enable
|
||||
|
||||
command="%%PREFIX%%/sbin/${name}"
|
||||
command_interpreter="%%PREFIX%%/bin/python"
|
||||
pidfile="/var/run/${name}.pid"
|
||||
hpssd_user=nobody
|
||||
command_args=">/dev/null"
|
||||
|
||||
start_precmd="hpssd_prestart"
|
||||
|
||||
load_rc_config $name
|
||||
|
||||
: ${hpssd_enable="NO"}
|
||||
|
||||
hpssd_prestart()
|
||||
{
|
||||
touch ${pidfile}
|
||||
chown ${hpssd_user} ${pidfile}
|
||||
}
|
||||
|
||||
run_rc_command $*
|
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.old 2010-03-28 15:07:10.000000000 -0600
|
||||
+++ Makefile.in 2010-03-28 15:08:01.000000000 -0600
|
||||
--- ./Makefile.in.orig 2010-07-19 06:20:23.000000000 +0400
|
||||
+++ ./Makefile.in 2010-08-27 00:58:13.822031467 +0400
|
||||
@@ -89,8 +89,8 @@
|
||||
# ip library
|
||||
@HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
|
||||
@ -11,7 +11,7 @@
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 = \
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \
|
||||
@@ -2041,8 +2041,8 @@
|
||||
@@ -2084,8 +2084,8 @@
|
||||
ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
|
||||
am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
|
||||
prnt/pcl.py prnt/colorcal.py
|
||||
@ -22,7 +22,7 @@
|
||||
am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
|
||||
am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
|
||||
ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
|
||||
@@ -3777,11 +3777,11 @@
|
||||
@@ -3862,11 +3862,11 @@
|
||||
@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
|
||||
|
||||
# hpmud.rules
|
||||
@ -39,3 +39,26 @@
|
||||
|
||||
# hplip.conf
|
||||
@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
|
||||
@@ -3921,14 +3921,14 @@
|
||||
|
||||
# data
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
|
||||
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
|
||||
+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
|
||||
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
|
||||
|
@ -1,20 +0,0 @@
|
||||
--- check.py.bak 2009-07-31 05:33:11.000000000 -0500
|
||||
+++ check.py 2009-07-31 05:34:36.000000000 -0500
|
||||
@@ -337,7 +337,7 @@
|
||||
num_errors += 1
|
||||
|
||||
if cups_ok:
|
||||
- cups_conf = '/etc/cups/cupsd.conf'
|
||||
+ cups_conf = '/usr/local/etc/cups/cupsd.conf'
|
||||
|
||||
try:
|
||||
f = file(cups_conf, 'r')
|
||||
@@ -600,7 +600,7 @@
|
||||
#log.info("Installed in HPLIP?: %s" % x)
|
||||
log.info("Device URI: %s" % device_uri)
|
||||
|
||||
- ppd = os.path.join('/etc/cups/ppd', printer_name + '.ppd')
|
||||
+ ppd = os.path.join('/usr/local/etc/cups/ppd', printer_name + '.ppd')
|
||||
|
||||
if os.path.exists(ppd):
|
||||
log.info("PPD: %s" % ppd)
|
@ -1,11 +1,11 @@
|
||||
--- installer/core_install.py.old 2010-04-30 05:23:48.000000000 -0500
|
||||
+++ installer/core_install.py 2010-04-30 05:24:07.000000000 -0500
|
||||
@@ -897,7 +897,7 @@
|
||||
--- ./installer/core_install.py.orig 2010-08-26 02:29:22.000000000 +0400
|
||||
+++ ./installer/core_install.py 2010-08-26 02:30:22.429959790 +0400
|
||||
@@ -833,7 +833,7 @@
|
||||
if not check_lib('libusb'):
|
||||
return False
|
||||
|
||||
- return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))
|
||||
+ return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init(void)'))
|
||||
|
||||
|
||||
def check_sane_devel(self):
|
||||
- return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
|
||||
+ return len(locate_file_contains("sane.h", '/usr/local/include/sane', 'extern SANE_Status sane_init'))
|
||||
|
||||
|
||||
def check_xsane(self):
|
||||
def check_libjpeg(self):
|
||||
|
@ -1,23 +0,0 @@
|
||||
--- prnt/cups.py.bak 2009-07-31 05:28:04.000000000 -0500
|
||||
+++ prnt/cups.py 2009-07-31 05:29:26.000000000 -0500
|
||||
@@ -202,9 +202,9 @@
|
||||
|
||||
def getAllowableMIMETypes():
|
||||
"""
|
||||
- Scan all /etc/cups/*.convs files for allowable file formats.
|
||||
+ Scan all /usr/local/etc/cups/*.convs files for allowable file formats.
|
||||
"""
|
||||
- files = glob.glob("/etc/cups/*.convs")
|
||||
+ files = glob.glob("/usr/local/etc/cups/*.convs")
|
||||
|
||||
allowable_mime_types = []
|
||||
|
||||
@@ -527,7 +527,7 @@
|
||||
|
||||
|
||||
def getErrorLogLevel():
|
||||
- cups_conf = '/etc/cups/cupsd.conf'
|
||||
+ cups_conf = '/usr/local/etc/cups/cupsd.conf'
|
||||
try:
|
||||
f = file(cups_conf, 'r')
|
||||
except OSError:
|
20
print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
Normal file
20
print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
Normal file
@ -0,0 +1,20 @@
|
||||
--- ./prnt/hpcups/HPCupsFilter.cpp.orig 2010-08-25 11:15:08.000000000 +0400
|
||||
+++ ./prnt/hpcups/HPCupsFilter.cpp 2010-08-25 11:35:36.000000000 +0400
|
||||
@@ -433,13 +433,14 @@
|
||||
|
||||
memset(&m_JA, 0, sizeof(JobAttributes));
|
||||
struct tm *t;
|
||||
- struct timeb tb;
|
||||
+ struct timeval tv;
|
||||
+ struct timezone tz;
|
||||
time_t long_time;
|
||||
time(&long_time);
|
||||
t = localtime(&long_time);
|
||||
- ftime(&tb);
|
||||
+ gettimeofday(&tv, &tz);
|
||||
strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1); // returns Fri Jun 5 08:12:16 2009
|
||||
- snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
|
||||
+ snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds
|
||||
|
||||
getLogLevel();
|
||||
m_JA.job_id = atoi(argv[1]);
|
@ -1,54 +1,13 @@
|
||||
**********************************************************
|
||||
=====================================================================
|
||||
|
||||
**************** UPGRADE FROM 1.X NOTICE *****************
|
||||
HPLIP expects printers to be attached as a ugen(4) devices. This
|
||||
means that you must NOT have "device ulpt" in your kernel and ulpt
|
||||
must NOT be loaded as a kernel module (you may also want to compile
|
||||
print/cups-base with LIBUSB support). Please, follow the instructions
|
||||
from print/cups-base pkg-message to setup correct permission for
|
||||
usb devices.
|
||||
|
||||
NOTE: If you are upgrading from 1.x you will need to
|
||||
change your devfs ruleset as hpiod is now gone, so remove
|
||||
it from you rc.conf. The printer communication now runs
|
||||
through cupsd. You will need to make the devfs ruleset
|
||||
changes to allow cups to access the usb bus and ugen
|
||||
devices so that it can enumerate the printers. You will
|
||||
also need to update your hplip.conf. See the instructions
|
||||
below.
|
||||
In order to enable full functionality of hp tools, users must be
|
||||
added to group `cups'.
|
||||
|
||||
**************** UPGRADE FROM 1.X NOTICE *****************
|
||||
|
||||
*Please note, the new version does not need a rc.d startup file
|
||||
hplip now has it's own toolbox icon which gets started,
|
||||
during system startup.
|
||||
|
||||
So all you have to do if you have a custom ruleset setup
|
||||
is add the following to that ruleset in devfs.rules:
|
||||
|
||||
add path 'usb*' group cups
|
||||
add path 'usb*' mode 0660
|
||||
add path 'ugen*' group cups
|
||||
add path 'ugen*' mode 0660
|
||||
|
||||
If you have never setup devfs.rules please read the
|
||||
manpage and see:
|
||||
http://am-productions.biz/docs/devfs.rules.php
|
||||
|
||||
The printer MUST attach as a ugen(4) device. This means
|
||||
that you must NOT have "device ulpt" in your kernel and
|
||||
ulpt must NOT be loaded as a kernel module.
|
||||
|
||||
If you are seeing device connection errors restart the
|
||||
printing chain with the following command. NOTE: It MUST
|
||||
be restarted in the stated order.
|
||||
%%PREFIX%%/etc/rc.d/hpssd restart && \
|
||||
%%PREFIX%%/etc/rc.d/cupsd restart
|
||||
|
||||
If upgrading from a version < 2.7.9 copy the new
|
||||
hplip.conf.sample config.
|
||||
cp %%PREFIX%%/etc/hp/hplip.conf.sample \
|
||||
%%PREFIX%%/etc/hp/hplip.conf
|
||||
|
||||
If you are still having problems check:
|
||||
http://am-productions.biz/docs/hplip.php
|
||||
If you are still having problems send the relevant part
|
||||
of your /var/log/messages, console output from the hp-*
|
||||
utility that you are trying to run, and your rc.conf +
|
||||
devfs.rules files and the output of "ls -l /dev" to the
|
||||
maintainer.
|
||||
**********************************************************
|
||||
=====================================================================
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user