This commit is contained in:
ziggi
2021-04-12 18:51:25 +00:00
parent 6244009702
commit d42691da79
26 changed files with 1314 additions and 1745 deletions

View File

@@ -2,7 +2,7 @@
# $Id$
#
PORTNAME= hplip
PORTVERSION= 3.10.6
PORTVERSION= 3.20.6
CATEGORIES= print
MASTER_SITES= SF
PKGNAMEPREFIX= cups-
@@ -50,30 +50,87 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -pthread
CONFIGURE_ARGS+= --disable-dbus-build
CONFIGURE_ARGS+= --disable-doc-build
CONFIGURE_ARGS+= --disable-fax-build
CONFIGURE_ARGS+= --enable-foomatic-drv-install
CONFIGURE_ARGS+= --disable-foomatic-drv-install
CONFIGURE_ARGS+= --disable-foomatic-rip-hplip-install
CONFIGURE_ARGS+= --disable-gui-build
CONFIGURE_ARGS+= --disable-hpcups-install
CONFIGURE_ARGS+= --disable-network-build
CONFIGURE_ARGS+= --enable-hpcups-install
CONFIGURE_ARGS+= --enable-network-build
CONFIGURE_ARGS+= --disable-qt4
CONFIGURE_ARGS+= --disable-scan-build
CONFIGURE_ARGS+= --enable-cups-drv-install
CONFIGURE_ARGS+= --enable-cups-ppd-install
CONFIGURE_ARGS+= --enable-foomatic-ppd-install
CONFIGURE_ARGS+= --enable-hpijs-install
CONFIGURE_ARGS+= --enable-hpijs-only-build
#CONFIGURE_ARGS+= --enable-lite-build
CONFIGURE_ARGS+= --disable-foomatic-ppd-install
CONFIGURE_ARGS+= --disable-hpijs-install
#CONFIGURE_ARGS+= --enable-hpijs-only-build
#CONFIGURE_ARGS+= --enable-hpcups-only-build
CONFIGURE_ARGS+= --enable-lite-build
USES+= gmake
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
${REINPLACE_CMD} -e 's|-ldld||g;' \
-e 's|-ldl||g' \
-e 's,-lusb-1.0,-lusb,g' \
-e 's,libusb-1.0/libusb.h,libusb.h,g' \
${WRKSRC}/configure \
${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
-e '/[[:space:]]install-dist_rulessystemDATA/ s,install-dist_rulessystemDATA,,' \
${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' \
${WRKSRC}/Makefile.in \
${WRKSRC}/base/codes.py \
${WRKSRC}/base/g.py \
${WRKSRC}/base/password.py \
${WRKSRC}/base/pkit.py \
${WRKSRC}/base/queues.py \
${WRKSRC}/base/services.py \
${WRKSRC}/base/utils.py \
${WRKSRC}/check.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/fax/coverpages.py \
${WRKSRC}/fax/filters/pstotiff \
${WRKSRC}/hplip.list.in \
${WRKSRC}/installer/core_install.py \
${WRKSRC}/installer/dcheck.py \
${WRKSRC}/installer/pluginhandler.py \
${WRKSRC}/logcapture.py \
${WRKSRC}/prnt/cups.py \
${WRKSRC}/prnt/filters/hpps \
${WRKSRC}/prnt/hpcups/HPCupsFilter.cpp \
${WRKSRC}/prnt/hpijs/globals.cpp \
${WRKSRC}/prnt/hpijs/hpcupsfax.cpp \
${WRKSRC}/prnt/hpijs/hpijs.cpp \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui4/devmgr5.py \
${WRKSRC}/ui5/devmgr5.py
${REINPLACE_CMD} -e 's/umask(0)/umask(0o022)/' \
-e 's/umask(0o111)/umask(0o133)/' \
${WRKSRC}/base/os_utils.py \
${WRKSRC}/base/validation.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/hpdio.py \
${WRKSRC}/installer/pluginhandler.py
_post-patch:
${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
-e 's|-ldld||g; s|-ldl||g' \
${WRKSRC}/configure \
@@ -93,7 +150,7 @@ post-patch:
${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
${WRKSRC}/Makefile.in
post-install:
_post-install:
# ${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
# ${MKDIR} ${PREFIX}/etc/hp
# ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${EXAMPLESDIR}/hplip.conf.sample

View File

@@ -1,2 +1,3 @@
SHA256 (hplip-3.10.6.tar.gz) = 3ee0e68a613d2b966dcb6df9fd8e074c4c3e590249e61c0d792de3373b84fdeb
SIZE (hplip-3.10.6.tar.gz) = 21577342
TIMESTAMP = 1618215383
SHA256 (hplip-3.20.6.tar.gz) = c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20
SIZE (hplip-3.20.6.tar.gz) = 25908476

View File

@@ -1,195 +0,0 @@
--- ./Makefile.in.orig 2010-07-19 05:20:23.000000000 +0300
+++ ./Makefile.in 2015-01-05 00:20:25.000000000 +0200
@@ -89,8 +89,8 @@
# ip library
@HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
@HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
@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 \
@@ -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
-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
- data/rules/40-hplip.rules data/rules/55-hpmud.rules
+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
+# data/rules/40-hplip.rules data/rules/55-hpmud.rules
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 \
@@ -3834,7 +3834,7 @@
@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
@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 $(DBUS_LIBS) -lcups -ldl
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
@@ -3858,18 +3858,18 @@
# hp-mkuri.
@HPLIP_BUILD_TRUE@hp_mkuridir = $(bindir)
@HPLIP_BUILD_TRUE@hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c
-@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la
+@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = libhpmud.la
@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
# hpmud.rules
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
-@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
-@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)
-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
+#@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)
+#@HPLIP_BUILD_TRUE@halpredir = /usr/local/share/hal/fdi/preprobe/10osvendor
+#@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
# hplip.conf
-@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
+@HPLIP_BUILD_TRUE@hplip_confdir = /usr/local/etc/hp
@HPLIP_BUILD_TRUE@hplip_conf_DATA = hplip.conf
#pstotiff filter
@@ -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
@@ -4042,14 +4042,14 @@
# PolicyKit
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@policykit_dbus_etcdir = /etc/dbus-1/system.d
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@policykit_dbus_sharedir = /usr/share/dbus-1/system-services
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@policykit_dbus_sharedir = /usr/local/share/dbus-1/system-services
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@policykit_policydir = $(policykit_dir)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@POLICYKIT_INSTALL_TRUE@dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
@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)
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_LDADD = libapdk.la -ljpeg -ldl
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_LDADD = libapdk.la -ljpeg
# hplip.desktop
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4116,8 +4116,8 @@
@HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
-@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_FALSE@hpijs_LDADD = libapdk.la -ljpeg -ldl
-@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@hpijs_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS)
+@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_FALSE@hpijs_LDADD = libapdk.la -ljpeg
+@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@hpijs_LDADD = libapdk.la -ljpeg libhpip.la libhpmud.la $(DBUS_LIBS)
# hpcups
#if NEW_HPCUPS
@@ -4155,7 +4155,7 @@
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/dj4100PrintModes.h
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -lcups -lcupsimage
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -4163,9 +4163,9 @@
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
-#hpcups_LDADD = libapdk.la -ljpeg -ldl -lcups -lcupsimage
+#hpcups_LDADD = libapdk.la -ljpeg -lcups -lcupsimage
#else
-#hpcups_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
+#hpcups_LDADD = libapdk.la -ljpeg libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
#endif #HPCUPS_ONLY_BUILD
#endif # NEW_HPCUPS
# hpcupsfax
@@ -8002,6 +8002,8 @@
info-am:
+#install-dist_ppdDATA
+
install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \
install-cupsextLTLIBRARIES install-dist_baseDATA \
install-dist_cacSCRIPTS install-dist_cmdSCRIPTS \
@@ -8021,13 +8023,13 @@
install-dist_policykit_dbus_shareDATA \
install-dist_policykit_policyDATA install-dist_postscriptDATA \
install-dist_ppdDATA install-dist_prntDATA \
- install-dist_ripSCRIPTS install-dist_rulesDATA \
+ install-dist_ripSCRIPTS \
install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
install-dist_unrelDATA install-dist_www0DATA \
- install-dist_www3DATA install-dist_www4DATA install-docDATA \
+ install-dist_www3DATA install-dist_www4DATA \
install-hpPROGRAMS install-hp_mkuriPROGRAMS \
install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \
- install-hplip_confDATA install-hplip_desktopDATA \
+ install-hplip_desktopDATA \
install-hplip_systrayDATA install-hplipjsPROGRAMS \
install-hpmudextLTLIBRARIES install-libsane_hpaioLTLIBRARIES \
install-pcardextLTLIBRARIES install-pstotiffSCRIPTS \
@@ -8154,14 +8156,14 @@
install-dist_policykit_dbus_shareDATA \
install-dist_policykit_policyDATA install-dist_postscriptDATA \
install-dist_ppdDATA install-dist_prntDATA \
- install-dist_ripSCRIPTS install-dist_rulesDATA \
+ install-dist_ripSCRIPTS \
install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
install-dist_unrelDATA install-dist_www0DATA \
- install-dist_www3DATA install-dist_www4DATA install-docDATA \
+ install-dist_www3DATA install-dist_www4DATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-hpPROGRAMS install-hp_mkuriPROGRAMS \
install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \
- install-hplip_confDATA install-hplip_desktopDATA \
+ install-hplip_desktopDATA \
install-hplip_systrayDATA install-hplipjsPROGRAMS \
install-hpmudextLTLIBRARIES install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
@@ -8215,13 +8217,13 @@
install-data-hook:
# If scanner build, add hpaio entry to sane dll.conf.
@HPLIP_BUILD_TRUE@ if [ "$(scan_build)" = "yes" ]; then \
-@HPLIP_BUILD_TRUE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
-@HPLIP_BUILD_TRUE@ if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
-@HPLIP_BUILD_TRUE@ touch $(DESTDIR)/etc/sane.d/dll.conf; \
+@HPLIP_BUILD_TRUE@ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/sane.d; \
+@HPLIP_BUILD_TRUE@ if [ ! -f $(DESTDIR)/usr/local/etc/sane.d/dll.conf ]; then \
+@HPLIP_BUILD_TRUE@ touch $(DESTDIR)/usr/local/etc/sane.d/dll.conf; \
@HPLIP_BUILD_TRUE@ fi; \
-@HPLIP_BUILD_TRUE@ if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-@HPLIP_BUILD_TRUE@ echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
-@HPLIP_BUILD_TRUE@ echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+@HPLIP_BUILD_TRUE@ if ! grep ^hpaio $(DESTDIR)/usr/local/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
+@HPLIP_BUILD_TRUE@ echo "Adding hpaio entry to /usr/local/etc/sane.d/dll.conf." ; \
+@HPLIP_BUILD_TRUE@ echo hpaio >>$(DESTDIR)/usr/local/etc/sane.d/dll.conf ; \
@HPLIP_BUILD_TRUE@ fi \
@HPLIP_BUILD_TRUE@ fi
# Create hp-xxx commands in bindir.

View File

@@ -1,20 +0,0 @@
--- ./installer/dcheck.py.orig 2010-07-19 05:17:37.000000000 +0300
+++ ./installer/dcheck.py 2015-01-04 01:11:42.000000000 +0200
@@ -43,7 +43,7 @@
def update_ld_output():
# For library checks
global ld_output
- status, ld_output = utils.run('%s -p' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
+ status, ld_output = utils.run('%s -r' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
if status != 0:
log.debug("ldconfig failed.")
@@ -98,7 +98,7 @@
log.debug("Not found.")
return False
-def check_file(f, dir="/usr/include"):
+def check_file(f, dir="/usr/local/include"):
log.debug("Searching for file '%s' in '%s'..." % (f, dir))
for w in utils.walkFiles(dir, recurse=True, abs_paths=True, return_folders=False, pattern=f):
log.debug("File found at '%s'" % w)

View File

@@ -1,22 +0,0 @@
--- ./io/hpmud/musb.c.orig 2010-07-19 05:17:40.000000000 +0300
+++ ./io/hpmud/musb.c 2015-01-04 01:11:42.000000000 +0200
@@ -123,10 +123,16 @@
{
ret = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index,
0x409, tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
- if (ret==0)
+ if (ret==0
+#ifdef __FreeBSD__
+ || ret == -EIO
+#endif
+ )
{
- /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
- BUG("get_string_descriptor zero result, retrying...");
+ /* This retry is necessary for lj1000 and lj1005. des 12/12/07
+ Also HP Photosmart 42xx seems to suffer transient errors with serial id */
+ BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
+ sleep(2);
continue;
}
break;

View File

@@ -1,11 +0,0 @@
--- ./prnt/hpcups/ErnieFilter.cpp.orig 2010-07-19 05:14:09.000000000 +0300
+++ ./prnt/hpcups/ErnieFilter.cpp 2015-01-04 01:11:42.000000000 +0200
@@ -50,7 +50,7 @@
#include "ErnieFilter.h"
-#if defined(__APPLE__) || defined(__linux)
+#if defined(__APPLE__) || defined(__linux) || (__FreeBSD__)
#include <math.h>
#endif

View File

@@ -1,29 +0,0 @@
--- ./prnt/hpcups/HPCupsFilter.cpp.orig 2010-07-19 05:14:09.000000000 +0300
+++ ./prnt/hpcups/HPCupsFilter.cpp 2015-01-04 01:11:42.000000000 +0200
@@ -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]);
@@ -773,7 +774,7 @@
FILE *fp;
char str[258];
char *p;
- fp = fopen ("/etc/cups/cupsd.conf", "r");
+ fp = fopen ("/usr/local/etc/cups/cupsd.conf", "r");
if (fp == NULL)
return;
while (!feof (fp))

View File

@@ -1,19 +0,0 @@
--- ./prnt/hpijs/foomatic-rip-hplip.orig 2010-07-19 05:15:17.000000000 +0300
+++ ./prnt/hpijs/foomatic-rip-hplip 2015-01-04 01:11:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
# The above Perl path may vary on your system; fix it!!! -*- perl -*-
use strict;
@@ -55,8 +55,8 @@
# of the directory which contains the configuration file, usually
# "/etc/foomatic".
# Some versions of configure do not fully expand $sysconfdir
-my $prefix = "/usr";
-my $configpath = "/etc/foomatic";
+my $prefix = "/usr/local";
+my $configpath = "/usr/local/etc/foomatic";
# For the stuff below, the settings in the configuration file have priority.

File diff suppressed because it is too large Load Diff

View File

@@ -1,167 +0,0 @@
#
# $Id$
#
PORTNAME= hplip
PORTVERSION= 3.20.6
CATEGORIES= print
MASTER_SITES= SF
PKGNAMEPREFIX= cups-
MAINTAINER= onborodin@gmail.com
COMMENT= Drivers and utilities for HP Printers and All-in-One devices
LIB_DEPENDS+= libjpeg.so:graph/libjpeg
LIB_DEPENDS+= libcups.so:print/cups-base
LIB_DEPENDS+= libcupsimage.so:print/cups-base
CONFLICTS= hpijs-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend
CONFIGURE_ARGS+= --with-cupsfilterdir=${PREFIX}/libexec/cups/filter
CONFIGURE_ARGS+= --with-icondir=${DESKTOPDIR}
CONFIGURE_ARGS+= --with-systraydir=${PREFIX}/etc/xdg/autostart
CONFIGURE_ARGS+= --with-hpppddir=${PREFIX}/share/cups/model/hplip/HP
CONFIGURE_ARGS+= --with-mimedir=${PREFIX}/etc/cups
CONFIGURE_ARGS+= --with-docdir=${DOCSDIR}
CONFIGURE_ARGS+= --with-drvdir=${PREFIX}/share/cups/driver
CPPFLAGS+= -I${LOCALBASE}/include -pthread
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -pthread
#CONFIGURE_ARGS+= --enable-cups11-build
#CONFIGURE_ARGS+= --enable-dbus-build
#CONFIGURE_ARGS+= --enable-fax-build
#CONFIGURE_ARGS+= --enable-gui-build
#CONFIGURE_ARGS+= --enable-hpcups-only-build
#CONFIGURE_ARGS+= --enable-hpijs-only-build
#CONFIGURE_ARGS+= --enable-network-build
#CONFIGURE_ARGS+= --enable-new-hpcups
#CONFIGURE_ARGS+= --enable-policykit
#CONFIGURE_ARGS+= --enable-pp-build
#CONFIGURE_ARGS+= --enable-qt3
#CONFIGURE_ARGS+= --enable-qt4
#CONFIGURE_ARGS+= --enable-scan-build
#CONFIGURE_ARGS+= --enable-shadow-build
CONFIGURE_ARGS+= --disable-dbus-build
CONFIGURE_ARGS+= --disable-doc-build
CONFIGURE_ARGS+= --disable-fax-build
CONFIGURE_ARGS+= --disable-foomatic-drv-install
CONFIGURE_ARGS+= --disable-foomatic-rip-hplip-install
CONFIGURE_ARGS+= --disable-gui-build
CONFIGURE_ARGS+= --enable-hpcups-install
CONFIGURE_ARGS+= --enable-network-build
CONFIGURE_ARGS+= --disable-qt4
CONFIGURE_ARGS+= --disable-scan-build
CONFIGURE_ARGS+= --enable-cups-drv-install
CONFIGURE_ARGS+= --enable-cups-ppd-install
CONFIGURE_ARGS+= --disable-foomatic-ppd-install
CONFIGURE_ARGS+= --disable-hpijs-install
#CONFIGURE_ARGS+= --enable-hpijs-only-build
#CONFIGURE_ARGS+= --enable-hpcups-only-build
CONFIGURE_ARGS+= --enable-lite-build
USES+= gmake
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
${REINPLACE_CMD} -e 's|-ldld||g;' \
-e 's|-ldl||g' \
-e 's,-lusb-1.0,-lusb,g' \
-e 's,libusb-1.0/libusb.h,libusb.h,g' \
${WRKSRC}/configure \
${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
-e '/[[:space:]]install-dist_rulessystemDATA/ s,install-dist_rulessystemDATA,,' \
${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' \
${WRKSRC}/Makefile.in \
${WRKSRC}/base/codes.py \
${WRKSRC}/base/g.py \
${WRKSRC}/base/password.py \
${WRKSRC}/base/pkit.py \
${WRKSRC}/base/queues.py \
${WRKSRC}/base/services.py \
${WRKSRC}/base/utils.py \
${WRKSRC}/check.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/fax/coverpages.py \
${WRKSRC}/fax/filters/pstotiff \
${WRKSRC}/hplip.list.in \
${WRKSRC}/installer/core_install.py \
${WRKSRC}/installer/dcheck.py \
${WRKSRC}/installer/pluginhandler.py \
${WRKSRC}/logcapture.py \
${WRKSRC}/prnt/cups.py \
${WRKSRC}/prnt/filters/hpps \
${WRKSRC}/prnt/hpcups/HPCupsFilter.cpp \
${WRKSRC}/prnt/hpijs/globals.cpp \
${WRKSRC}/prnt/hpijs/hpcupsfax.cpp \
${WRKSRC}/prnt/hpijs/hpijs.cpp \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui4/devmgr5.py \
${WRKSRC}/ui5/devmgr5.py
${REINPLACE_CMD} -e 's/umask(0)/umask(0o022)/' \
-e 's/umask(0o111)/umask(0o133)/' \
${WRKSRC}/base/os_utils.py \
${WRKSRC}/base/validation.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/hpdio.py \
${WRKSRC}/installer/pluginhandler.py
_post-patch:
${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
-e 's|-ldld||g; s|-ldl||g' \
${WRKSRC}/configure \
${WRKSRC}/Makefile.in
${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
${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
${WRKSRC}/Makefile.in
_post-install:
# ${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
# ${MKDIR} ${PREFIX}/etc/hp
# ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${EXAMPLESDIR}/hplip.conf.sample
# if [ ! -f ${PREFIX}/etc/hp/hplip.conf ]; then \
# ${INSTALL_DATA} ${PREFIX}/etc/hp/hplip.conf.sample \
# ${PREFIX}/etc/hp/hplip.conf; \
# fi
# @${CAT} ${PKGMESSAGE}
cd ${STAGEDIR}${PREFIX}/share/cups/model/hplip/HP && ${GZIP_CMD} -d *.gz
# ${INSTALL_SCRIPT} ${WRKSRC}/prnt/hpijs/foomatic-rip-hplip \
# ${PREFIX}/libexec/cups/filter/foomatic-rip-hplip
${REINPLACE_CMD} -e 's,foomatic-rip-hplip,foomatic-rip,g' ${STAGEDIR}${PREFIX}/share/cups/model/hplip/HP/*.ppd
.include <bsd.port.mk>

View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1618215383
SHA256 (hplip-3.20.6.tar.gz) = c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20
SIZE (hplip-3.20.6.tar.gz) = 25908476

View File

@@ -1,13 +0,0 @@
=====================================================================
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.
In order to enable full functionality of hp tools, users must be
added to group `cups'.
=====================================================================

View File

@@ -1,8 +0,0 @@
HPLIP is an HP developed solution for printing, scanning,
and faxing with HP inkjet and laser based printers in Linux.
The HP driver project provides printing support for nearly
1000 printer models, including Deskjet, Officejet, Photosmart,
PSC (Print Scan Copy), Business Inkjet, LaserJet, and LaserJet MFP.
WWW: http://hplipopensource.com/hplip-web/index.html

File diff suppressed because it is too large Load Diff