- Update to 2.8.2

PR:		ports/121508
Submitted by:	Anish Mistry <amistry at am-productions.biz> (maintainer)
This commit is contained in:
Rong-En Fan 2008-03-16 05:29:59 +00:00
parent 7b577af6e8
commit 3ffe47e80b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=209130
8 changed files with 1062 additions and 2250 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= hplip PORTNAME= hplip
PORTVERSION= 2.7.12 PORTVERSION= 2.8.2
CATEGORIES= print CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hplip MASTER_SITE_SUBDIR= hplip
@ -30,7 +30,9 @@ CONFIGURE_ARGS= --disable-dependency-tracking \
--disable-pp-build \ --disable-pp-build \
--enable-foomatic-ppd-install \ --enable-foomatic-ppd-install \
--with-icondir=${LOCALBASE}/share/applications \ --with-icondir=${LOCALBASE}/share/applications \
--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend --with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
--with-drvdir=${LOCALBASE}/libexec/cups/driver
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_GHOSTSCRIPT_RUN= yes USE_GHOSTSCRIPT_RUN= yes
@ -101,11 +103,9 @@ post-patch:
s|-dld||g' \ s|-dld||g' \
${WRKSRC}/configure \ ${WRKSRC}/configure \
${WRKSRC}/configure.in \ ${WRKSRC}/configure.in \
${WRKSRC}/foomatic-db-hpijs/make_configure \
${WRKSRC}/Makefile.in \ ${WRKSRC}/Makefile.in \
${WRKSRC}/Makefile.am \ ${WRKSRC}/Makefile.am \
${WRKSRC}/aclocal.m4 \ ${WRKSRC}/aclocal.m4
${WRKSRC}/foomatic-db-hpijs/configure.ac
@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \ @${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
${WRKSRC}/hpssd.py ${WRKSRC}/hpssd.py

View file

@ -1,3 +1,3 @@
MD5 (hplip-2.7.12.tar.gz) = ba00337ccf1b520509518bffbec960db MD5 (hplip-2.8.2.tar.gz) = ea57b92483622d3eae359994c5fd3dc3
SHA256 (hplip-2.7.12.tar.gz) = 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0 SHA256 (hplip-2.8.2.tar.gz) = 2135f2e02077cf5388c4b9b8214f0fd56f24f8bb2ccfa564a80402520e2d5aa8
SIZE (hplip-2.7.12.tar.gz) = 14543662 SIZE (hplip-2.8.2.tar.gz) = 14195737

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig 2007-12-14 17:31:14.000000000 -0500 --- Makefile.in.orig 2008-02-09 10:06:41.000000000 +0800
+++ Makefile.in 2008-02-05 22:34:11.946793026 -0500 +++ Makefile.in 2008-03-16 01:24:58.000000000 +0800
@@ -695,7 +695,7 @@ @@ -697,7 +697,7 @@
dist_faxppdDATA_INSTALL = $(INSTALL_DATA) dist_faxppdDATA_INSTALL = $(INSTALL_DATA)
am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc
dist_hplipDATA_INSTALL = $(INSTALL_DATA) dist_hplipDATA_INSTALL = $(INSTALL_DATA)
@ -9,7 +9,7 @@
dist_imagesDATA_INSTALL = $(INSTALL_DATA) dist_imagesDATA_INSTALL = $(INSTALL_DATA)
am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \ am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \
data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \ data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \
@@ -1653,7 +1653,7 @@ @@ -1190,7 +1190,7 @@
dist_www242DATA_INSTALL = $(INSTALL_DATA) dist_www242DATA_INSTALL = $(INSTALL_DATA)
am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/* am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/*
dist_www243DATA_INSTALL = $(INSTALL_DATA) dist_www243DATA_INSTALL = $(INSTALL_DATA)
@ -18,7 +18,7 @@
dist_www251DATA_INSTALL = $(INSTALL_DATA) dist_www251DATA_INSTALL = $(INSTALL_DATA)
am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/* am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/*
dist_www252DATA_INSTALL = $(INSTALL_DATA) dist_www252DATA_INSTALL = $(INSTALL_DATA)
@@ -1661,13 +1661,13 @@ @@ -1198,13 +1198,13 @@
dist_www261DATA_INSTALL = $(INSTALL_DATA) dist_www261DATA_INSTALL = $(INSTALL_DATA)
am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
dist_www3DATA_INSTALL = $(INSTALL_DATA) dist_www3DATA_INSTALL = $(INSTALL_DATA)
@ -35,7 +35,7 @@
dist_www61DATA_INSTALL = $(INSTALL_DATA) dist_www61DATA_INSTALL = $(INSTALL_DATA)
am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/* am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/*
dist_www7DATA_INSTALL = $(INSTALL_DATA) dist_www7DATA_INSTALL = $(INSTALL_DATA)
@@ -1883,7 +1883,7 @@ @@ -1425,7 +1425,7 @@
@DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
@DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/* @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
@DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual
@ -44,7 +44,7 @@
@DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros
@DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/* @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
@DOC_BUILD_TRUE@www261dir = $(docdir)/install/install @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install
@@ -1891,13 +1891,13 @@ @@ -1433,13 +1433,13 @@
@DOC_BUILD_TRUE@www3dir = $(docdir)/styles @DOC_BUILD_TRUE@www3dir = $(docdir)/styles
@DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/* @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/*
@DOC_BUILD_TRUE@www4dir = $(docdir)/images @DOC_BUILD_TRUE@www4dir = $(docdir)/images
@ -61,7 +61,7 @@
@DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting
@DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/* @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/*
@HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc
@@ -1947,7 +1947,7 @@ @@ -1489,7 +1489,7 @@
@HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization
@HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
@HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat
@ -70,16 +70,16 @@
@HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
@@ -3157,7 +3157,7 @@ @@ -2170,7 +2170,7 @@
.SUFFIXES: .c .cpp .lo .o .obj .SUFFIXES: .c .cpp .lo .o .obj
am--refresh: am--refresh:
@: @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/foomatic_db.inc $(am__configure_deps) -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/foomatic_db.inc +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
@@ -3184,7 +3184,7 @@ @@ -2197,7 +2197,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
@ -88,3 +88,12 @@
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -6210,7 +6210,7 @@
install-dist_pcardSCRIPTS install-dist_pclDATA \
install-dist_pluginsSCRIPTS install-dist_postscriptDATA \
install-dist_prntSCRIPTS install-dist_ripSCRIPTS \
- install-dist_rulesDATA install-dist_scanSCRIPTS \
+ install-dist_scanSCRIPTS \
install-dist_uiSCRIPTS install-dist_unrelDATA \
install-dist_www0DATA install-dist_www1DATA \
install-dist_www21DATA install-dist_www22DATA \

File diff suppressed because it is too large Load diff

View file

@ -6,7 +6,7 @@
# #
PORTNAME= hplip PORTNAME= hplip
PORTVERSION= 2.7.12 PORTVERSION= 2.8.2
CATEGORIES= print CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hplip MASTER_SITE_SUBDIR= hplip
@ -30,7 +30,9 @@ CONFIGURE_ARGS= --disable-dependency-tracking \
--disable-pp-build \ --disable-pp-build \
--enable-foomatic-ppd-install \ --enable-foomatic-ppd-install \
--with-icondir=${LOCALBASE}/share/applications \ --with-icondir=${LOCALBASE}/share/applications \
--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend --with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
--with-drvdir=${LOCALBASE}/libexec/cups/driver
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_GHOSTSCRIPT_RUN= yes USE_GHOSTSCRIPT_RUN= yes
@ -101,11 +103,9 @@ post-patch:
s|-dld||g' \ s|-dld||g' \
${WRKSRC}/configure \ ${WRKSRC}/configure \
${WRKSRC}/configure.in \ ${WRKSRC}/configure.in \
${WRKSRC}/foomatic-db-hpijs/make_configure \
${WRKSRC}/Makefile.in \ ${WRKSRC}/Makefile.in \
${WRKSRC}/Makefile.am \ ${WRKSRC}/Makefile.am \
${WRKSRC}/aclocal.m4 \ ${WRKSRC}/aclocal.m4
${WRKSRC}/foomatic-db-hpijs/configure.ac
@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \ @${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
${WRKSRC}/hpssd.py ${WRKSRC}/hpssd.py

View file

@ -1,3 +1,3 @@
MD5 (hplip-2.7.12.tar.gz) = ba00337ccf1b520509518bffbec960db MD5 (hplip-2.8.2.tar.gz) = ea57b92483622d3eae359994c5fd3dc3
SHA256 (hplip-2.7.12.tar.gz) = 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0 SHA256 (hplip-2.8.2.tar.gz) = 2135f2e02077cf5388c4b9b8214f0fd56f24f8bb2ccfa564a80402520e2d5aa8
SIZE (hplip-2.7.12.tar.gz) = 14543662 SIZE (hplip-2.8.2.tar.gz) = 14195737

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig 2007-12-14 17:31:14.000000000 -0500 --- Makefile.in.orig 2008-02-09 10:06:41.000000000 +0800
+++ Makefile.in 2008-02-05 22:34:11.946793026 -0500 +++ Makefile.in 2008-03-16 01:24:58.000000000 +0800
@@ -695,7 +695,7 @@ @@ -697,7 +697,7 @@
dist_faxppdDATA_INSTALL = $(INSTALL_DATA) dist_faxppdDATA_INSTALL = $(INSTALL_DATA)
am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc
dist_hplipDATA_INSTALL = $(INSTALL_DATA) dist_hplipDATA_INSTALL = $(INSTALL_DATA)
@ -9,7 +9,7 @@
dist_imagesDATA_INSTALL = $(INSTALL_DATA) dist_imagesDATA_INSTALL = $(INSTALL_DATA)
am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \ am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \
data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \ data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \
@@ -1653,7 +1653,7 @@ @@ -1190,7 +1190,7 @@
dist_www242DATA_INSTALL = $(INSTALL_DATA) dist_www242DATA_INSTALL = $(INSTALL_DATA)
am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/* am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/*
dist_www243DATA_INSTALL = $(INSTALL_DATA) dist_www243DATA_INSTALL = $(INSTALL_DATA)
@ -18,7 +18,7 @@
dist_www251DATA_INSTALL = $(INSTALL_DATA) dist_www251DATA_INSTALL = $(INSTALL_DATA)
am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/* am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/*
dist_www252DATA_INSTALL = $(INSTALL_DATA) dist_www252DATA_INSTALL = $(INSTALL_DATA)
@@ -1661,13 +1661,13 @@ @@ -1198,13 +1198,13 @@
dist_www261DATA_INSTALL = $(INSTALL_DATA) dist_www261DATA_INSTALL = $(INSTALL_DATA)
am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
dist_www3DATA_INSTALL = $(INSTALL_DATA) dist_www3DATA_INSTALL = $(INSTALL_DATA)
@ -35,7 +35,7 @@
dist_www61DATA_INSTALL = $(INSTALL_DATA) dist_www61DATA_INSTALL = $(INSTALL_DATA)
am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/* am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/*
dist_www7DATA_INSTALL = $(INSTALL_DATA) dist_www7DATA_INSTALL = $(INSTALL_DATA)
@@ -1883,7 +1883,7 @@ @@ -1425,7 +1425,7 @@
@DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
@DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/* @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
@DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual
@ -44,7 +44,7 @@
@DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros
@DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/* @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
@DOC_BUILD_TRUE@www261dir = $(docdir)/install/install @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install
@@ -1891,13 +1891,13 @@ @@ -1433,13 +1433,13 @@
@DOC_BUILD_TRUE@www3dir = $(docdir)/styles @DOC_BUILD_TRUE@www3dir = $(docdir)/styles
@DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/* @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/*
@DOC_BUILD_TRUE@www4dir = $(docdir)/images @DOC_BUILD_TRUE@www4dir = $(docdir)/images
@ -61,7 +61,7 @@
@DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting
@DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/* @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/*
@HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc
@@ -1947,7 +1947,7 @@ @@ -1489,7 +1489,7 @@
@HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization
@HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
@HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat
@ -70,16 +70,16 @@
@HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
@HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
@@ -3157,7 +3157,7 @@ @@ -2170,7 +2170,7 @@
.SUFFIXES: .c .cpp .lo .o .obj .SUFFIXES: .c .cpp .lo .o .obj
am--refresh: am--refresh:
@: @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/foomatic_db.inc $(am__configure_deps) -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/foomatic_db.inc +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
@@ -3184,7 +3184,7 @@ @@ -2197,7 +2197,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
@ -88,3 +88,12 @@
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -6210,7 +6210,7 @@
install-dist_pcardSCRIPTS install-dist_pclDATA \
install-dist_pluginsSCRIPTS install-dist_postscriptDATA \
install-dist_prntSCRIPTS install-dist_ripSCRIPTS \
- install-dist_rulesDATA install-dist_scanSCRIPTS \
+ install-dist_scanSCRIPTS \
install-dist_uiSCRIPTS install-dist_unrelDATA \
install-dist_www0DATA install-dist_www1DATA \
install-dist_www21DATA install-dist_www22DATA \

File diff suppressed because it is too large Load diff