argyllcms: patch improvements

[Jonathan A. Kollasch <jakllsch%kollasch.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan A. Kollasch <jakllsch%kollasch.net@localhost>
Pushed By:	jakllsch
Date:		Thu Jan 31 09:11:09 2019 -0600
Changeset:	9ea26317f7f185ff9b0b5ab66dbdef668e8de85a

Modified Files:
	argyllcms/distinfo
	argyllcms/patches/patch-Jamtop

Log Message:
argyllcms: patch improvements

Use symbolic X11BASE and PREFIX; add another patch comment.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ea26317f7f185ff9b0b5ab66dbdef668e8de85a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 argyllcms/distinfo             |  2 +-
 argyllcms/patches/patch-Jamtop | 57 +++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diffs:
diff --git a/argyllcms/distinfo b/argyllcms/distinfo
index 328c97b0d2..43eae749f2 100644
--- a/argyllcms/distinfo
+++ b/argyllcms/distinfo
@@ -4,6 +4,6 @@ SHA1 (Argyll_V2.0.1_src.zip) = ac36e664db8fcb8a97c5b804a301d8cc9590046f
 RMD160 (Argyll_V2.0.1_src.zip) = c6fd956ae9e5171b88e1cb5c8576b1deb42c60aa
 SHA512 (Argyll_V2.0.1_src.zip) = d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
 Size (Argyll_V2.0.1_src.zip) = 13606682 bytes
-SHA1 (patch-Jamtop) = b3121bd20225e8068c5f303033702fad2131fcf1
+SHA1 (patch-Jamtop) = 1eefdb9f9ef07f8e294a7acb2da3544366d66904
 SHA1 (patch-spectro_hidio.c) = b0190685bc8a7a4b0f2025562f143eb1887971dd
 SHA1 (patch-spectro_usbio.c) = 84570916fa25b14f27c607cba188d3836b5505e3
diff --git a/argyllcms/patches/patch-Jamtop b/argyllcms/patches/patch-Jamtop
index 5b6746d707..6e2f5eed1d 100644
--- a/argyllcms/patches/patch-Jamtop
+++ b/argyllcms/patches/patch-Jamtop
@@ -1,42 +1,50 @@
 $NetBSD$
 
+Search and use pkgsrc ${X11BASE} and ${PREFIX} paths.
+Recognize pkgsrc libpng16.so (somewhat haphazardly).
 Recognize NetBSD.
 
 --- Jamtop.orig	2018-07-09 02:56:56.000000000 +0000
 +++ Jamtop
-@@ -84,6 +84,10 @@ if $(UNIX) {
+@@ -82,7 +82,11 @@ if $(UNIX) {
+ 		LINKFLAGS += -framework AppKit ;
+ 
  	} else {
- 		if [ GLOB /usr/X11R6/include/X11 : X.h ] {
- 			LibWinH = /usr/X11R6/include ;
-+		} else if [ GLOB /usr/X11R7/include/X11 : X.h ] {
-+			LibWinH = /usr/X11R7/include ;
+-		if [ GLOB /usr/X11R6/include/X11 : X.h ] {
++		if [ GLOB $(X11BASE)/include/X11 : X.h ] {
++			LibWinH = $(X11BASE)/include ;
 +		} else if [ GLOB $(PREFIX)/include/X11 : X.h ] {
 +			LibWinH = $(PREFIX)/include ;
++		} else if [ GLOB /usr/X11R6/include/X11 : X.h ] {
+ 			LibWinH = /usr/X11R6/include ;
  		} else if [ GLOB /usr/include/X11 : X.h ] {
  			LibWinH = /usr/include ;
- 		} else if [ GLOB /usr/local/include/X11 : X.h ] {
-@@ -95,6 +99,10 @@ if $(UNIX) {
+@@ -93,7 +97,11 @@ if $(UNIX) {
+ 		}
+ 
  		if $(HOST64) {
- 			if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
- 				LibWinD = /usr/X11R6/lib ;
-+			} else if [ GLOB /usr/X11R7/lib : libX11.so libX11.a ] {
-+				LibWinD = /usr/X11R7/lib ;
+-			if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
++			if [ GLOB $(X11BASE)/lib : libX11.so libX11.a ] {
++				LibWinD = $(X11BASE)/lib ;
 +			} else if [ GLOB $(PREFIX)/lib : libX11.so libX11.a ] {
 +				LibWinD = $(PREFIX)/lib ;
++			} else if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
+ 				LibWinD = /usr/X11R6/lib ;
  			} else if [ GLOB /usr/lib/x86_64-linux-gnu : libX11.so libX11.a ] {
  				LibWinD = /usr/lib/x86_64-linux-gnu ;
- 			} else if [ GLOB /usr/lib64 : libX11.so libX11.a ] {
-@@ -109,6 +117,10 @@ if $(UNIX) {
+@@ -107,7 +115,11 @@ if $(UNIX) {
+ 				ECHO Unable to locate the 64 bit X11 library files ;
+ 			}
  		} else {
- 			if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
- 				LibWinD = /usr/X11R6/lib ;
-+			} else if [ GLOB /usr/X11R7/lib : libX11.so libX11.a ] {
-+				LibWinD = /usr/X11R7/lib ;
+-			if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
++			if [ GLOB $(X11BASE)/lib : libX11.so libX11.a ] {
++				LibWinD = $(X11BASE)/lib ;
 +			} else if [ GLOB $(PREFIX)/lib : libX11.so libX11.a ] {
 +				LibWinD = $(PREFIX)/lib ;
++			} else if [ GLOB /usr/X11R6/lib : libX11.so libX11.a ] {
+ 				LibWinD = /usr/X11R6/lib ;
  			} else if [ GLOB /usr/lib/i386-linux-gnu : libX11.so libX11.a ] {
  				LibWinD = /usr/lib/i386-linux-gnu ;
- 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
 @@ -122,6 +134,9 @@ if $(UNIX) {
  		if $(OS) = FREEBSD {
  			LINKFLAGS += -g -lrt -lusb ;
@@ -47,17 +55,20 @@ Recognize NetBSD.
  		} else if $(OS) = OPENBSD {
  			LINKFLAGS += ;
  			GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ;
-@@ -153,10 +168,13 @@ rule CheckForLibrary {
+@@ -152,11 +167,14 @@ rule CheckForLibrary {
+ 	}
  
  	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
- 		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
-+		 || [ GLOB $(PREFIX)/include$(subd) : $(lcase).h $(lcase)lib.h ]
+-		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
++		if  [ GLOB $(PREFIX)/include$(subd) : $(lcase).h $(lcase)lib.h ]
++		 || [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
  	     || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
  		 || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
  	     || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
- 			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
-+			 || [ GLOB $(PREFIX)/lib : lib$(lcase).so ] || [ GLOB $(PREFIX)/lib : lib$(lcase).a ]
+-			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
++			if  [ GLOB $(PREFIX)/lib : lib$(lcase).so ] || [ GLOB $(PREFIX)/lib : lib$(lcase).a ]
 +			 || [ GLOB $(PREFIX)/lib : lib$(lcase)16.so ] || [ GLOB $(PREFIX)/lib : lib$(lcase)16.a ]
++			 || [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
  			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
  			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
  			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]