diff options
| author | Nicola Vitale <nivit@FreeBSD.org> | 2007-01-25 14:26:46 +0000 |
|---|---|---|
| committer | Nicola Vitale <nivit@FreeBSD.org> | 2007-01-25 14:26:46 +0000 |
| commit | 9a885c614bacb1567aba6144e29667d045d6dcf6 (patch) | |
| tree | 9f67ab795532193068b438fe7237500346e3c4c8 | |
| parent | 47801ba9da28eaa4eceb8e4cd978a8a94f73ac93 (diff) | |
| download | ports-9a885c614bacb1567aba6144e29667d045d6dcf6.tar.gz ports-9a885c614bacb1567aba6144e29667d045d6dcf6.zip | |
Notes
24 files changed, 654 insertions, 492 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 523ff9f3f575..01d2684b0d11 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 1.6.7 +PORTVERSION= 1.6.12 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -40,7 +40,7 @@ PKGDEINSTALL= ${PKGINSTALL} OPTIONS= GUI "build with Python QT" on -PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.7 +PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.12 .include <bsd.port.pre.mk> @@ -48,12 +48,9 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.7 USE_AUTOTOOLS= automake:19:env autoconf:259:env aclocal:19:env .endif -.if exists(${LOCALBASE}/bin/pylupdate) -WITH_GUI= yes -.endif - -.if defined(WITH_GUI) +.if !defined(WITHOUT_GUI) || exists(${LOCALBASE}/bin/pylupdate) RUN_DEPENDS+= pylupdate:${PORTSDIR}/x11-toolkits/py-qt +CONFIGURE_ARGS+= --enable-gui-build .endif post-extract: @@ -61,6 +58,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \ + s|/usr/lib/cups/backend|${LOCALBASE}/libexec/cups/backend|g ; \ s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ ${WRKSRC}/configure ${WRKSRC}/prnt/hpijs/configure @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g ; \ @@ -70,13 +68,16 @@ post-patch: s|/etc/hp|${LOCALBASE}/etc/hp|g' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g ; \ + s|/usr/lib|${LOCALBASE}/lib|g' \ + ${WRKSRC}/prnt/hpijs/foomatic-rip @${REINPLACE_CMD} -e 's|/etc/hp/|${LOCALBASE}/etc/hp/|g ; \ s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ ${WRKSRC}/base/g.py \ ${WRKSRC}/fax/backend/hpfax.py \ ${WRKSRC}/hpssd.py \ ${WRKSRC}/io/hpiod/hpiod.h \ - ${WRKSRC}/prnt/hpijs/hplip_api.h \ + ${WRKSRC}/api/hplip_api.h \ ${WRKSRC}/prnt/hpijs/configure.in @${REINPLACE_CMD} -e 's|#!/usr/bin/env python|#!${LOCALBASE}/bin/python|g' \ ${WRKSRC}/*.py \ diff --git a/print/hplip/distinfo b/print/hplip/distinfo index 9964581354e5..91cae5433353 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,3 +1,3 @@ -MD5 (hplip-1.6.7.tar.gz) = b1e814c7f5ef2a5033e4c3e5162ac694 -SHA256 (hplip-1.6.7.tar.gz) = 27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 -SIZE (hplip-1.6.7.tar.gz) = 9984016 +MD5 (hplip-1.6.12.tar.gz) = 8adcb93703f6e90510f51b3cf96567c9 +SHA256 (hplip-1.6.12.tar.gz) = dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24 +SIZE (hplip-1.6.12.tar.gz) = 10679971 diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in index 87a92ec30122..367e539af053 100644 --- a/print/hplip/files/patch-Makefile.in +++ b/print/hplip/files/patch-Makefile.in @@ -1,6 +1,15 @@ ---- Makefile.in.orig Tue Aug 1 16:41:16 2006 -+++ Makefile.in Wed Sep 27 17:13:29 2006 -@@ -390,12 +390,12 @@ +--- Makefile.in.orig Tue Dec 19 18:11:05 2006 ++++ Makefile.in Mon Dec 25 02:30:25 2006 +@@ -414,7 +414,7 @@ + www243dir = $(docdir)/install/step4/suse + dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + www251dir = $(docdir)/install/manual +-dist_www251_DATA = $(wwwsrc)/install/manual/* ++dist_www251_DATA = $(wwwsrc)/install/manual/*.html + www252dir = $(docdir)/install/manual/distros + dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + www3dir = $(docdir)/styles +@@ -424,12 +424,12 @@ www5dir = $(docdir)/supported_devices dist_www5_DATA = $(wwwsrc)/supported_devices/* www6dir = $(docdir)/tech_docs @@ -13,13 +22,18 @@ dist_www7_DATA = $(wwwsrc)/troubleshooting/* -dist_hplip_DATA = $(doc_DATA) hplip.conf +dist_hplip_DATA = $(doc_DATA) - dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh + dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install cmddir = $(hplipdir) dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ -@@ -2415,15 +2415,9 @@ +@@ -2562,20 +2562,9 @@ # - # Do full install if not rpm_install. - if [ "$(rpm_install)" = "no" ]; then \ + # If scanner build, install sane backend. + if [ "$(scan_build)" = "yes" ]; then \ +- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ +- touch $(DESTDIR)/etc/sane.d/dll.conf; \ +- fi; \ +- $(mkinstalldirs) $(DESTDIR)$(sanedir); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \ @@ -34,41 +48,89 @@ + ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \ fi - install-data-hook: test-destdir install-pcardext install-cupsext -@@ -2466,7 +2460,7 @@ - newname=$${i%.*}; \ - mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ - if [ "$(rpm_install)" = "no" ]; then \ + install-data-hook: install-pcardext install-cupsext +@@ -2618,63 +2607,42 @@ + newname=$${i%.*}; \ + mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ + if [ ! \( "$$newname" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \ - ln -sf ../share/$(PACKAGE)/$$newname $(DESTDIR)$(bindir)/hp-$$newname; \ + ln -sf $(prefix)/share/$(PACKAGE)/$$newname $(DESTDIR)$(bindir)/hp-$$newname; \ - fi \ + fi \ done # -@@ -2501,22 +2495,7 @@ - sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ - sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ - rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp + # Edit hpiod.conf in destdir. +- echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf ++ echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf ++ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf ++ echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf + if [ "$(network_build)" = "yes" ]; then \ +- echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "network-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "network-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(pp_build)" = "yes" ]; then \ +- echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "pp-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "pp-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(gui_build)" = "yes" ]; then \ +- echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "gui-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "gui-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(scan_build)" = "yes" ]; then \ +- echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "scanner-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "scanner-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(fax_build)" = "yes" ]; then \ +- echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "fax-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ +- fi +- echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -# --# Do full install if not rpm_install. Also only run chkconfig/install_initd if DESTDIR="". -- if [ "$(rpm_install)" = "no" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/hp; \ -- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \ -- if [ -d $(DESTDIR)/etc/init.d ]; then \ -- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d; \ -- if [ "$(DESTDIR)" = "" ]; then \ -- if [ "$(INSTALLINITD)" != "" ]; then \ -- $(INSTALLINITD) $(PACKAGE); \ -- else \ -- $(CHKCONFIG) $(PACKAGE) reset; \ -- fi \ -- fi \ +-# Install hpiod.conf. +- $(mkinstalldirs) $(DESTDIR)/etc/hp +- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp +-# +-# Create hpiod start/stop script from hpiod.sh in destdir. +- sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ +- sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ +- rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp +-# +-# Install hpiod start/stop script. +- $(mkinstalldirs) $(DESTDIR)/etc/init.d +- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d +-# +-# Run chkconfig/install_initd if DESTDIR="". +- if [ "$(DESTDIR)" = "" ]; then \ +- if [ "$(INSTALLINITD)" != "" ]; then \ +- $(INSTALLINITD) $(PACKAGE); \ +- elif [ "$(CHKCONFIG)" != "" ]; then \ +- $(CHKCONFIG) $(PACKAGE) reset; \ - fi \ -- fi ++ echo -e "fax-build=0" >> $(PACKAGE).conf; \ + fi ++ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf ++ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf + # - # For internal testing. - if [ "$(SHADOW)" != "" ]; then \ -@@ -2548,8 +2527,8 @@ + # Install fax support. Let hpijs symlink hpppddir to cupsppddir. + if [ "$(fax_build)" = "yes" ]; then \ +@@ -2705,8 +2673,8 @@ done # # Remove hplip.conf and hplip start/stop script. @@ -79,22 +141,3 @@ # # Remove fax support. rm -f $(DESTDIR)$(hpfaxdir)/hpfax -@@ -2560,13 +2539,13 @@ - # Add prerequisites for testing (or building?) "make install DESTDIR=/build". - test-destdir: - if [ "$(DESTDIR)" != "" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/init.d; \ -- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ -- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- touch $(DESTDIR)/etc/sane.d/dll.conf; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/rc.d; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/sane.d; \ -+ if [ ! -f $(DESTDIR)/usr/local/etc/sane.d/dll.conf ]; then \ -+ touch $(DESTDIR)/usr/local/etc/sane.d/dll.conf; \ - fi; \ - $(mkinstalldirs) $(DESTDIR)$(sanedir); \ -- $(mkinstalldirs) $(DESTDIR)/usr/share/applications; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/share/applications; \ - $(mkinstalldirs) $(DESTDIR)/usr/bin; \ - fi - diff --git a/print/hplip/files/patch-api_model.c b/print/hplip/files/patch-api_model.c new file mode 100644 index 000000000000..c9ddf37a9cfe --- /dev/null +++ b/print/hplip/files/patch-api_model.c @@ -0,0 +1,11 @@ +--- api/model.c.orig 2006-10-18 20:58:33.000000000 +0200 ++++ api/model.c 2007-01-19 15:58:49.000000000 +0100 +@@ -269,7 +269,7 @@ static int DelList() + /* Parse *.inc file. */ + static int ParseInc(char *incFile) + { +- FILE *fp; ++ FILE *fp = NULL; + struct list_head *p; + LabelRecord *pl; + char rcbuf[255]; diff --git a/print/hplip/files/patch-backend_hp_hp.c b/print/hplip/files/patch-backend_hp_hp.c deleted file mode 100644 index 8c13c66c2590..000000000000 --- a/print/hplip/files/patch-backend_hp_hp.c +++ /dev/null @@ -1,19 +0,0 @@ ---- backend/hp/hp.c.orig Tue May 23 15:18:48 2006 -+++ backend/hp/hp.c Tue May 23 15:19:33 2006 -@@ -427,6 +427,7 @@ - int len, vstatus, cnt; - char buf[BUFFER_SIZE+HEADER_SIZE]; - MsgAttributes ma; -+ int hd=-1, channel=-1, n, total, retry=0, size; - - if (argc > 1) - { -@@ -474,8 +475,6 @@ - } - copies = atoi(argv[4]); - } -- -- int hd=-1, channel=-1, n, total, retry=0, size; - - hplip_Init(); - diff --git a/print/hplip/files/patch-pcard_pcardext_pcardext.c b/print/hplip/files/patch-pcard_pcardext_pcardext.c index 4c531f92d1f2..133c6b2c5879 100644 --- a/print/hplip/files/patch-pcard_pcardext_pcardext.c +++ b/print/hplip/files/patch-pcard_pcardext_pcardext.c @@ -17,13 +17,3 @@ /*char buf[1024]; sprintf( buf, "print 'FatInit()=%d\n'", i ); PyRun_SimpleString( buf );*/ -@@ -111,8 +112,8 @@ - PyObject * pcardext_ls( PyObject * self, PyObject * args ) - { - PyObject * file_list; -- file_list = PyList_New(0); - FILE_ATTRIBUTES fa; -+ file_list = PyList_New(0); - - FatDirBegin( &fa ); - diff --git a/print/hplip/files/patch-prnt_cupsext_cupsext.c b/print/hplip/files/patch-prnt_cupsext_cupsext.c index 02351d5d2a7c..685db5bee2ca 100644 --- a/print/hplip/files/patch-prnt_cupsext_cupsext.c +++ b/print/hplip/files/patch-prnt_cupsext_cupsext.c @@ -1,6 +1,6 @@ ---- prnt/cupsext/cupsext.c.orig Tue May 23 15:45:57 2006 -+++ prnt/cupsext/cupsext.c Tue May 23 15:49:34 2006 -@@ -253,11 +253,23 @@ +--- prnt/cupsext/cupsext.c.orig Thu Sep 14 12:51:40 2006 ++++ prnt/cupsext/cupsext.c Wed Oct 18 00:39:28 2006 +@@ -259,11 +259,23 @@ PyObject * getPrinters( PyObject * self, PyObject * args ) { @@ -24,16 +24,16 @@ cups_lang_t * language; static const char * attrs[] = /* Requested attributes */ { -@@ -300,7 +312,7 @@ +@@ -306,7 +318,7 @@ goto abort; } -- int max_count = 0; +- Py_ssize_t max_count = 0; + max_count = 0; - for ( attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME), + for (attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME), max_count = 0; -@@ -311,16 +323,7 @@ +@@ -317,16 +329,7 @@ printer_list = PyList_New( max_count ); @@ -51,7 +51,7 @@ for (attr = response->attrs; attr != NULL; attr = attr->next) { -@@ -392,7 +395,6 @@ +@@ -398,7 +401,6 @@ continue; } @@ -59,7 +59,7 @@ printer = (printer_Object *)_newPrinter( device_uri, name, printer_uri, location, make_model, info, state/*, ppd_name*/ ); PyList_SET_ITEM( printer_list, i, (PyObject *)printer ); -@@ -925,13 +927,13 @@ +@@ -935,13 +937,13 @@ PyObject * getPPD( PyObject * self, PyObject * args ) { char * printer; @@ -74,7 +74,7 @@ ppd = cupsGetPPD( (const char *)printer ); return Py_BuildValue( "s", ppd ); -@@ -941,16 +943,16 @@ +@@ -951,16 +953,16 @@ PyObject * getPPDOption( PyObject * self, PyObject * args ) { diff --git a/print/hplip/files/patch-prnt_hpijs_configure b/print/hplip/files/patch-prnt_hpijs_configure new file mode 100644 index 000000000000..7e6c63c94649 --- /dev/null +++ b/print/hplip/files/patch-prnt_hpijs_configure @@ -0,0 +1,56 @@ +--- prnt/hpijs/configure.orig Wed Oct 18 00:58:44 2006 ++++ prnt/hpijs/configure Wed Oct 18 01:04:20 2006 +@@ -8481,7 +8481,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8539,7 +8539,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" + else + + lt_cv_dlopen="dyld" +@@ -8807,7 +8807,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8865,7 +8865,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" + else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +@@ -20319,7 +20319,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20380,7 +20380,7 @@ + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBDL 1 + _ACEOF +- LIBS="-ldl $LIBS" ++ LIBS="$LIBS" + else + { { echo "$as_me:$LINENO: error: \"cannot find libdl support\"" >&5 + echo "$as_me: error: \"cannot find libdl support\"" >&2;}
\ No newline at end of file diff --git a/print/hplip/files/patch-scan_sane-mfpdtf.c b/print/hplip/files/patch-scan_sane-mfpdtf.c index 2d97133a3ffd..84fb6edefa58 100644 --- a/print/hplip/files/patch-scan_sane-mfpdtf.c +++ b/print/hplip/files/patch-scan_sane-mfpdtf.c @@ -1,20 +1,15 @@ ---- scan/sane/mfpdtf.c.orig Tue May 23 15:07:49 2006 -+++ scan/sane/mfpdtf.c Tue May 23 15:10:30 2006 -@@ -156,10 +156,10 @@ - +--- scan/sane/mfpdtf.c.orig Sat Nov 11 00:22:14 2006 ++++ scan/sane/mfpdtf.c Mon Dec 25 01:43:52 2006 +@@ -157,7 +157,7 @@ int MfpdtfReadService( Mfpdtf_t mfpdtf ) { -- DBG( 0, "MfpdtfReadService() ______________________________ deviceid=%d, channelid=%d ______________________________\n", mfpdtf->deviceid, mfpdtf->channelid ); -- int result = 0; - int datalen, blockLength, headerLength; + int datalen, blockLength, headerLength, r; -+ -+ DBG( 0, "MfpdtfReadService() ______________________________ deviceid=%d, channelid=%d ______________________________\n", mfpdtf->deviceid, mfpdtf->channelid ); if( mfpdtf->read.fixedBlockBytesRemaining <= 0 ) { -@@ -171,7 +171,7 @@ +@@ -169,7 +169,7 @@ //READ( &mfpdtf->read.fixedHeader, datalen ); @@ -23,7 +18,7 @@ if( r!= datalen ) { -@@ -209,7 +209,7 @@ +@@ -207,7 +207,7 @@ //READ( mfpdtf->read.pVariantHeader, datalen ); @@ -32,7 +27,7 @@ if( r!= datalen ) { -@@ -261,7 +261,7 @@ +@@ -259,7 +259,7 @@ //READ( &id, datalen ); @@ -41,28 +36,19 @@ if( r!= datalen ) { -@@ -280,7 +280,7 @@ - DBG( 0, "********************************** RASTER RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageRasterDataHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageRasterDataHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageRasterDataHeader, datalen ); - - if( r!= datalen ) - { -@@ -302,7 +302,7 @@ - DBG( 0, "********************************** SOP RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageStartPageRecord, datalen ); - +@@ -296,7 +296,7 @@ + datalen = sizeof( mfpdtf->read.imageStartPageRecord ); + // DBG( 0, "Reading start of page record.\n" ); + // DBG( 0, "********************************** SOP RECORD **********************************.\n" ); - int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); + r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); if( r!= datalen ) { -@@ -322,7 +322,7 @@ - DBG( 0, "********************************** EOP RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageEndPageRecord, datalen ); - +@@ -314,7 +314,7 @@ + datalen = sizeof( mfpdtf->read.imageEndPageRecord ); + // DBG( 0, "Reading end of page record.\n" ); + // DBG( 0, "********************************** EOP RECORD **********************************.\n" ); - int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); + r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); diff --git a/print/hplip/files/patch-scan_sane_hpaio.c b/print/hplip/files/patch-scan_sane_hpaio.c deleted file mode 100644 index a3422498486e..000000000000 --- a/print/hplip/files/patch-scan_sane_hpaio.c +++ /dev/null @@ -1,63 +0,0 @@ ---- scan/sane/hpaio.c.orig Tue May 23 15:40:36 2006 -+++ scan/sane/hpaio.c Tue May 23 15:08:07 2006 -@@ -1632,10 +1632,11 @@ - extern SANE_Status sane_hpaio_get_parameters( SANE_Handle handle, - SANE_Parameters * pParams ) - { -- DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); -- - hpaioScanner_t hpaio = ( hpaioScanner_t ) handle; - char * s = ""; -+ -+ DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); -+ - if( !hpaio->hJob ) - { - *pParams = hpaio->prescanParameters; -@@ -2100,8 +2101,6 @@ - extern SANE_Status sane_hpaio_open( SANE_String_Const devicename, - SANE_Handle * pHandle ) - { -- DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************************************************************************\n", devicename ); -- - SANE_Status retcode = SANE_STATUS_INVAL; - hpaioScanner_t hpaio = 0; - int r; -@@ -2114,6 +2113,7 @@ - char devname[256]; - MsgAttributes ma; - -+ DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************************************************************************\n", devicename ); - hpaio = hpaioFindScanner( devicename ); - - if( hpaio ) -@@ -2878,6 +2878,8 @@ - IP_IMAGE_TRAITS traits; - IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform = xforms; - WORD wResult; -+ int lines, pixelsPerLine; -+ int log_output; - - DBG( 0, "\nhpaio: sane_hpaio_start() ******************************************************************************************* \n" ); - -@@ -2953,8 +2955,6 @@ - - // if( hpaio->scannerType == SCANNER_TYPE_SCL ) - // { -- int lines, pixelsPerLine; -- - /* Inquire exact image dimensions. */ - if( SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_DEVICE_PARAMETER, SCL_INQ_NUMBER_OF_SCAN_LINES, - &lines, 0, 0 ) == SANE_STATUS_GOOD ) -@@ -2979,9 +2979,9 @@ - MfpdtfReadStart( hpaio->mfpdtf ); /* inits mfpdtf */ - - #ifdef HPAIO_DEBUG -- int log_output=1; -+ log_output=1; - #else -- int log_output=0; -+ log_output=0; - #endif - - if( log_output ) diff --git a/print/hplip/files/patch-scan_sane_io.c b/print/hplip/files/patch-scan_sane_io.c deleted file mode 100644 index 4a553d26fefb..000000000000 --- a/print/hplip/files/patch-scan_sane_io.c +++ /dev/null @@ -1,38 +0,0 @@ ---- scan/sane/io.c.orig Tue May 23 15:15:04 2006 -+++ scan/sane/io.c Tue May 23 15:17:40 2006 -@@ -210,6 +210,13 @@ - { - char message[ BUFFER_SIZE ]; - MsgAttributes ma; -+ int remaining; -+ char *p; -+ int state = 0; -+ int d = 0; -+ char * uri = NULL; -+ char * mdl = NULL; -+ - - int len = sprintf( message, "msg=ProbeDevicesFiltered\nbus=%s\nfilter=scan\nformat=default\n", - "usb,cups,par" ); -@@ -228,18 +235,14 @@ - - hplip_ParseMsg( message, len, &ma ); - -- int d = 0; -- char * uri = NULL; -- char * mdl = NULL; -- - if( ma.ndevice > 0 ) - { - *devices = malloc( sizeof( SANE_Device * ) * ( ma.ndevice + 1 ) ); - -- int remaining = ma.length; -- char *p = (char *)ma.data; -+ remaining = ma.length; -+ p = (char *)ma.data; - -- int state = 0; -+ state = 0; - - while( remaining > 0 && *p != '\0' && d < ma.ndevice ) - { diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist index 7ff9ac370349..28334a858798 100644 --- a/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -4,14 +4,17 @@ bin/hp-check bin/hp-clean bin/hp-colorcal bin/hp-fab +bin/hp-firmware bin/hp-info bin/hp-levels bin/hp-makecopies bin/hp-makeuri bin/hp-print +bin/hp-probe bin/hp-sendfax bin/hp-setup bin/hp-testpage +bin/hp-timedate bin/hp-toolbox bin/hp-unload bin/hpijs @@ -46,6 +49,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html @@ -63,30 +67,71 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_Manager.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagerPhoto_Card.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagerSend_Fax.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_5.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_6.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_7.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_8.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_5.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/build-essential.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/circular.gif %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon.ico %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs-esp.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs_hpijs.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp-tux-printer.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_device_manager.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_overview.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hpliplogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libcupsys2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libjpeg62-dev.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libsnmp5-dev.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libusb-dev.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linuxlogo.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_appssocket.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_uri.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_model_list.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/openssl.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-dev.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-qt3-gl.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-reportlab.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sane-utils.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sflogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/toolboxlinspire.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/topbar.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tux.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/view.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/xsane.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_hardware.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_opening_hw.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_configure.png @@ -95,14 +140,39 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/configure.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/debian.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/fedora_core.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/freebsd.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/gentoo.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/linspire.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mac.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mandriva.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mepis.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/novell.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/redhatenterprise.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/slackware.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/ubuntu.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/windows.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/xandros.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/download.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/final.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/hp_setup.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/debian.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/fc4.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/freebsd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/mandriva06.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/slackware.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html @@ -143,16 +213,20 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html @@ -184,8 +258,11 @@ share/cups/model/foomatic-ppds %%DATADIR%%/base/logger.py %%DATADIR%%/base/magic.py %%DATADIR%%/base/maint.py +%%DATADIR%%/base/mdns.py %%DATADIR%%/base/mfpdtf.py +%%DATADIR%%/base/models.py %%DATADIR%%/base/msg.py +%%DATADIR%%/base/pexpect.py %%DATADIR%%/base/pml.py %%DATADIR%%/base/service.py %%DATADIR%%/base/slp.py @@ -197,6 +274,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/colorcal %%DATADIR%%/copier/__init__.py %%DATADIR%%/copier/copier.py +%%DATADIR%%/data/firmware/HP_LaserJet_1018.fw.gz +%%DATADIR%%/data/firmware/HP_LaserJet_1020.fw.gz %%DATADIR%%/data/hplip.desktop %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png @@ -309,8 +388,11 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/dj350.png %%DATADIR%%/data/images/dj450.png %%DATADIR%%/data/images/down.png +%%DATADIR%%/data/images/download.png %%DATADIR%%/data/images/error.png %%DATADIR%%/data/images/error_small.png +%%DATADIR%%/data/images/fax_icon.png +%%DATADIR%%/data/images/fax_icon_disabled.png %%DATADIR%%/data/images/folder_open.png %%DATADIR%%/data/images/folder_remove.png %%DATADIR%%/data/images/gif.png @@ -375,6 +457,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/jpg.png %%DATADIR%%/data/images/laserjet_2410.png %%DATADIR%%/data/images/load_paper.png +%%DATADIR%%/data/images/makecopies_icon.png +%%DATADIR%%/data/images/makecopies_icon_disabled.png %%DATADIR%%/data/images/movie.png %%DATADIR%%/data/images/mpg.png %%DATADIR%%/data/images/next.png @@ -390,14 +474,20 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/panel_lcd.xpm %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/paper_small.png +%%DATADIR%%/data/images/pcard_icon.png +%%DATADIR%%/data/images/pcard_icon_disabled.png %%DATADIR%%/data/images/pens.png %%DATADIR%%/data/images/photosmart_7150.png %%DATADIR%%/data/images/photosmart_7900_series.png %%DATADIR%%/data/images/png.png %%DATADIR%%/data/images/powered_by_python.png %%DATADIR%%/data/images/prev.png +%%DATADIR%%/data/images/print_icon.png +%%DATADIR%%/data/images/print_icon_disabled.png %%DATADIR%%/data/images/psc_1100_series.png %%DATADIR%%/data/images/psc_2300_series.png +%%DATADIR%%/data/images/scan_icon.png +%%DATADIR%%/data/images/scan_icon_disabled.png %%DATADIR%%/data/images/standard_coverpage.png %%DATADIR%%/data/images/status_refresh.png %%DATADIR%%/data/images/tif.png @@ -423,6 +513,7 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/ldl/cbccal_done.ldl.gz %%DATADIR%%/data/ldl/cbcpcal.ldl.gz %%DATADIR%%/data/ldl/cbpcal.ldl.gz +%%DATADIR%%/data/models/models.dat %%DATADIR%%/data/pcl/align1_8xx.pcl.gz %%DATADIR%%/data/pcl/align1_9xx.pcl.gz %%DATADIR%%/data/pcl/align2_8xx.pcl.gz @@ -443,28 +534,24 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/pcl/crpcal.pcl.gz %%DATADIR%%/data/ps/clean_page.pdf.gz %%DATADIR%%/data/ps/testpage.ps.gz -%%DATADIR%%/data/xml/HPLIP-0.9.6.xml -%%DATADIR%%/data/xml/HPLIP-0.9.7.xml -%%DATADIR%%/data/xml/HPLIP-02-2006.xml -%%DATADIR%%/data/xml/HPLIP-03-2006.xml -%%DATADIR%%/data/xml/HPLIP-05-2006.xml -%%DATADIR%%/data/xml/HPLIP-06-2006.xml -%%DATADIR%%/data/xml/HPLIP-07-2006.xml -%%DATADIR%%/data/xml/HPLIP-08-2006.xml -%%DATADIR%%/data/xml/models.xml -%%DATADIR%%/data/xml/unsupported.xml %%DATADIR%%/fab %%DATADIR%%/fax/__init__.py %%DATADIR%%/fax/backend/hpfax %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py %%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd +%%DATADIR%%/firmware %%DATADIR%%/hpaio.desc -%%DATADIR%%/hplip -%%DATADIR%%/hplip.conf +%%DATADIR%%/hplip-install %%DATADIR%%/hplip.sh %%DATADIR%%/hpssd.py %%DATADIR%%/info +%%DATADIR%%/install.py +%%DATADIR%%/installer/__init__.py +%%DATADIR%%/installer/core.py +%%DATADIR%%/installer/dcheck.py +%%DATADIR%%/installer/distros.py +%%DATADIR%%/installer/text_install.py %%DATADIR%%/levels %%DATADIR%%/makecopies %%DATADIR%%/makeuri @@ -483,10 +570,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py %%DATADIR%%/prnt/printable_areas.py +%%DATADIR%%/probe %%DATADIR%%/scan/__init__.py %%DATADIR%%/sendfax %%DATADIR%%/setup %%DATADIR%%/testpage +%%DATADIR%%/timedate %%DATADIR%%/toolbox %%DATADIR%%/ui/__init__.py %%DATADIR%%/ui/aboutdlg.py @@ -545,6 +634,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/printerform_base.ui %%DATADIR%%/ui/settingsdialog.py %%DATADIR%%/ui/settingsdialog_base.py +%%DATADIR%%/ui/setupform.py +%%DATADIR%%/ui/setupform_base.py +%%DATADIR%%/ui/setupmanualfind.py +%%DATADIR%%/ui/setupmanualfind_base.py +%%DATADIR%%/ui/setupsettings.py +%%DATADIR%%/ui/setupsettings_base.py %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/unloadform_base.py %%DATADIR%%/ui/waitform.py @@ -568,7 +663,6 @@ share/ppd/HP/HP-Business_Inkjet_3000-hpijs.ppd.gz share/ppd/HP/HP-Color_Inkjet_Printer_CP1160-hpijs.ppd.gz share/ppd/HP/HP-Color_Inkjet_Printer_CP1700-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_2500-hpijs.ppd.gz -share/ppd/HP/HP-Color_LaserJet_2550-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3000-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3550-hpijs.ppd.gz @@ -591,6 +685,7 @@ share/ppd/HP/HP-Color_LaserJet_8500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_8550GN-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CP4005-hpijs.ppd.gz share/ppd/HP/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1100C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1120C-hpijs.ppd.gz @@ -798,6 +893,14 @@ share/ppd/HP/HP-LaserJet_9050-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9050_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9055_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9065_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M3027_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M3035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M4345_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M5025_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M5035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P2015-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P3004-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P3005-hpijs.ppd.gz share/ppd/HP/HP-Mopier_240-hpijs.ppd.gz share/ppd/HP/HP-Mopier_320-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet-hpijs.ppd.gz @@ -925,12 +1028,18 @@ share/ppd/HP/HP-PhotoSmart_8100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A310-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C6100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5060-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D6100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz @@ -943,6 +1052,7 @@ share/ppd/HP/HP-PhotoSmart_P1218-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P130-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1315-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P230-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_Pro_B8300-hpijs.ppd.gz share/ppd/HP/HP-e-printer_e20-hpijs.ppd.gz share/ppd/HP/HP_Business_Inkjet_2250.ppd.gz share/ppd/HP/HP_Business_Inkjet_2280.ppd.gz @@ -1037,14 +1147,16 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz @dirrm %%DATADIR%%/prnt @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/pcard +@dirrm %%DATADIR%%/installer @dirrm %%DATADIR%%/fax/ppd @dirrm %%DATADIR%%/fax/backend @dirrm %%DATADIR%%/fax -@dirrm %%DATADIR%%/data/xml @dirrm %%DATADIR%%/data/ps @dirrm %%DATADIR%%/data/pcl +@dirrm %%DATADIR%%/data/models @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images +@dirrm %%DATADIR%%/data/firmware @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @@ -1061,6 +1173,8 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step3 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step2 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step1 +%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros +%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index 523ff9f3f575..01d2684b0d11 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 1.6.7 +PORTVERSION= 1.6.12 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -40,7 +40,7 @@ PKGDEINSTALL= ${PKGINSTALL} OPTIONS= GUI "build with Python QT" on -PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.7 +PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.12 .include <bsd.port.pre.mk> @@ -48,12 +48,9 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.7 USE_AUTOTOOLS= automake:19:env autoconf:259:env aclocal:19:env .endif -.if exists(${LOCALBASE}/bin/pylupdate) -WITH_GUI= yes -.endif - -.if defined(WITH_GUI) +.if !defined(WITHOUT_GUI) || exists(${LOCALBASE}/bin/pylupdate) RUN_DEPENDS+= pylupdate:${PORTSDIR}/x11-toolkits/py-qt +CONFIGURE_ARGS+= --enable-gui-build .endif post-extract: @@ -61,6 +58,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \ + s|/usr/lib/cups/backend|${LOCALBASE}/libexec/cups/backend|g ; \ s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ ${WRKSRC}/configure ${WRKSRC}/prnt/hpijs/configure @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g ; \ @@ -70,13 +68,16 @@ post-patch: s|/etc/hp|${LOCALBASE}/etc/hp|g' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g ; \ + s|/usr/lib|${LOCALBASE}/lib|g' \ + ${WRKSRC}/prnt/hpijs/foomatic-rip @${REINPLACE_CMD} -e 's|/etc/hp/|${LOCALBASE}/etc/hp/|g ; \ s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ ${WRKSRC}/base/g.py \ ${WRKSRC}/fax/backend/hpfax.py \ ${WRKSRC}/hpssd.py \ ${WRKSRC}/io/hpiod/hpiod.h \ - ${WRKSRC}/prnt/hpijs/hplip_api.h \ + ${WRKSRC}/api/hplip_api.h \ ${WRKSRC}/prnt/hpijs/configure.in @${REINPLACE_CMD} -e 's|#!/usr/bin/env python|#!${LOCALBASE}/bin/python|g' \ ${WRKSRC}/*.py \ diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo index 9964581354e5..91cae5433353 100644 --- a/print/hplip3/distinfo +++ b/print/hplip3/distinfo @@ -1,3 +1,3 @@ -MD5 (hplip-1.6.7.tar.gz) = b1e814c7f5ef2a5033e4c3e5162ac694 -SHA256 (hplip-1.6.7.tar.gz) = 27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 -SIZE (hplip-1.6.7.tar.gz) = 9984016 +MD5 (hplip-1.6.12.tar.gz) = 8adcb93703f6e90510f51b3cf96567c9 +SHA256 (hplip-1.6.12.tar.gz) = dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24 +SIZE (hplip-1.6.12.tar.gz) = 10679971 diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in index 87a92ec30122..367e539af053 100644 --- a/print/hplip3/files/patch-Makefile.in +++ b/print/hplip3/files/patch-Makefile.in @@ -1,6 +1,15 @@ ---- Makefile.in.orig Tue Aug 1 16:41:16 2006 -+++ Makefile.in Wed Sep 27 17:13:29 2006 -@@ -390,12 +390,12 @@ +--- Makefile.in.orig Tue Dec 19 18:11:05 2006 ++++ Makefile.in Mon Dec 25 02:30:25 2006 +@@ -414,7 +414,7 @@ + www243dir = $(docdir)/install/step4/suse + dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + www251dir = $(docdir)/install/manual +-dist_www251_DATA = $(wwwsrc)/install/manual/* ++dist_www251_DATA = $(wwwsrc)/install/manual/*.html + www252dir = $(docdir)/install/manual/distros + dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + www3dir = $(docdir)/styles +@@ -424,12 +424,12 @@ www5dir = $(docdir)/supported_devices dist_www5_DATA = $(wwwsrc)/supported_devices/* www6dir = $(docdir)/tech_docs @@ -13,13 +22,18 @@ dist_www7_DATA = $(wwwsrc)/troubleshooting/* -dist_hplip_DATA = $(doc_DATA) hplip.conf +dist_hplip_DATA = $(doc_DATA) - dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh + dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install cmddir = $(hplipdir) dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ -@@ -2415,15 +2415,9 @@ +@@ -2562,20 +2562,9 @@ # - # Do full install if not rpm_install. - if [ "$(rpm_install)" = "no" ]; then \ + # If scanner build, install sane backend. + if [ "$(scan_build)" = "yes" ]; then \ +- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ +- touch $(DESTDIR)/etc/sane.d/dll.conf; \ +- fi; \ +- $(mkinstalldirs) $(DESTDIR)$(sanedir); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \ - ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \ @@ -34,41 +48,89 @@ + ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \ fi - install-data-hook: test-destdir install-pcardext install-cupsext -@@ -2466,7 +2460,7 @@ - newname=$${i%.*}; \ - mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ - if [ "$(rpm_install)" = "no" ]; then \ + install-data-hook: install-pcardext install-cupsext +@@ -2618,63 +2607,42 @@ + newname=$${i%.*}; \ + mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ + if [ ! \( "$$newname" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \ - ln -sf ../share/$(PACKAGE)/$$newname $(DESTDIR)$(bindir)/hp-$$newname; \ + ln -sf $(prefix)/share/$(PACKAGE)/$$newname $(DESTDIR)$(bindir)/hp-$$newname; \ - fi \ + fi \ done # -@@ -2501,22 +2495,7 @@ - sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ - sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ - rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp + # Edit hpiod.conf in destdir. +- echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf ++ echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf ++ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf ++ echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf + if [ "$(network_build)" = "yes" ]; then \ +- echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "network-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "network-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(pp_build)" = "yes" ]; then \ +- echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "pp-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "pp-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(gui_build)" = "yes" ]; then \ +- echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "gui-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "gui-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(scan_build)" = "yes" ]; then \ +- echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "scanner-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "scanner-build=0" >> $(PACKAGE).conf; \ + fi + if [ "$(fax_build)" = "yes" ]; then \ +- echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ ++ echo -e "fax-build=1" >> $(PACKAGE).conf; \ + else \ +- echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ +- fi +- echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf +- echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -# --# Do full install if not rpm_install. Also only run chkconfig/install_initd if DESTDIR="". -- if [ "$(rpm_install)" = "no" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/hp; \ -- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \ -- if [ -d $(DESTDIR)/etc/init.d ]; then \ -- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d; \ -- if [ "$(DESTDIR)" = "" ]; then \ -- if [ "$(INSTALLINITD)" != "" ]; then \ -- $(INSTALLINITD) $(PACKAGE); \ -- else \ -- $(CHKCONFIG) $(PACKAGE) reset; \ -- fi \ -- fi \ +-# Install hpiod.conf. +- $(mkinstalldirs) $(DESTDIR)/etc/hp +- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp +-# +-# Create hpiod start/stop script from hpiod.sh in destdir. +- sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ +- sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ +- rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp +-# +-# Install hpiod start/stop script. +- $(mkinstalldirs) $(DESTDIR)/etc/init.d +- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d +-# +-# Run chkconfig/install_initd if DESTDIR="". +- if [ "$(DESTDIR)" = "" ]; then \ +- if [ "$(INSTALLINITD)" != "" ]; then \ +- $(INSTALLINITD) $(PACKAGE); \ +- elif [ "$(CHKCONFIG)" != "" ]; then \ +- $(CHKCONFIG) $(PACKAGE) reset; \ - fi \ -- fi ++ echo -e "fax-build=0" >> $(PACKAGE).conf; \ + fi ++ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf ++ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf + # - # For internal testing. - if [ "$(SHADOW)" != "" ]; then \ -@@ -2548,8 +2527,8 @@ + # Install fax support. Let hpijs symlink hpppddir to cupsppddir. + if [ "$(fax_build)" = "yes" ]; then \ +@@ -2705,8 +2673,8 @@ done # # Remove hplip.conf and hplip start/stop script. @@ -79,22 +141,3 @@ # # Remove fax support. rm -f $(DESTDIR)$(hpfaxdir)/hpfax -@@ -2560,13 +2539,13 @@ - # Add prerequisites for testing (or building?) "make install DESTDIR=/build". - test-destdir: - if [ "$(DESTDIR)" != "" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/init.d; \ -- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ -- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- touch $(DESTDIR)/etc/sane.d/dll.conf; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/rc.d; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/sane.d; \ -+ if [ ! -f $(DESTDIR)/usr/local/etc/sane.d/dll.conf ]; then \ -+ touch $(DESTDIR)/usr/local/etc/sane.d/dll.conf; \ - fi; \ - $(mkinstalldirs) $(DESTDIR)$(sanedir); \ -- $(mkinstalldirs) $(DESTDIR)/usr/share/applications; \ -+ $(mkinstalldirs) $(DESTDIR)/usr/local/share/applications; \ - $(mkinstalldirs) $(DESTDIR)/usr/bin; \ - fi - diff --git a/print/hplip3/files/patch-api_model.c b/print/hplip3/files/patch-api_model.c new file mode 100644 index 000000000000..c9ddf37a9cfe --- /dev/null +++ b/print/hplip3/files/patch-api_model.c @@ -0,0 +1,11 @@ +--- api/model.c.orig 2006-10-18 20:58:33.000000000 +0200 ++++ api/model.c 2007-01-19 15:58:49.000000000 +0100 +@@ -269,7 +269,7 @@ static int DelList() + /* Parse *.inc file. */ + static int ParseInc(char *incFile) + { +- FILE *fp; ++ FILE *fp = NULL; + struct list_head *p; + LabelRecord *pl; + char rcbuf[255]; diff --git a/print/hplip3/files/patch-backend_hp_hp.c b/print/hplip3/files/patch-backend_hp_hp.c deleted file mode 100644 index 8c13c66c2590..000000000000 --- a/print/hplip3/files/patch-backend_hp_hp.c +++ /dev/null @@ -1,19 +0,0 @@ ---- backend/hp/hp.c.orig Tue May 23 15:18:48 2006 -+++ backend/hp/hp.c Tue May 23 15:19:33 2006 -@@ -427,6 +427,7 @@ - int len, vstatus, cnt; - char buf[BUFFER_SIZE+HEADER_SIZE]; - MsgAttributes ma; -+ int hd=-1, channel=-1, n, total, retry=0, size; - - if (argc > 1) - { -@@ -474,8 +475,6 @@ - } - copies = atoi(argv[4]); - } -- -- int hd=-1, channel=-1, n, total, retry=0, size; - - hplip_Init(); - diff --git a/print/hplip3/files/patch-pcard_pcardext_pcardext.c b/print/hplip3/files/patch-pcard_pcardext_pcardext.c index 4c531f92d1f2..133c6b2c5879 100644 --- a/print/hplip3/files/patch-pcard_pcardext_pcardext.c +++ b/print/hplip3/files/patch-pcard_pcardext_pcardext.c @@ -17,13 +17,3 @@ /*char buf[1024]; sprintf( buf, "print 'FatInit()=%d\n'", i ); PyRun_SimpleString( buf );*/ -@@ -111,8 +112,8 @@ - PyObject * pcardext_ls( PyObject * self, PyObject * args ) - { - PyObject * file_list; -- file_list = PyList_New(0); - FILE_ATTRIBUTES fa; -+ file_list = PyList_New(0); - - FatDirBegin( &fa ); - diff --git a/print/hplip3/files/patch-prnt_cupsext_cupsext.c b/print/hplip3/files/patch-prnt_cupsext_cupsext.c index 02351d5d2a7c..685db5bee2ca 100644 --- a/print/hplip3/files/patch-prnt_cupsext_cupsext.c +++ b/print/hplip3/files/patch-prnt_cupsext_cupsext.c @@ -1,6 +1,6 @@ ---- prnt/cupsext/cupsext.c.orig Tue May 23 15:45:57 2006 -+++ prnt/cupsext/cupsext.c Tue May 23 15:49:34 2006 -@@ -253,11 +253,23 @@ +--- prnt/cupsext/cupsext.c.orig Thu Sep 14 12:51:40 2006 ++++ prnt/cupsext/cupsext.c Wed Oct 18 00:39:28 2006 +@@ -259,11 +259,23 @@ PyObject * getPrinters( PyObject * self, PyObject * args ) { @@ -24,16 +24,16 @@ cups_lang_t * language; static const char * attrs[] = /* Requested attributes */ { -@@ -300,7 +312,7 @@ +@@ -306,7 +318,7 @@ goto abort; } -- int max_count = 0; +- Py_ssize_t max_count = 0; + max_count = 0; - for ( attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME), + for (attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME), max_count = 0; -@@ -311,16 +323,7 @@ +@@ -317,16 +329,7 @@ printer_list = PyList_New( max_count ); @@ -51,7 +51,7 @@ for (attr = response->attrs; attr != NULL; attr = attr->next) { -@@ -392,7 +395,6 @@ +@@ -398,7 +401,6 @@ continue; } @@ -59,7 +59,7 @@ printer = (printer_Object *)_newPrinter( device_uri, name, printer_uri, location, make_model, info, state/*, ppd_name*/ ); PyList_SET_ITEM( printer_list, i, (PyObject *)printer ); -@@ -925,13 +927,13 @@ +@@ -935,13 +937,13 @@ PyObject * getPPD( PyObject * self, PyObject * args ) { char * printer; @@ -74,7 +74,7 @@ ppd = cupsGetPPD( (const char *)printer ); return Py_BuildValue( "s", ppd ); -@@ -941,16 +943,16 @@ +@@ -951,16 +953,16 @@ PyObject * getPPDOption( PyObject * self, PyObject * args ) { diff --git a/print/hplip3/files/patch-prnt_hpijs_configure b/print/hplip3/files/patch-prnt_hpijs_configure new file mode 100644 index 000000000000..7e6c63c94649 --- /dev/null +++ b/print/hplip3/files/patch-prnt_hpijs_configure @@ -0,0 +1,56 @@ +--- prnt/hpijs/configure.orig Wed Oct 18 00:58:44 2006 ++++ prnt/hpijs/configure Wed Oct 18 01:04:20 2006 +@@ -8481,7 +8481,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8539,7 +8539,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" + else + + lt_cv_dlopen="dyld" +@@ -8807,7 +8807,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8865,7 +8865,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 + if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" + else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +@@ -20319,7 +20319,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20380,7 +20380,7 @@ + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBDL 1 + _ACEOF +- LIBS="-ldl $LIBS" ++ LIBS="$LIBS" + else + { { echo "$as_me:$LINENO: error: \"cannot find libdl support\"" >&5 + echo "$as_me: error: \"cannot find libdl support\"" >&2;}
\ No newline at end of file diff --git a/print/hplip3/files/patch-scan_sane-mfpdtf.c b/print/hplip3/files/patch-scan_sane-mfpdtf.c index 2d97133a3ffd..84fb6edefa58 100644 --- a/print/hplip3/files/patch-scan_sane-mfpdtf.c +++ b/print/hplip3/files/patch-scan_sane-mfpdtf.c @@ -1,20 +1,15 @@ ---- scan/sane/mfpdtf.c.orig Tue May 23 15:07:49 2006 -+++ scan/sane/mfpdtf.c Tue May 23 15:10:30 2006 -@@ -156,10 +156,10 @@ - +--- scan/sane/mfpdtf.c.orig Sat Nov 11 00:22:14 2006 ++++ scan/sane/mfpdtf.c Mon Dec 25 01:43:52 2006 +@@ -157,7 +157,7 @@ int MfpdtfReadService( Mfpdtf_t mfpdtf ) { -- DBG( 0, "MfpdtfReadService() ______________________________ deviceid=%d, channelid=%d ______________________________\n", mfpdtf->deviceid, mfpdtf->channelid ); -- int result = 0; - int datalen, blockLength, headerLength; + int datalen, blockLength, headerLength, r; -+ -+ DBG( 0, "MfpdtfReadService() ______________________________ deviceid=%d, channelid=%d ______________________________\n", mfpdtf->deviceid, mfpdtf->channelid ); if( mfpdtf->read.fixedBlockBytesRemaining <= 0 ) { -@@ -171,7 +171,7 @@ +@@ -169,7 +169,7 @@ //READ( &mfpdtf->read.fixedHeader, datalen ); @@ -23,7 +18,7 @@ if( r!= datalen ) { -@@ -209,7 +209,7 @@ +@@ -207,7 +207,7 @@ //READ( mfpdtf->read.pVariantHeader, datalen ); @@ -32,7 +27,7 @@ if( r!= datalen ) { -@@ -261,7 +261,7 @@ +@@ -259,7 +259,7 @@ //READ( &id, datalen ); @@ -41,28 +36,19 @@ if( r!= datalen ) { -@@ -280,7 +280,7 @@ - DBG( 0, "********************************** RASTER RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageRasterDataHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageRasterDataHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageRasterDataHeader, datalen ); - - if( r!= datalen ) - { -@@ -302,7 +302,7 @@ - DBG( 0, "********************************** SOP RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageStartPageRecord, datalen ); - +@@ -296,7 +296,7 @@ + datalen = sizeof( mfpdtf->read.imageStartPageRecord ); + // DBG( 0, "Reading start of page record.\n" ); + // DBG( 0, "********************************** SOP RECORD **********************************.\n" ); - int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); + r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); if( r!= datalen ) { -@@ -322,7 +322,7 @@ - DBG( 0, "********************************** EOP RECORD **********************************.\n" ); - //READ( &mfpdtf->read.imageEndPageRecord, datalen ); - +@@ -314,7 +314,7 @@ + datalen = sizeof( mfpdtf->read.imageEndPageRecord ); + // DBG( 0, "Reading end of page record.\n" ); + // DBG( 0, "********************************** EOP RECORD **********************************.\n" ); - int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); + r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); diff --git a/print/hplip3/files/patch-scan_sane_hpaio.c b/print/hplip3/files/patch-scan_sane_hpaio.c deleted file mode 100644 index a3422498486e..000000000000 --- a/print/hplip3/files/patch-scan_sane_hpaio.c +++ /dev/null @@ -1,63 +0,0 @@ ---- scan/sane/hpaio.c.orig Tue May 23 15:40:36 2006 -+++ scan/sane/hpaio.c Tue May 23 15:08:07 2006 -@@ -1632,10 +1632,11 @@ - extern SANE_Status sane_hpaio_get_parameters( SANE_Handle handle, - SANE_Parameters * pParams ) - { -- DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); -- - hpaioScanner_t hpaio = ( hpaioScanner_t ) handle; - char * s = ""; -+ -+ DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); -+ - if( !hpaio->hJob ) - { - *pParams = hpaio->prescanParameters; -@@ -2100,8 +2101,6 @@ - extern SANE_Status sane_hpaio_open( SANE_String_Const devicename, - SANE_Handle * pHandle ) - { -- DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************************************************************************\n", devicename ); -- - SANE_Status retcode = SANE_STATUS_INVAL; - hpaioScanner_t hpaio = 0; - int r; -@@ -2114,6 +2113,7 @@ - char devname[256]; - MsgAttributes ma; - -+ DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************************************************************************\n", devicename ); - hpaio = hpaioFindScanner( devicename ); - - if( hpaio ) -@@ -2878,6 +2878,8 @@ - IP_IMAGE_TRAITS traits; - IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform = xforms; - WORD wResult; -+ int lines, pixelsPerLine; -+ int log_output; - - DBG( 0, "\nhpaio: sane_hpaio_start() ******************************************************************************************* \n" ); - -@@ -2953,8 +2955,6 @@ - - // if( hpaio->scannerType == SCANNER_TYPE_SCL ) - // { -- int lines, pixelsPerLine; -- - /* Inquire exact image dimensions. */ - if( SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_DEVICE_PARAMETER, SCL_INQ_NUMBER_OF_SCAN_LINES, - &lines, 0, 0 ) == SANE_STATUS_GOOD ) -@@ -2979,9 +2979,9 @@ - MfpdtfReadStart( hpaio->mfpdtf ); /* inits mfpdtf */ - - #ifdef HPAIO_DEBUG -- int log_output=1; -+ log_output=1; - #else -- int log_output=0; -+ log_output=0; - #endif - - if( log_output ) diff --git a/print/hplip3/files/patch-scan_sane_io.c b/print/hplip3/files/patch-scan_sane_io.c deleted file mode 100644 index 4a553d26fefb..000000000000 --- a/print/hplip3/files/patch-scan_sane_io.c +++ /dev/null @@ -1,38 +0,0 @@ ---- scan/sane/io.c.orig Tue May 23 15:15:04 2006 -+++ scan/sane/io.c Tue May 23 15:17:40 2006 -@@ -210,6 +210,13 @@ - { - char message[ BUFFER_SIZE ]; - MsgAttributes ma; -+ int remaining; -+ char *p; -+ int state = 0; -+ int d = 0; -+ char * uri = NULL; -+ char * mdl = NULL; -+ - - int len = sprintf( message, "msg=ProbeDevicesFiltered\nbus=%s\nfilter=scan\nformat=default\n", - "usb,cups,par" ); -@@ -228,18 +235,14 @@ - - hplip_ParseMsg( message, len, &ma ); - -- int d = 0; -- char * uri = NULL; -- char * mdl = NULL; -- - if( ma.ndevice > 0 ) - { - *devices = malloc( sizeof( SANE_Device * ) * ( ma.ndevice + 1 ) ); - -- int remaining = ma.length; -- char *p = (char *)ma.data; -+ remaining = ma.length; -+ p = (char *)ma.data; - -- int state = 0; -+ state = 0; - - while( remaining > 0 && *p != '\0' && d < ma.ndevice ) - { diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist index 7ff9ac370349..28334a858798 100644 --- a/print/hplip3/pkg-plist +++ b/print/hplip3/pkg-plist @@ -4,14 +4,17 @@ bin/hp-check bin/hp-clean bin/hp-colorcal bin/hp-fab +bin/hp-firmware bin/hp-info bin/hp-levels bin/hp-makecopies bin/hp-makeuri bin/hp-print +bin/hp-probe bin/hp-sendfax bin/hp-setup bin/hp-testpage +bin/hp-timedate bin/hp-toolbox bin/hp-unload bin/hpijs @@ -46,6 +49,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html @@ -63,30 +67,71 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_Manager.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagerPhoto_Card.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagerSend_Fax.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_5.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_6.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_7.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_8.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Install_Printer_Setup_5.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/build-essential.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/circular.gif %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon.ico %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs-esp.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs_hpijs.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp-tux-printer.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_device_manager.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_overview.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hpliplogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libcupsys2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libjpeg62-dev.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libsnmp5-dev.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/libusb-dev.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linuxlogo.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_appssocket.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_uri.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_model_list.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/openssl.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-dev.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-qt3-gl.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-reportlab.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sane-utils.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sflogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/toolboxlinspire.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/topbar.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tux.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/view.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/xsane.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_hardware.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_opening_hw.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_configure.png @@ -95,14 +140,39 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/configure.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/debian.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/fedora_core.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/freebsd.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/gentoo.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/linspire.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mac.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mandriva.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mepis.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/novell.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/redhatenterprise.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/slackware.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/ubuntu.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/windows.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/xandros.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/download.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/final.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/hp_setup.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/debian.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/fc4.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/freebsd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/mandriva06.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/slackware.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html @@ -143,16 +213,20 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html @@ -184,8 +258,11 @@ share/cups/model/foomatic-ppds %%DATADIR%%/base/logger.py %%DATADIR%%/base/magic.py %%DATADIR%%/base/maint.py +%%DATADIR%%/base/mdns.py %%DATADIR%%/base/mfpdtf.py +%%DATADIR%%/base/models.py %%DATADIR%%/base/msg.py +%%DATADIR%%/base/pexpect.py %%DATADIR%%/base/pml.py %%DATADIR%%/base/service.py %%DATADIR%%/base/slp.py @@ -197,6 +274,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/colorcal %%DATADIR%%/copier/__init__.py %%DATADIR%%/copier/copier.py +%%DATADIR%%/data/firmware/HP_LaserJet_1018.fw.gz +%%DATADIR%%/data/firmware/HP_LaserJet_1020.fw.gz %%DATADIR%%/data/hplip.desktop %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png @@ -309,8 +388,11 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/dj350.png %%DATADIR%%/data/images/dj450.png %%DATADIR%%/data/images/down.png +%%DATADIR%%/data/images/download.png %%DATADIR%%/data/images/error.png %%DATADIR%%/data/images/error_small.png +%%DATADIR%%/data/images/fax_icon.png +%%DATADIR%%/data/images/fax_icon_disabled.png %%DATADIR%%/data/images/folder_open.png %%DATADIR%%/data/images/folder_remove.png %%DATADIR%%/data/images/gif.png @@ -375,6 +457,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/jpg.png %%DATADIR%%/data/images/laserjet_2410.png %%DATADIR%%/data/images/load_paper.png +%%DATADIR%%/data/images/makecopies_icon.png +%%DATADIR%%/data/images/makecopies_icon_disabled.png %%DATADIR%%/data/images/movie.png %%DATADIR%%/data/images/mpg.png %%DATADIR%%/data/images/next.png @@ -390,14 +474,20 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/panel_lcd.xpm %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/paper_small.png +%%DATADIR%%/data/images/pcard_icon.png +%%DATADIR%%/data/images/pcard_icon_disabled.png %%DATADIR%%/data/images/pens.png %%DATADIR%%/data/images/photosmart_7150.png %%DATADIR%%/data/images/photosmart_7900_series.png %%DATADIR%%/data/images/png.png %%DATADIR%%/data/images/powered_by_python.png %%DATADIR%%/data/images/prev.png +%%DATADIR%%/data/images/print_icon.png +%%DATADIR%%/data/images/print_icon_disabled.png %%DATADIR%%/data/images/psc_1100_series.png %%DATADIR%%/data/images/psc_2300_series.png +%%DATADIR%%/data/images/scan_icon.png +%%DATADIR%%/data/images/scan_icon_disabled.png %%DATADIR%%/data/images/standard_coverpage.png %%DATADIR%%/data/images/status_refresh.png %%DATADIR%%/data/images/tif.png @@ -423,6 +513,7 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/ldl/cbccal_done.ldl.gz %%DATADIR%%/data/ldl/cbcpcal.ldl.gz %%DATADIR%%/data/ldl/cbpcal.ldl.gz +%%DATADIR%%/data/models/models.dat %%DATADIR%%/data/pcl/align1_8xx.pcl.gz %%DATADIR%%/data/pcl/align1_9xx.pcl.gz %%DATADIR%%/data/pcl/align2_8xx.pcl.gz @@ -443,28 +534,24 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/pcl/crpcal.pcl.gz %%DATADIR%%/data/ps/clean_page.pdf.gz %%DATADIR%%/data/ps/testpage.ps.gz -%%DATADIR%%/data/xml/HPLIP-0.9.6.xml -%%DATADIR%%/data/xml/HPLIP-0.9.7.xml -%%DATADIR%%/data/xml/HPLIP-02-2006.xml -%%DATADIR%%/data/xml/HPLIP-03-2006.xml -%%DATADIR%%/data/xml/HPLIP-05-2006.xml -%%DATADIR%%/data/xml/HPLIP-06-2006.xml -%%DATADIR%%/data/xml/HPLIP-07-2006.xml -%%DATADIR%%/data/xml/HPLIP-08-2006.xml -%%DATADIR%%/data/xml/models.xml -%%DATADIR%%/data/xml/unsupported.xml %%DATADIR%%/fab %%DATADIR%%/fax/__init__.py %%DATADIR%%/fax/backend/hpfax %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py %%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd +%%DATADIR%%/firmware %%DATADIR%%/hpaio.desc -%%DATADIR%%/hplip -%%DATADIR%%/hplip.conf +%%DATADIR%%/hplip-install %%DATADIR%%/hplip.sh %%DATADIR%%/hpssd.py %%DATADIR%%/info +%%DATADIR%%/install.py +%%DATADIR%%/installer/__init__.py +%%DATADIR%%/installer/core.py +%%DATADIR%%/installer/dcheck.py +%%DATADIR%%/installer/distros.py +%%DATADIR%%/installer/text_install.py %%DATADIR%%/levels %%DATADIR%%/makecopies %%DATADIR%%/makeuri @@ -483,10 +570,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py %%DATADIR%%/prnt/printable_areas.py +%%DATADIR%%/probe %%DATADIR%%/scan/__init__.py %%DATADIR%%/sendfax %%DATADIR%%/setup %%DATADIR%%/testpage +%%DATADIR%%/timedate %%DATADIR%%/toolbox %%DATADIR%%/ui/__init__.py %%DATADIR%%/ui/aboutdlg.py @@ -545,6 +634,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/printerform_base.ui %%DATADIR%%/ui/settingsdialog.py %%DATADIR%%/ui/settingsdialog_base.py +%%DATADIR%%/ui/setupform.py +%%DATADIR%%/ui/setupform_base.py +%%DATADIR%%/ui/setupmanualfind.py +%%DATADIR%%/ui/setupmanualfind_base.py +%%DATADIR%%/ui/setupsettings.py +%%DATADIR%%/ui/setupsettings_base.py %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/unloadform_base.py %%DATADIR%%/ui/waitform.py @@ -568,7 +663,6 @@ share/ppd/HP/HP-Business_Inkjet_3000-hpijs.ppd.gz share/ppd/HP/HP-Color_Inkjet_Printer_CP1160-hpijs.ppd.gz share/ppd/HP/HP-Color_Inkjet_Printer_CP1700-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_2500-hpijs.ppd.gz -share/ppd/HP/HP-Color_LaserJet_2550-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3000-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_3550-hpijs.ppd.gz @@ -591,6 +685,7 @@ share/ppd/HP/HP-Color_LaserJet_8500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_8550GN-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CP4005-hpijs.ppd.gz share/ppd/HP/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1100C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1120C-hpijs.ppd.gz @@ -798,6 +893,14 @@ share/ppd/HP/HP-LaserJet_9050-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9050_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9055_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_9065_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M3027_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M3035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M4345_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M5025_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_M5035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P2015-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P3004-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P3005-hpijs.ppd.gz share/ppd/HP/HP-Mopier_240-hpijs.ppd.gz share/ppd/HP/HP-Mopier_320-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet-hpijs.ppd.gz @@ -925,12 +1028,18 @@ share/ppd/HP/HP-PhotoSmart_8100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A310-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C6100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5060-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D6100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz @@ -943,6 +1052,7 @@ share/ppd/HP/HP-PhotoSmart_P1218-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P130-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1315-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P230-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_Pro_B8300-hpijs.ppd.gz share/ppd/HP/HP-e-printer_e20-hpijs.ppd.gz share/ppd/HP/HP_Business_Inkjet_2250.ppd.gz share/ppd/HP/HP_Business_Inkjet_2280.ppd.gz @@ -1037,14 +1147,16 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz @dirrm %%DATADIR%%/prnt @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/pcard +@dirrm %%DATADIR%%/installer @dirrm %%DATADIR%%/fax/ppd @dirrm %%DATADIR%%/fax/backend @dirrm %%DATADIR%%/fax -@dirrm %%DATADIR%%/data/xml @dirrm %%DATADIR%%/data/ps @dirrm %%DATADIR%%/data/pcl +@dirrm %%DATADIR%%/data/models @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images +@dirrm %%DATADIR%%/data/firmware @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @@ -1061,6 +1173,8 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step3 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step2 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step1 +%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros +%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos |