CVS commit: pkgsrc/graphics/camlimages

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 31 07:09:56 UTC 2025

Modified Files:
        pkgsrc/graphics/camlimages: Makefile distinfo
        pkgsrc/graphics/camlimages/patches: patch-OMakefile

Log Message:
camlimages: do not build tests and examples

Fix the png detection.

Fixes the build for me on NetBSD-current, but I don't know if this
works or not.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 pkgsrc/graphics/camlimages/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/camlimages/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/camlimages/patches/patch-OMakefile

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

Modified files:

Index: pkgsrc/graphics/camlimages/Makefile
diff -u pkgsrc/graphics/camlimages/Makefile:1.160 pkgsrc/graphics/camlimages/Makefile:1.161
--- pkgsrc/graphics/camlimages/Makefile:1.160   Fri Dec 27 08:19:52 2024
+++ pkgsrc/graphics/camlimages/Makefile Fri Jan 31 07:09:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2024/12/27 08:19:52 wiz Exp $
+# $NetBSD: Makefile,v 1.161 2025/01/31 07:09:56 wiz Exp $
 
 VERSION=               4.0.1
 PKGNAME=               camlimages-${VERSION}
@@ -15,6 +15,7 @@ LICENSE=              gnu-gpl-v2
 
 TOOL_DEPENDS+=         omake>=0.9.8.6.0rc1:../../devel/omake
 TOOL_DEPENDS+=         ocaml-findlib>=1.2.6:../../devel/ocaml-findlib
+DEPENDS+=              rgb-[0-9]*:../../x11/rgb
 
 MAKE_JOBS_SAFE=                no
 
@@ -32,6 +33,8 @@ SUBST_MESSAGE.omf=    Fixing vars in OMakef
 
 INSTALLATION_DIRS=     lib/ocaml/site-lib
 
+USE_TOOLS+=            pkg-config
+
 do-build:
        cd ${WRKSRC} && ${PREFIX}/bin/omake --configure --verbose
 
@@ -41,7 +44,6 @@ do-install:
 
 OCAML_USE_FINDLIB=     yes
 
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.11.0
 .include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"

Index: pkgsrc/graphics/camlimages/distinfo
diff -u pkgsrc/graphics/camlimages/distinfo:1.19 pkgsrc/graphics/camlimages/distinfo:1.20
--- pkgsrc/graphics/camlimages/distinfo:1.19    Sun Dec 26 05:28:23 2021
+++ pkgsrc/graphics/camlimages/distinfo Fri Jan 31 07:09:56 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2021/12/26 05:28:23 dholland Exp $
+$NetBSD: distinfo,v 1.20 2025/01/31 07:09:56 wiz Exp $
 
 BLAKE2s (camlimages-4.0.1a/v4.0.1.tar.gz) = 0d8e3e7a10f89ff6afd5161a840ea9951a563daf8388f2717d2f75257b6276d4
 SHA512 (camlimages-4.0.1a/v4.0.1.tar.gz) = c4e2a816911ed128c0414308d1ace914bbb51e40b6d70a3c492690b38c860f79e3e01efa3f1be7d57654c78f8acca6f30bffb9e6b8fd423d1d36d6a477d0fd8d
 Size (camlimages-4.0.1a/v4.0.1.tar.gz) = 2190274 bytes
-SHA1 (patch-OMakefile) = f650eca9bf8edbc64f9f5352718ee2046c368667
+SHA1 (patch-OMakefile) = 6bcb0e8394a8b2097bc9602d29a7be9040695e5b
 SHA1 (patch-examples_crop_crop.ml) = 52d7fc9c39c394ecac22fe3d401aaef73c64b50d
 SHA1 (patch-examples_liv_icon.ml) = 29e1a5b7325f0b468dc76291563697ae301de664
 SHA1 (patch-examples_liv_livsh.ml) = b804ef21be7e55b3c63011f614cc1e3e6902cb16

Index: pkgsrc/graphics/camlimages/patches/patch-OMakefile
diff -u pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.3 pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.4
--- pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.3      Sun Sep 18 05:48:59 2016
+++ pkgsrc/graphics/camlimages/patches/patch-OMakefile  Fri Jan 31 07:09:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-OMakefile,v 1.3 2016/09/18 05:48:59 dholland Exp $
+$NetBSD: patch-OMakefile,v 1.4 2025/01/31 07:09:56 wiz Exp $
 
 Use pkgsrc build variables, correct detection of libpng
 
@@ -30,12 +30,18 @@ Use pkgsrc build variables, correct dete
  
    HAVE_Z = $(Check_header_library z, zlib.h, zlibVersion)
 -  HAVE_PNG = $(Check_header_library png, png.h, png_create_read_struct)
-+  HAVE_PNG = $(Check_header_library png15, png.h, png_create_read_struct)
++  HAVE_PNG = $(Check_header_library png16, png.h, png_create_read_struct)
    SUPPORT_PNG = $(and $(HAVE_Z) $(HAVE_PNG))
    LDFLAGS_png=
    if $(SUPPORT_PNG)
 -    LDFLAGS_png=-lpng -lz
-+    LDFLAGS_png=-lpng15 -lz
++    LDFLAGS_png=-lpng16 -lz
      SUPPORTED_FORMATS+=png
      export
  
+@@ -207,4 +211,4 @@ section:
+   VERSION=$(PACKAGE_VERSION)
+   ConfReplaceConfigH(config.h)
+ 
+-.SUBDIRS: src test examples
++.SUBDIRS: src