camlp4: remove

camlp4 is an outdated way to build packages with caml and does not work
with pkgsrc ocaml versions for more than a year.

Remove camlp4 and all packages using it.

Ok jaapb@

7 files changed, 1 insertions, 158 deletions

diff --git a/www/Makefile b/www/Makefile
index fdd53f80caf..439705fb310 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1630 2022/06/04 10:01:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.1631 2022/06/29 07:54:42 wiz Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -251,7 +251,6 @@ SUBDIR+=	nsm
 SUBDIR+=	nspluginwrapper
 SUBDIR+=	ocaml-cohttp
 SUBDIR+=	ocaml-curl
-SUBDIR+=	ocaml-http
 SUBDIR+=	ocaml-uri
 SUBDIR+=	ocsigen
 SUBDIR+=	ocsigen-i18n
diff --git a/www/ocaml-http/DESCR b/www/ocaml-http/DESCR
deleted file mode 100644
index 3dd5f9dbf39..00000000000
--- a/www/ocaml-http/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-OCaml HTTP is a simple OCaml library for creating HTTP daemons. It is largely
-inspired by Perl's HTTP:: modules family.
diff --git a/www/ocaml-http/Makefile b/www/ocaml-http/Makefile
deleted file mode 100644
index 280607e70f5..00000000000
--- a/www/ocaml-http/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:56 jaapb Exp $
-#
-
-DISTNAME=	ocaml-http-0.1.5
-PKGREVISION=	16
-CATEGORIES=	www
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/545/
-
-MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	https://forge.ocamlcore.org/frs/download.php/545/
-COMMENT=	Simple OCaml HTTP daemon library
-LICENSE=	gnu-gpl-v2
-
-WRKSRC=		${WRKDIR}/ocaml-http_0.1.5
-USE_LANGUAGES=	# none
-USE_TOOLS+=	gmake
-MAKE_ENV=	PKG_DESTDIR=${DESTDIR}/${PREFIX}/${OCAML_SITELIBDIR}
-
-BUILD_TARGET=	all
-
-OCAML_USE_FINDLIB=	yes
-
-.include "../../lang/ocaml/ocaml.mk"
-
-.if (${OCAML_USE_OPT_COMPILER} == "yes")
-BUILD_TARGET+=	opt
-.endif
-
-.include "../../lang/camlp4/buildlink3.mk"
-.include "../../devel/pcre-ocaml/buildlink3.mk"
-.include "../../net/ocamlnet/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ocaml-http/PLIST b/www/ocaml-http/PLIST
deleted file mode 100644
index f8cafc80d1d..00000000000
--- a/www/ocaml-http/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:32:49 jaapb Exp $
-${OCAML_SITELIB}/http/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.a
-${OCAML_SITELIB}/http/http.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.cmxa
-${OCAML_SITELIB}/http/http_common.cmi
-${OCAML_SITELIB}/http/http_common.mli
-${OCAML_SITELIB}/http/http_daemon.cmi
-${OCAML_SITELIB}/http/http_daemon.mli
-${OCAML_SITELIB}/http/http_message.cmi
-${OCAML_SITELIB}/http/http_message.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.a
-${OCAML_SITELIB}/http/http_mt.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.cmxa
-${OCAML_SITELIB}/http/http_request.cmi
-${OCAML_SITELIB}/http/http_request.mli
-${OCAML_SITELIB}/http/http_response.cmi
-${OCAML_SITELIB}/http/http_response.mli
-${OCAML_SITELIB}/http/http_types.cmi
-${OCAML_SITELIB}/http/http_types.mli
-${OCAML_SITELIB}/http/http_user_agent.cmi
-${OCAML_SITELIB}/http/http_user_agent.mli
diff --git a/www/ocaml-http/distinfo b/www/ocaml-http/distinfo
deleted file mode 100644
index 52668e517d2..00000000000
--- a/www/ocaml-http/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:29:42 nia Exp $
-
-BLAKE2s (ocaml-http-0.1.5.tar.gz) = cc1ab917920f755f8d6b1400c0c6d18a493039609cf858a981ac05fb2658f261
-SHA512 (ocaml-http-0.1.5.tar.gz) = 4d3a31c6d936346865212c72d40a6f1ad96c963fb779cb47adb1adc1006b3212ecf3946229fa3d32eb075e71595acdfb4e96f4c2623ca7082c2e397cbecbde37
-Size (ocaml-http-0.1.5.tar.gz) = 201026 bytes
-SHA1 (patch-Makefile) = cd30a2461c12801bb24f30c7cc06e249ff2eba79
-SHA1 (patch-Makefile.defs) = 07f1622361029dc5c0aeb472ac71283c73272c33
diff --git a/www/ocaml-http/patches/patch-Makefile b/www/ocaml-http/patches/patch-Makefile
deleted file mode 100644
index 107fdcbd241..00000000000
--- a/www/ocaml-http/patches/patch-Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2012/10/10 11:23:32 jaapb Exp $
-
-Remove bashisms and add DESTDIR support
---- Makefile.orig	2010-10-19 10:19:18.000000000 +0000
-+++ Makefile
-@@ -1,5 +1,5 @@
- include Makefile.defs
--export SHELL=/bin/bash
-+#export SHELL=/bin/bash
- 
- MODULES = \
- 	http_constants \
-@@ -32,7 +32,7 @@ OCAMLDOC_STUFF = *.mli
- DOCDIR = doc/html
- DOTDIR = doc/dot
- TEXDIR = doc/latex
--DESTDIR = $(shell $(OCAMLFIND) printconf destdir) 
-+#DESTDIR = $(shell $(OCAMLFIND) printconf destdir) 
- 
- all: all_non_mt all_mt
- opt: opt_non_mt opt_mt
-@@ -76,17 +76,21 @@ depend:
- 	$(OCAMLOPT) -c $<
- 
- non_mt/$(THREADED_SRV).cmo: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
--	cp $(THREADED_SRV).{cmi,mli} non_mt/
-+	cp $(THREADED_SRV).cmi non_mt/
-+	cp $(THREADED_SRV).mli non_mt/
- 	$(OCAMLC) -c $<
- non_mt/$(THREADED_SRV).cmx: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
--	cp $(THREADED_SRV).{cmi,mli} non_mt/
-+	cp $(THREADED_SRV).cmi non_mt/
-+	cp $(THREADED_SRV).mli non_mt/
- 	$(OCAMLOPT) -c $<
- 
- mt/$(THREADED_SRV).cmo: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
--	cp $(THREADED_SRV).{cmi,mli} mt/
-+	cp $(THREADED_SRV).cmi mt/
-+	cp $(THREADED_SRV).mli mt/
- 	$(OCAMLC) $(THREADS_FLAGS) -c $<
- mt/$(THREADED_SRV).cmx: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
--	cp $(THREADED_SRV).{cmi,mli} mt/
-+	cp $(THREADED_SRV).cmi mt/
-+	cp $(THREADED_SRV).mli mt/
- 	$(OCAMLOPT) $(THREADS_FLAGS) -c $<
- 
- http.cma: $(patsubst %,%.cmo,$(MODULES_NON_MT))
-@@ -105,14 +109,18 @@ META: META.in
- clean:
- 	$(MAKE) -C examples/ clean
- 	for d in . mt non_mt; do	\
--		rm -f $$d/*.cm[ioax] $$d/*.cmxa $$d/*.[ao] $$d/test{,.opt};	\
-+		rm -f $$d/*.cm[ioax] $$d/*.cmxa $$d/*.[ao] $$d/test \
-+		  $$d/test.opt;	\
- 	done
- 	rm -f {mt,non_mt}/$(THREADED_SRV).mli
- docclean:
- 	-rm -f	\
- 		$(DOCDIR)/*.html $(DOCDIR)/*.css	\
- 		$(DOTDIR)/*.dot $(DOTDIR)/*.ps	\
--		$(TEXDIR)/*.{dvi,ps,ps.gz,pdf,aux,log,out,toc,tmp,haux,sty,tex}
-+		$(TEXDIR)/*.dvi $(TEXDIR)/*.ps $(TEXDIR)/*.ps.gz \
-+		$(TEXDIR)/*.pdf $(TEXDIR)/*.aux $(TEXDIR)/*.log \
-+		$(TEXDIR)/*.out $(TEXDIR)/*.toc $(TEXDIR)/*.tmp \
-+		$(TEXDIR)/*.haux $(TEXDIR)/*.sty $(TEXDIR)/*.tex
- distclean: clean
- 	$(MAKE) -C examples/ distclean
- 	rm -f META
-@@ -139,7 +147,7 @@ deb: docclean distreal
- 	(cd $(DISTDIR)/ && debuild)
- 	rm -rf $(DISTDIR)/
- install: META
--	$(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)	\
-+	$(OCAMLFIND) install -destdir $(PKG_DESTDIR) $(PKGNAME)	\
- 		$(patsubst %, %.mli, $(PUBLIC_MODULES))	\
- 		$(patsubst %, %.cmi, $(PUBLIC_MODULES))	\
- 		$(wildcard *.cma *.cmxa *.a) META
diff --git a/www/ocaml-http/patches/patch-Makefile.defs b/www/ocaml-http/patches/patch-Makefile.defs
deleted file mode 100644
index 2dce8d14d1d..00000000000
--- a/www/ocaml-http/patches/patch-Makefile.defs
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.defs,v 1.1 2012/10/10 11:23:32 jaapb Exp $
-
-Use ocamlfind's package flag correctly
---- Makefile.defs.orig	2010-10-19 10:19:18.000000000 +0000
-+++ Makefile.defs
-@@ -2,8 +2,8 @@ PKGNAME = http
- DISTVERSION = $(shell dpkg-parsechangelog | egrep '^Version: ' | sed 's/^Version: //' | sed 's/-.*//')
- 
- DEBUG_FLAGS =
--REQUIRES = unix str pcre netstring
--COMMON_FLAGS = $(DEBUG_FLAGS) -pp camlp4o -package "$(REQUIRES)"
-+REQUIRES = unix,str,pcre,netstring
-+COMMON_FLAGS = $(DEBUG_FLAGS) -pp camlp4o -package $(REQUIRES)
- THREADS_FLAGS = -package threads -thread
- OCAMLFIND = ocamlfind
- OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS)