Update argyllcms to 2.0.1 and improve packaging

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update argyllcms to 2.0.1 and improve packaging
From: Jonathan A. Kollasch <jakllsch%kollasch.net@localhost>
Date: Thu, 31 Jan 2019 01:18:50 +0000
Module Name:	pkgsrc-wip
Committed By:	Jonathan A. Kollasch <jakllsch%kollasch.net@localhost>
Pushed By:	jakllsch
Date:		Wed Jan 30 19:18:50 2019 -0600
Changeset:	b02697626cf06de59a9e7a15b82846fcb1170f21

Modified Files:
	argyllcms/DESCR
	argyllcms/Makefile
	argyllcms/PLIST
	argyllcms/distinfo
	argyllcms/patches/patch-Jamtop
	argyllcms/patches/patch-spectro_usbio.c
Added Files:
	argyllcms/patches/patch-spectro_hidio.c
Removed Files:
	argyllcms/patches/patch-tiff_configure

Log Message:
Update argyllcms to 2.0.1 and improve packaging

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

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

diffstat:
 argyllcms/DESCR                         |  19 +++++
 argyllcms/Makefile                      |  31 ++++----
 argyllcms/PLIST                         | 118 +++++++++++++++++++++++++++
 argyllcms/distinfo                      |  14 ++--
 argyllcms/patches/patch-Jamtop          | 137 +++++++++++---------------------
 argyllcms/patches/patch-spectro_hidio.c |  15 ++++
 argyllcms/patches/patch-spectro_usbio.c |   8 +-
 argyllcms/patches/patch-tiff_configure  |  13 ---
 8 files changed, 227 insertions(+), 128 deletions(-)

diffs:
diff --git a/argyllcms/DESCR b/argyllcms/DESCR
index e69de29bb2..14975c6a85 100644
--- a/argyllcms/DESCR
+++ b/argyllcms/DESCR
@@ -0,0 +1,19 @@
+ArgyllCMS is an ICC compatible color management system, available
+as Open Source. It supports accurate ICC profile creation for
+scanners, cameras and film recorders, and calibration and profiling
+of displays and RGB & CMYK printers. Device Link can be created
+with a wide variety of advanced options, including specialized
+Video calibration standards  and 3dLuts. Spectral sample data is
+supported, allowing a selection of illuminants observer types, and
+paper fluorescent whitener additive compensation. Profiles can also
+incorporate source specific gamut mappings for perceptual and
+saturation intents. Gamut mapping and profile linking uses the
+CIECAM02 appearance model, a unique gamut mapping algorithm, and
+a wide selection of rendering intents. It also includes code for
+the fastest portable 8 bit raster color conversion engine available
+anywhere, as well as support for fast, fully accurate 16 bit
+conversion. Device color gamuts can also be viewed and compared
+with a modern Web browser using X3DOM . Comprehensive documentation
+is provided for each major tool, and a general guide to using the
+tools for typical color management tasks is also available. A
+mailing list provides support for more advanced usage.
diff --git a/argyllcms/Makefile b/argyllcms/Makefile
index edc9046a36..e5789e0435 100644
--- a/argyllcms/Makefile
+++ b/argyllcms/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD$
 
-DISTNAME=	Argyll_V1.8.3_src
-PKGREVISION=	1
+DISTNAME=	Argyll_V2.0.1_src
+PKGNAME=	${DISTNAME:S/_V/cms-/:S/_src$//:tl}
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.argyllcms.com/
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.argyllcms.com/
+HOMEPAGE=	https://www.argyllcms.com/
 COMMENT=	ICC compatible color management system
 LICENSE=	gnu-agpl-v3
 
-WRKSRC=		${WRKDIR}/Argyll_V1.8.3
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_src$//}
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
@@ -22,30 +22,31 @@ PKGCONFIG_OVERRIDE+=	zlib/zlib.pc.in
 
 BUILDLINK_TRANSFORM+=	rm:-ldl
 
-DEPENDS+=	jam-[0-9]*:../../devel/jam
-
-#post-patch:
-#	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase
+BUILD_DEPENDS+=	jam>=2.5.2:../../devel/jam
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS}
+	cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${MAKE_ENV} jam -q -fJambase ${_MAKE_JOBS}
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \
+	cd ${WRKSRC} && ${SETENV} DESTDIR=${DESTDIR} ${MAKE_ENV} \
 		REFSUBDIR=share/argyll/ref \
-		jam -q -fJambase -j${MAKE_JOBS_NUMBER} install
-	@${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \
-		${STAGEDIR}${PREFIX}/share/argyll/
+		jam -q -fJambase ${_MAKE_JOBS} install
+	${MV} ${DESTDIR}${PREFIX}/bin/License.txt \
+		${DESTDIR}${PREFIX}/share/argyll/
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP} ${DESTDIR}${PREFIX}/bin/*
 
-.include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/argyllcms/PLIST b/argyllcms/PLIST
index 48d96a5493..7a7532bf2a 100644
--- a/argyllcms/PLIST
+++ b/argyllcms/PLIST
@@ -1 +1,119 @@
 @comment $NetBSD$
+bin/applycal
+bin/average
+bin/cb2ti3
+bin/cctiff
+bin/ccxxmake
+bin/chartread
+bin/collink
+bin/colprof
+bin/colverify
+bin/dispcal
+bin/dispread
+bin/dispwin
+bin/extracticc
+bin/extractttag
+bin/fakeCMY
+bin/fakeread
+bin/greytiff
+bin/iccdump
+bin/iccgamut
+bin/icclu
+bin/illumread
+bin/invprofcheck
+bin/kodak2ti3
+bin/ls2ti3
+bin/mppcheck
+bin/mpplu
+bin/mppprof
+bin/oeminst
+bin/printcal
+bin/printtarg
+bin/profcheck
+bin/refine
+bin/revfix
+bin/scanin
+bin/spec2cie
+bin/specplot
+bin/splitti3
+bin/spotread
+bin/synthcal
+bin/synthread
+bin/targen
+bin/tiffgamut
+bin/timage
+bin/txt2ti3
+bin/viewgam
+bin/xicclu
+share/argyll/License.txt
+share/argyll/ref/3dap5k.sp
+share/argyll/ref/CIE_C.sp
+share/argyll/ref/CMP_DT_003.cht
+share/argyll/ref/CMP_Digital_Target-4.cht
+share/argyll/ref/CMP_Digital_Target-4.cie
+share/argyll/ref/CMP_Digital_Target-4.ti2
+share/argyll/ref/CMP_Digital_Target-7.cht
+share/argyll/ref/ClayRGB1998.icm
+share/argyll/ref/ColorChecker.cht
+share/argyll/ref/ColorChecker.cie
+share/argyll/ref/ColorChecker.ti2
+share/argyll/ref/ColorCheckerDC.cht
+share/argyll/ref/ColorCheckerDC.ti2
+share/argyll/ref/ColorCheckerPassport.cht
+share/argyll/ref/ColorCheckerPassport.cie
+share/argyll/ref/ColorCheckerSG.cht
+share/argyll/ref/ColorCheckerSG.ti2
+share/argyll/ref/D50_0.0.sp
+share/argyll/ref/D50_0.1.sp
+share/argyll/ref/D50_0.3.sp
+share/argyll/ref/D50_0.5.sp
+share/argyll/ref/D50_0.7.sp
+share/argyll/ref/D50_1.0.sp
+share/argyll/ref/D50_1.2.sp
+share/argyll/ref/D50_1.5.sp
+share/argyll/ref/D50_1.7.sp
+share/argyll/ref/D50_2.0.sp
+share/argyll/ref/D50_2.5.sp
+share/argyll/ref/D50_3.0.sp
+share/argyll/ref/EBU3213_PAL.icm
+share/argyll/ref/ECI2002.ti2
+share/argyll/ref/ECI2002R.ti2
+share/argyll/ref/F1.sp
+share/argyll/ref/F5.sp
+share/argyll/ref/F8.sp
+share/argyll/ref/FograStrip2.ti1
+share/argyll/ref/FograStrip2_2.ti2
+share/argyll/ref/FograStrip3.ti1
+share/argyll/ref/FograStrip3_3.ti2
+share/argyll/ref/GTIPlus.sp
+share/argyll/ref/Hutchcolor.cht
+share/argyll/ref/LaserSoftDCPro.cht
+share/argyll/ref/Office.sp
+share/argyll/ref/ProPhoto.icm
+share/argyll/ref/ProPhotoLin.icm
+share/argyll/ref/QPcard_201.cht
+share/argyll/ref/QPcard_201.cie
+share/argyll/ref/QPcard_202.cht
+share/argyll/ref/QPcard_202.cie
+share/argyll/ref/Rec2020.icm
+share/argyll/ref/Rec709.icm
+share/argyll/ref/RefMediumGamut.gam
+share/argyll/ref/SMPTE431_P3.icm
+share/argyll/ref/SMPTE_RP145_NTSC.icm
+share/argyll/ref/SOtele.sp
+share/argyll/ref/SpyderChecker.cht
+share/argyll/ref/SpyderChecker.cie
+share/argyll/ref/SpyderChecker24.cht
+share/argyll/ref/SpyderChecker24.cie
+share/argyll/ref/Trulux.sp
+share/argyll/ref/TruluxPlus.sp
+share/argyll/ref/ccxx.ti1
+share/argyll/ref/example.sp
+share/argyll/ref/example121.sp
+share/argyll/ref/i1_RGB_Scan_1.4.cht
+share/argyll/ref/i1_RGB_Scan_1.4.ti2
+share/argyll/ref/it8.cht
+share/argyll/ref/lab2lab.icm
+share/argyll/ref/linear.cal
+share/argyll/ref/sRGB.icm
+share/argyll/ref/strange.cal
diff --git a/argyllcms/distinfo b/argyllcms/distinfo
index cf6eaeff6a..328c97b0d2 100644
--- a/argyllcms/distinfo
+++ b/argyllcms/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (Argyll_V1.8.3_src.zip) = e6a524a2add640f7dc2cf4dc0501fc9ba55d61a3
-RMD160 (Argyll_V1.8.3_src.zip) = 10303ab9b53da9b9d301f98c584166101fdcfa76
-SHA512 (Argyll_V1.8.3_src.zip) = 19bdba20313ec62b5b3c461d29a4f1eefbeb799ded06a1e0b568013b606547bf97b23c1b69f27d415e0052a7a2b747273131624e725ee21781b261568822b3a7
-Size (Argyll_V1.8.3_src.zip) = 13933565 bytes
-SHA1 (patch-Jamtop) = 5c4c628c7e5e89dabe5a729f7abeac6f3d35b52e
-SHA1 (patch-spectro_usbio.c) = 3902ed4198f078f2d193b3be52104398cc373013
-SHA1 (patch-tiff_configure) = a91cac5acbe83951fc7280d2752df4a42fdab4c9
+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-spectro_hidio.c) = b0190685bc8a7a4b0f2025562f143eb1887971dd
+SHA1 (patch-spectro_usbio.c) = 84570916fa25b14f27c607cba188d3836b5505e3
diff --git a/argyllcms/patches/patch-Jamtop b/argyllcms/patches/patch-Jamtop
index e1f7481f38..5b6746d707 100644
--- a/argyllcms/patches/patch-Jamtop
+++ b/argyllcms/patches/patch-Jamtop
@@ -1,106 +1,63 @@
 $NetBSD$
 
---- Jamtop.orig	2015-10-26 04:17:32.000000000 +0000
+Recognize NetBSD.
+
+--- Jamtop.orig	2018-07-09 02:56:56.000000000 +0000
 +++ Jamtop
-@@ -72,39 +72,39 @@ if $(UNIX) {
- 		LINKFLAGS += -framework AppKit ;
- 
+@@ -84,6 +84,10 @@ if $(UNIX) {
  	} 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 ] {
--			LibWinH = /usr/local/include ;
-+		if [ GLOB $(PREFIX)/X11R6/include/X11 : X.h ] {
-+			LibWinH = $(PREFIX)/X11R6/include ;
+ 		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 ;
 +		} else if [ GLOB $(PREFIX)/include/X11 : X.h ] {
 +			LibWinH = $(PREFIX)/include ;
-+		} else if [ GLOB $(PREFIX)/local/include/X11 : X.h ] {
-+			LibWinH = $(PREFIX)/local/include ;
- 		} else {
- 			EXIT Unable to locate the X11 include files ;
- 		}
- 
+ 		} 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) {
  		if $(HOST64) {
--			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 ] {
--				LibWinD = /usr/lib64 ;
--			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
--				LibWinD = /usr/lib ;
--			} else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
--				LibWinD = /usr/local/lib ;
-+			if [ GLOB $(PREFIX)/X11R6/lib : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/X11R6/lib ;
-+			} else if [ GLOB $(PREFIX)/lib/x86_64-linux-gnu : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/lib/x86_64-linux-gnu ;
-+			} else if [ GLOB $(PREFIX)/lib64 : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/lib64 ;
+ 			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 ;
 +			} else if [ GLOB $(PREFIX)/lib : libX11.so libX11.a ] {
 +				LibWinD = $(PREFIX)/lib ;
-+			} else if [ GLOB $(PREFIX)/local/lib : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/local/lib ;
- 			} else {
- 				ECHO Unable to locate the 64 bit X11 library files ;
- 			}
+ 			} 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) {
  		} 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 ] {
--				LibWinD = /usr/lib ;
--			} else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
--				LibWinD = /usr/local/lib ;
-+			if [ GLOB $(PREFIX)/X11R6/lib : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/X11R6/lib ;
-+			} else if [ GLOB $(PREFIX)/lib/i386-linux-gnu : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/lib/i386-linux-gnu ;
+ 			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 ;
 +			} else if [ GLOB $(PREFIX)/lib : libX11.so libX11.a ] {
 +				LibWinD = $(PREFIX)/lib ;
-+			} else if [ GLOB $(PREFIX)/local/lib : libX11.so libX11.a ] {
-+				LibWinD = $(PREFIX)/local/lib ;
- 			} else {
- 				ECHO Unable to locate the 32 bit X11 library files ;
- 			}
-@@ -112,7 +112,7 @@ if $(UNIX) {
+ 			} 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 += -L$(LibWinD) -g -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss  -lusb ;
+ 			LINKFLAGS += -g -lrt -lusb ;
+ 			GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss  ;
++		} else if $(OS) = NETBSD {
++			LINKFLAGS += -L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}$(PREFIX)/lib -g -lrt ;
++			GUILINKFLAGS += -L$(LibWinD) ${COMPILER_RPATH_FLAG}$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
  		} else if $(OS) = OPENBSD {
--			LINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ;
-+			LINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L$(PREFIX)/local/lib ;
- 		} else {
- 			LINKFLAGS += -L$(LibWinD) -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
- 		}
-@@ -139,17 +139,17 @@ rule CheckForLibrary {
- 	}
+ 			LINKFLAGS += ;
+ 			GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ;
+@@ -153,10 +168,13 @@ rule CheckForLibrary {
  
  	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
--		if  [ 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 /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 ]
--			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
--	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
--	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ] {
-+		if  [ GLOB $(PREFIX)/include$(subd) : $(lcase).h $(lcase)lib.h ]
-+	     || [ GLOB $(PREFIX)/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
-+		 || [ GLOB $(PREFIX)/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
-+	     || [ GLOB $(PREFIX)/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
-+			if  [ GLOB $(PREFIX)/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
-+			 || [ GLOB $(PREFIX)/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
-+			 || [ GLOB $(PREFIX)/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
-+			 || [ GLOB $(PREFIX)/lib/x86_64-linux-gnu : lib$(lcase).so ]
-+			 || [ GLOB $(PREFIX)/lib/x86_64-linux-gnu : lib$(lcase).a ]
-+	         || [ GLOB $(PREFIX)/lib/i386-linux-gnu : lib$(lcase).so ]
-+	         || [ GLOB $(PREFIX)/lib/i386-linux-gnu : lib$(lcase).a ] {
- 				echo "Using system $(UCASE) library" ;
- 				$(UCASE)LIB = ;
- 				$(UCASE)INC = ;
+ 		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
++		 || [ GLOB $(PREFIX)/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 ]
++			 || [ GLOB $(PREFIX)/lib : lib$(lcase)16.so ] || [ GLOB $(PREFIX)/lib : lib$(lcase)16.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 ]
diff --git a/argyllcms/patches/patch-spectro_hidio.c b/argyllcms/patches/patch-spectro_hidio.c
new file mode 100644
index 0000000000..5dd4fedb81
--- /dev/null
+++ b/argyllcms/patches/patch-spectro_hidio.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Recognize NetBSD.
+
+--- spectro/hidio.c.orig	2018-07-09 02:57:13.000000000 +0000
++++ spectro/hidio.c
+@@ -89,7 +89,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/types.h> 
+ #include <usbhid.h> 
+ #else	/* assume Linux */ 
diff --git a/argyllcms/patches/patch-spectro_usbio.c b/argyllcms/patches/patch-spectro_usbio.c
index 2db746e55e..b7adc6f5ae 100644
--- a/argyllcms/patches/patch-spectro_usbio.c
+++ b/argyllcms/patches/patch-spectro_usbio.c
@@ -1,13 +1,15 @@
 $NetBSD$
 
---- spectro/usbio.c.orig	2015-10-26 04:17:49.000000000 +0000
+Recognize NetBSD.
+
+--- spectro/usbio.c.orig	2018-07-09 02:57:13.000000000 +0000
 +++ spectro/usbio.c
-@@ -94,7 +94,7 @@ static int icoms_usb_wait_io(
+@@ -95,7 +95,7 @@ static int icoms_usb_wait_io(
  #  include "usbio_ox.c"
  # endif
  # if defined(UNIX_X11)
 -#  if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#  if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__)
  #   include "usbio_bsd.c"
  #  else
  #   include "usbio_lx.c"
diff --git a/argyllcms/patches/patch-tiff_configure b/argyllcms/patches/patch-tiff_configure
deleted file mode 100644
index f438ffca35..0000000000
--- a/argyllcms/patches/patch-tiff_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tiff/configure.orig	2015-10-26 04:18:09.000000000 +0000
-+++ tiff/configure
-@@ -18766,7 +18766,7 @@ if test "${with_jpeg12_lib+set}" = set; 
- fi
- 
- 
--if test "x$enable_jpeg12" == "xyes" ; then
-+if test "x$enable_jpeg12" = "xyes" ; then
- 
-   if test "x$with_jpeg12_lib" != "x" ; then
-     LIBS="$with_jpeg12_lib $LIBS"
Prev by Date: ircd-hybrid: Adjust paths in doc/reference.conf
Next by Date: ircd-hybrid: Removed log files from INSTALL.
Previous by Thread: ircd-hybrid: Adjust paths in doc/reference.conf
Next by Thread: ircd-hybrid: Removed log files from INSTALL.
Indexes:
Home | Main Index | Thread Index | Old Index