mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-10 07:04:03 +00:00
9a885c614b
- Fixed OPTIONS usage (ports/108103) and PREFIX problem - Removed files/ patch-backend_hp_hp.c, patch-scan_sane_hpaio.c, patch-scan_sane.c - Updated to 1.6.12 PR: ports/108278 Submitted by: Anish Minstry <aminstry at am-productions.biz> (maintainer) Approved by: alexbl (mentor, implicit)
144 lines
6.5 KiB
Plaintext
144 lines
6.5 KiB
Plaintext
--- 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
|
|
-dist_www6_DATA = $(wwwsrc)/tech_docs/*
|
|
+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
|
|
www61dir = $(docdir)/tech_docs/man_pages
|
|
-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
|
|
+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
|
|
www7dir = $(docdir)/troubleshooting
|
|
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 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 \
|
|
@@ -2562,20 +2562,9 @@
|
|
#
|
|
# 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); \
|
|
- if [ -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
|
|
- if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
|
|
- echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
|
|
- echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
|
|
- fi \
|
|
- fi \
|
|
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SONOVER); \
|
|
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOSHORT); \
|
|
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \
|
|
fi
|
|
|
|
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 \
|
|
done
|
|
#
|
|
# 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
|
|
-#
|
|
-# 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 \
|
|
+ echo -e "fax-build=0" >> $(PACKAGE).conf; \
|
|
fi
|
|
+ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf
|
|
+ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf
|
|
+
|
|
#
|
|
# 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.
|
|
- rm -f $(DESTDIR)/etc/hp/$(PACKAGE).conf
|
|
- rm -f $(DESTDIR)/etc/init.d/$(PACKAGE)
|
|
+ rm -f $(DESTDIR)/usr/local/etc/hp/$(PACKAGE).conf
|
|
+ rm -f $(DESTDIR)/usr/local/etc/rc.d/$(PACKAGE)
|
|
#
|
|
# Remove fax support.
|
|
rm -f $(DESTDIR)$(hpfaxdir)/hpfax
|