head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.2 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.4 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.22 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.20 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.18 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.16 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.14 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.12 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.10 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.8 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.6 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.4 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.2 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.1.1.1.0.22 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.20 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.18 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.16 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.14 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.12 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.10 pkgsrc-2008Q1:1.1.1.1.0.8 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.6 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.4 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.2 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2013.03.24.18.34.47; author dholland; state dead; branches; next 1.3; 1.3 date 2012.04.13.07.34.54; author dholland; state Exp; branches; next 1.2; 1.2 date 2009.09.07.21.53.31; author tonio; state Exp; branches 1.2.22.1; next 1.1; 1.1 date 2007.04.08.23.04.53; author tonio; state Exp; branches 1.1.1.1; next ; 1.2.22.1 date 2012.04.15.14.35.20; author tron; state Exp; branches; next ; 1.1.1.1 date 2007.04.08.23.04.53; author tonio; state Exp; branches; next ; desc @@ 1.4 log @Remove ocamlduce; it is unbuildable, dead upstream, and the maintainer said quite a ways back to just kill it. @ text @$NetBSD: patch-aa,v 1.3 2012/04/13 07:34:54 dholland Exp $ --- Makefile.orig 2011-07-06 16:21:30.000000000 +0000 +++ Makefile @@@@ -1,7 +1,7 @@@@ #-include config/Makefile OCAML_VERSION := $(shell ocamlc -version) -OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2 +OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2 OCAML_SRCDIR := ocaml-$(OCAML_VERSION) DUCE_VERSION := $(shell head -n1 VERSION) @@@@ -37,7 +37,7 @@@@ all: @@echo "===> Please explicit what you want <===" prepare: - tar xf $(OCAML_SOURCE) + tar jxf $(OCAML_SOURCE) cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR) cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done @@@@ -45,15 +45,11 @@@@ prepare: sed '\@@^#-include config/Makefile@@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce -config/Makefile: - @@echo "===> You should probably run ./configure yourself, trying on my own... <===" - $(shell sed -ne '1s@@^.*\(./configure.*\)$$@@\1@@p' $(shell ocamlc -where)/Makefile.config) +world: $(OCAML_SRCDIR)/config/Makefile + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh -world: config/Makefile - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh - -world.opt: config/Makefile - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh +world.opt: $(OCAML_SRCDIR)/config/Makefile + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh META: META.in sed 's/%VER%/$(DUCE_VERSION)/' $< > $@@ @@@@ -64,20 +60,20 @@@@ installcommon-stamp: META install -m 755 -d $(DUCE_LIBDIR) install -m 755 ocamlducefind $(BINDIR) install -m 644 META $(DUCE_LIBDIR) - install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR) - install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR) + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR) + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR) installbyte: installcommon-stamp @@echo "===> Installing non-native files... <===" - for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done - install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR) - install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR) - install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR) + for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR) + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR) + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR) installopt: installcommon-stamp @@echo "===> Installing native files... <===" - for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done - install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) + for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) clean: build/distclean.sh @ 1.3 log @Update to 3.12.1, syncing with current ocaml in pkgsrc and thereby fixing the build. Changes 3.12.0.0 -> 3.12.1.0: - merge with OCaml 3.12.1 Changes 3.11.2.0 -> 3.12.0.0: - merge with OCaml 3.12.0 - drop native ocamlducedoc - fix memory leak issue in NS handling [Stefan Lampe] Changes 3.11.1.0 -> 3.11.2.0: - merge with OCaml 3.11.2 - build and install native-code plugin - build ocamldoc library - accept also ocaml_cmi_magic_number in objinfo @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2009/09/07 21:53:31 tonio Exp $ @ 1.2 log @Update lang/ocamlduce to 3.11.1.0 [pkg/41696] Adds support for ocaml 3.11.1 @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig 2009-06-13 01:49:38.000000000 +0200 +++ Makefile 2009-07-10 10:55:08.000000000 +0200 d14 1 a14 1 @@@@ -36,7 +36,7 @@@@ d23 1 a23 1 @@@@ -44,15 +44,11 @@@@ d43 1 a43 1 @@@@ -63,20 +59,20 @@@@ d66 1 a66 1 - install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR) d68 1 a68 1 + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR) @ 1.2.22.1 log @Pullup ticket #3735 - requested by dholland lang/ocamlduce: build fix Revisions pulled up: - lang/ocamlduce/Makefile 1.9 - lang/ocamlduce/PLIST.opt 1.3 - lang/ocamlduce/distinfo 1.5 - lang/ocamlduce/files/ocaml-configure.diff 1.1 - lang/ocamlduce/patches/patch-aa 1.3 --- Module Name: pkgsrc Committed By: dholland Date: Fri Apr 13 07:34:54 UTC 2012 Modified Files: pkgsrc/lang/ocamlduce: Makefile PLIST.opt distinfo pkgsrc/lang/ocamlduce/patches: patch-aa Added Files: pkgsrc/lang/ocamlduce/files: ocaml-configure.diff Log Message: Update to 3.12.1, syncing with current ocaml in pkgsrc and thereby fixing the build. Changes 3.12.0.0 -> 3.12.1.0: - merge with OCaml 3.12.1 Changes 3.11.2.0 -> 3.12.0.0: - merge with OCaml 3.12.0 - drop native ocamlducedoc - fix memory leak issue in NS handling [Stefan Lampe] Changes 3.11.1.0 -> 3.11.2.0: - merge with OCaml 3.11.2 - build and install native-code plugin - build ocamldoc library - accept also ocaml_cmi_magic_number in objinfo @ text @d3 2 a4 2 --- Makefile.orig 2011-07-06 16:21:30.000000000 +0000 +++ Makefile d14 1 a14 1 @@@@ -37,7 +37,7 @@@@ all: d23 1 a23 1 @@@@ -45,15 +45,11 @@@@ prepare: d43 1 a43 1 @@@@ -64,20 +60,20 @@@@ installcommon-stamp: META d66 1 a66 1 - install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) d68 1 a68 1 + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) @ 1.1 log @Initial revision @ text @d3 4 a6 33 --- Makefile.orig 2007-01-23 09:13:33.000000000 +0100 +++ Makefile 2007-03-08 10:55:00.000000000 +0100 @@@@ -10,12 +10,18 @@@@ # The OCaml tools to use +ifeq (${HAVE_OCAMLOPT},"yes") CAMLC=ocamlc.opt CAMLOPT=ocamlopt.opt +CAMLDEP=ocamldep.opt +else +CAMLC=ocamlc +CAMLOPT=ocamlopt +CAMLDEP=ocamldep +endif CAMLYACC=ocamlyacc YACCFLAGS=-v CAMLLEX=ocamllex -CAMLDEP=ocamldep.opt DEPFLAGS=$(INCLUDES) OCAML_CONFIG=$(shell $(CAMLC) -where)/Makefile.config @@@@ -489,10 +495,12 @@@@ for i in $(INSTALL_BINARIES); do \ cp $$i $(BINDIR)/; \ done + ocamlfind install ocamlduce META -optional $(INSTALL_LIB_FILES) + +install.opt: FORCE META for i in $(OPT_VARIANTS); do \ cp $$i.opt $(BINDIR)/$$i; \ done - ocamlfind install ocamlduce META -optional $(INSTALL_LIB_FILES) d8 64 a71 2 uninstall: FORCE for i in $(INSTALL_BINARIES); do \ @ 1.1.1.1 log @OCamlDuce is an enhancement to OCaml that allows one to use XML features, such as types and values, natively in OCaml programs. The goal of the OCamlDuce project is to extend the OCaml language with features to make it easier to write safe and efficient complex applications that need to deal with XML documents. In particular, it relies on a notion of types and patterns to guarantee statically that all the possible input documents are correctly processed, and that only valid output documents are produced. WWW: http://www.cduce.org/ocaml @ text @@