ports/146181: [PATCH] print/hplip3 various fixes

[Chris Petrik]

>Number:         146181
>Category:       ports
>Synopsis:       [PATCH] print/hplip3 various fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 30 10:50:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        FreeBSD-8-STABLE
>Organization:
Officialunix
>Environment:
FreeBSD 8 AMD64
>Description:
These are patches from:
144745 - fix %%PYTHON_VERSION ("Pierre Guinoiseau" <geekounet at poildetroll.net>)
140925 - add fixes by berend at pobox.com

PRs 144745, 140925 can be closed out as I had to redo the patches and add in USE_DOS2UNIX to please diff.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: hplip3/Makefile
===================================================================
RCS file: /usr/local/freebsdcvs/ports/print/hplip3/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- hplip3/Makefile	20 Apr 2010 19:00:46 -0000	1.37
+++ hplip3/Makefile	30 Apr 2010 10:35:07 -0000
@@ -45,6 +45,7 @@
 USE_RC_SUBR=	hpssd
 MAKE_JOBS_SAFE=	yes
 SUB_FILES=	pkg-message
+USE_DOS2UNIX=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: hplip3/pkg-plist
===================================================================
RCS file: /usr/local/freebsdcvs/ports/print/hplip3/pkg-plist,v
retrieving revision 1.16
diff -u -r1.16 pkg-plist
--- hplip3/pkg-plist	20 Apr 2010 19:00:46 -0000	1.16
+++ hplip3/pkg-plist	30 Apr 2010 10:35:07 -0000
@@ -1418,8 +1418,8 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry lib/sane
- at dirrmtry lib/python2.5/site-packages
- at dirrmtry lib/python2.5
+ at dirrmtry lib/%%PYTHON_VERSION%%/site-packages
+ at dirrmtry lib/%%PYTHON_VERSION%%
 @dirrmtry libexec/cups/filter
 @dirrmtry libexec/cups/backends
 @dirrmtry libexec/cups
Index: hplip3/files/patch-core_install.py
===================================================================
RCS file: hplip3/files/patch-core_install.py
diff -N hplip3/files/patch-core_install.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip3/files/patch-core_install.py	30 Apr 2010 10:35:07 -0000
@@ -0,0 +1,11 @@
+--- installer/core_install.py.old	2010-04-30 05:23:48.000000000 -0500
++++ installer/core_install.py	2010-04-30 05:24:07.000000000 -0500
+@@ -897,7 +897,7 @@
+ 
+ 
+     def check_sane_devel(self):
+-        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
++        return len(locate_file_contains("sane.h", '/usr/local/include/sane', 'extern SANE_Status sane_init'))
+ 
+ 
+     def check_xsane(self):
Index: hplip3/files/patch-dcheck.py
===================================================================
RCS file: hplip3/files/patch-dcheck.py
diff -N hplip3/files/patch-dcheck.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip3/files/patch-dcheck.py	30 Apr 2010 10:35:07 -0000
@@ -0,0 +1,11 @@
+--- installer/dcheck.py.orig	2009-08-05 09:37:17.000000000 +1200
++++ installer/dcheck.py	2009-11-27 18:53:56.000000000 +1300
+@@ -46,7 +46,7 @@
+ def update_ld_output():
+     # For library checks
+     global ld_output
+-    status, ld_output = utils.run('%s -p' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
++    status, ld_output = utils.run('%s -r' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
+ 
+     if status != 0:
+         log.debug("ldconfig failed.")


>Release-Note:
>Audit-Trail:
>Unformatted: