ocaml: merge Makefile.common into Makefile

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Aug 29 01:00:55 2025 +0200
Changeset:	1c6ce5303eb364e6dbadc1bb603d63ee2042fd76

Modified Files:
	ocaml/Makefile
Removed Files:
	ocaml/Makefile.common

Log Message:
ocaml: merge Makefile.common into Makefile

This is not shared with anything else

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

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

diffstat:
 ocaml/Makefile        | 37 +++++++++++++++++++++++++++++++++----
 ocaml/Makefile.common | 40 ----------------------------------------
 2 files changed, 33 insertions(+), 44 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 2a9aebb344..f7c35a6892 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,13 +1,36 @@
 # $NetBSD: Makefile,v 1.148 2023/04/09 07:28:27 wiz Exp $
 
-.include "Makefile.common"
+# Please do not update to ocaml 5.x without discussion, as the
+# consensus is mostly that those versions are not yet baked, and will
+# cause hard-to-debug problems.
+DISTNAME=	ocaml-5.3.0
+CATEGORIES=	lang
+# unreliable
+#MASTER_SITES=	https://caml.inria.fr/pub/distrib/ocaml-5.2/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
-TEST_PROGRAM=		ocamltest
-UNLIMIT_RESOURCES=	stacksize
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+#MAINTAINER+=	gdt%NetBSD.org@localhost
+HOMEPAGE=	https://ocaml.org/
+COMMENT=	The latest implementation of the Caml dialect of ML
+LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=		bash
 USE_LANGUAGES+=		c
+USE_CC_FEATURES+=	c99
 USE_LIBTOOL=		yes
+USE_TOOLS+=		bash gmake
+GNU_CONFIGURE=		yes
+
+MAKE_FLAGS+=		INSTALL=${INSTALL:Q}
+MAKE_FLAGS+=		INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_FLAGS+=		INSTALL_PROG=${INSTALL_SCRIPT:Q}
+
+# build failure on i386: "../ocamlopt.opt: text relocations"
+MKPIE_SUPPORTED=	no
+
+TEST_PROGRAM=		ocamltest
+UNLIMIT_RESOURCES=	stacksize
 
 .include "options.mk"
 .include "native.mk"
@@ -33,6 +56,10 @@ CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
 INSTALL_MAKE_FLAGS+=	SHELL=${SH:Q}
 .endif
 
+.if ${OPSYS} == "Linux"
+INSTALL_UNSTRIPPED=	yes
+.endif
+
 INSTALLATION_DIRS=	share/doc/ocaml
 
 PRINT_PLIST_AWK+=	{ gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
@@ -58,6 +85,8 @@ post-install: fix-man-extension
 fix-man-extension:
 	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 && for i in *.3o; do mv $$i $${i%%o}; done
 
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
deleted file mode 100644
index 43f8909261..0000000000
--- a/ocaml/Makefile.common
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile.common,v 1.67 2024/11/30 01:34:47 gdt Exp $
-
-# not used by anything else these days
-
-# Please do not update to ocaml 5.x without discussion, as the
-# consensus is mostly that those versions are not yet baked, and will
-# cause hard-to-debug problems.
-DISTNAME=	ocaml-5.3.0
-CATEGORIES=	lang
-# unreliable
-#MASTER_SITES=	https://caml.inria.fr/pub/distrib/ocaml-5.2/
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
-GITHUB_TAG=	${PKGVERSION_NOREV}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-#MAINTAINER+=	gdt%NetBSD.org@localhost
-HOMEPAGE=	https://ocaml.org/
-COMMENT=	The latest implementation of the Caml dialect of ML
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES+=		c
-USE_CC_FEATURES+=	c99
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-MAKE_FLAGS+=		INSTALL=${INSTALL:Q}
-MAKE_FLAGS+=		INSTALL_DATA=${INSTALL_DATA:Q}
-MAKE_FLAGS+=		INSTALL_PROG=${INSTALL_SCRIPT:Q}
-
-# build failure on i386: "../ocamlopt.opt: text relocations"
-MKPIE_SUPPORTED=	no
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"