CVS commit: pkgsrc/x11/ocaml-lablgtk3

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Nov 24 14:45:32 UTC 2024

Modified Files:
        pkgsrc/x11/ocaml-lablgtk3: Makefile

Log Message:
x11/ocaml-lablgtk3: Improve kludge comments

NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/ocaml-lablgtk3/Makefile

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

Modified files:

Index: pkgsrc/x11/ocaml-lablgtk3/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk3/Makefile:1.34 pkgsrc/x11/ocaml-lablgtk3/Makefile:1.35
--- pkgsrc/x11/ocaml-lablgtk3/Makefile:1.34     Sun Nov 24 14:32:49 2024
+++ pkgsrc/x11/ocaml-lablgtk3/Makefile  Sun Nov 24 14:45:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/11/24 14:32:49 gdt Exp $
+# $NetBSD: Makefile,v 1.35 2024/11/24 14:45:32 gdt Exp $
 
 GITHUB_PROJECT=        lablgtk
 GITHUB_TAG=    ${VERSION}
@@ -21,10 +21,10 @@ OCAML_FINDLIB_DIRS= lablgtk3
 OPAM_INSTALL_FILES=    ${OCAML_FINDLIB_DIRS}
 DUNE_BUILD_PACKAGES=   ${OCAML_FINDLIB_DIRS}
 
-# Undo the wrapper, in the hope that dune finds real pkg-config.  Does not help.
-no-pkgconfig-wrapper:
-       ${RM} ${WRKDIR}/.tools/bin/pkg-config
-       ${CP} ${PREFIX}/bin/pkg-config ${WRKDIR}/.tools/bin/pkg-config
+## BEGIN DUNE/PKG-CONFIG KLUDGES
+
+# See the dune sources, otherlibs/configurator/src/v1.ml and look for
+# pkg-config and "which", if trying to understand why this fails.
 
 # dune tries to run pkg-config, and this fails under pkgsrc for some reason.
 # But when run in pre-configure, it seems to be ok.
@@ -33,6 +33,11 @@ test-dune-config:
        (cd ${WRKSRC} && \
                dune exec -- ./_build/default/.bin/dune_config -verbose -pkg gtk+-3.0 -version 3.18) || ${TRUE}
 
+# Undo the wrapper, in the hope that dune finds real pkg-config.  Does not help.
+no-pkgconfig-wrapper:
+       ${RM} ${WRKDIR}/.tools/bin/pkg-config
+       ${CP} ${PREFIX}/bin/pkg-config ${WRKDIR}/.tools/bin/pkg-config
+
 # This is a huge hack, to undefine PKG_CONFIG in the environment,
 # which apparently breaks dune's searching for pkg-config.  Copied
 # from ocaml/ocaml.mk, to where it should perhaps be hoisted.
@@ -43,6 +48,8 @@ do-build:
                ${DUNE_BUILD_FLAGS} -p ${DUNE_BUILD_PACKAGES:ts,} \
                ${DUNE_BUILD_TARGETS}
 
+## END DUNE/PKG-CONFIG KLUDGES
+
 .include "../../lang/ocaml/ocaml.mk"
 
 .include "options.mk"