From e36f1878a0a865321f7a402deb5787c99438ae0a Mon Sep 17 00:00:00 2001 From: wulf Date: Fri, 13 Jul 2001 16:20:57 +0000 Subject: Updated camlp4 to 3.01.6: Bugfix release --- lang/camlp4/Makefile | 6 ++-- lang/camlp4/patches/patch-aa | 70 ++++++++++++++++++++++---------------------- lang/camlp4/pkg/PLIST | 15 +++++++--- lang/camlp4/pkg/PLIST.opt | 6 ++-- 4 files changed, 52 insertions(+), 45 deletions(-) (limited to 'lang') diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile index 33e724609e2..35d39ec8d77 100644 --- a/lang/camlp4/Makefile +++ b/lang/camlp4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:01 agc Exp $ +# $NetBSD: Makefile,v 1.4 2001/07/13 16:21:41 wulf Exp $ # -DISTNAME= camlp4-3.00 +DISTNAME= camlp4-3.01.6 CATEGORIES= lang MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ @@ -9,7 +9,7 @@ MAINTAINER= wulf@netbsd.org HOMEPAGE= http://caml.inria.fr/camlp4/ COMMENT= Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml -DEPENDS+= ocaml-3.*:../ocaml +DEPENDS+= ocaml-3.01:../ocaml USE_GMAKE= yes HAS_CONFIGURE= yes diff --git a/lang/camlp4/patches/patch-aa b/lang/camlp4/patches/patch-aa index 1034b18df01..125bb4e2c23 100644 --- a/lang/camlp4/patches/patch-aa +++ b/lang/camlp4/patches/patch-aa @@ -1,63 +1,63 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/06/12 22:37:00 wulf Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/13 16:20:57 wulf Exp $ ---- configure.orig Sat Jun 10 11:30:15 2000 -+++ configure Sat Jun 10 11:47:23 2000 -@@ -1,9 +1,5 @@ +--- configure.orig Thu Jun 21 18:10:06 2001 ++++ configure Fri Jun 29 08:15:08 2001 +@@ -1,8 +1,5 @@ #!/bin/sh -BINDIR=/usr/local/bin -LIBDIR=/usr/local/lib/camlp4 -MANDIR=/usr/local/man/man1 -- - if test -f config/Makefile.cnf; then . config/Makefile.cnf; fi + OPT=.opt abort () -@@ -63,23 +59,33 @@ - OLIBDIR=`echo $OLIBDIR | sed -e s=\\\\\\\\=/=g` - echo "Ocaml library directory is $OLIBDIR" +@@ -83,23 +80,32 @@ + OPT= + fi -echo -echo "The compilation process creates executable files." -echo "Please tell me where to install them." -askfor "Directory for executables" $BINDIR -BINDIR=$r -+if test ${PREFIX}; then -+ BINDIR=${PREFIX}/bin -+ LIBDIR=${PREFIX}/lib/camlp4 -+ MANDIR=${PREFIX}/man/man1 -+else -+ BINDIR=/usr/local/bin -+ LIBDIR=/usr/local/lib/camlp4 -+ MANDIR=/usr/local/man/man1 - +- -echo -echo "The compilation process creates some library files." -echo "Please tell me where to install them." -askfor "Directory for library" $LIBDIR -LIBDIR=$r -+ echo -+ echo "The compilation process creates executable files." -+ echo "Please tell me where to install them." -+ askfor "Directory for executables" $BINDIR -+ BINDIR=$r - +- -echo -echo "The system has some manual pages." -echo "Please tell me where to install them." -askfor "Directory for manual pages" $MANDIR -MANDIR=$r -+ echo -+ echo "The compilation process creates some library files." -+ echo "Please tell me where to install them." -+ askfor "Directory for library" $LIBDIR -+ LIBDIR=$r ++if test ${PREFIX}; then ++ BINDIR=${PREFIX}/bin ++ LIBDIR=${PREFIX}/lib/camlp4 ++ MANDIR=${PREFIX}/man/man1 ++else ++ BINDIR=/usr/local/bin ++ LIBDIR=/usr/local/lib/camlp4 ++ MANDIR=/usr/local/man/man1 ++ ++ echo ++ echo "The compilation process creates executable files." ++ echo "Please tell me where to install them." ++ askfor "Directory for executables" $BINDIR ++ BINDIR=$r ++ echo ++ echo "The compilation process creates some library files." ++ echo "Please tell me where to install them." ++ askfor "Directory for library" $LIBDIR ++ LIBDIR=$r + -+ echo -+ echo "The system has some manual pages." -+ echo "Please tell me where to install them." -+ askfor "Directory for manual pages" $MANDIR -+ MANDIR=$r ++ echo ++ echo "The system has some manual pages." ++ echo "Please tell me where to install them." ++ askfor "Directory for manual pages" $MANDIR ++ MANDIR=$r +fi ( - echo OLIBDIR=$OLIBDIR + echo OTOP=../ocaml_stuff diff --git a/lang/camlp4/pkg/PLIST b/lang/camlp4/pkg/PLIST index 6d981c84a67..18cdf6c018f 100644 --- a/lang/camlp4/pkg/PLIST +++ b/lang/camlp4/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2000/09/02 21:10:35 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/07/13 16:20:58 wulf Exp $ bin/camlp4 bin/camlp4o bin/camlp4r @@ -11,7 +11,10 @@ lib/camlp4/camlp4_top.cma lib/camlp4/camlp4o.cma lib/camlp4/camlp4r.cma lib/camlp4/crc.cmo -lib/camlp4/extract_crc +lib/camlp4/extfun.cmi +lib/camlp4/extfun.mli +lib/camlp4/fstream.cmi +lib/camlp4/fstream.mli lib/camlp4/gramext.cmi lib/camlp4/gramext.mli lib/camlp4/gramlib.cma @@ -25,9 +28,12 @@ lib/camlp4/odyl.cma lib/camlp4/odyl.cmo lib/camlp4/pa_extend.cmo lib/camlp4/pa_extend_m.cmo +lib/camlp4/pa_extfun.cmo lib/camlp4/pa_format.cmo +lib/camlp4/pa_fstream.cmo lib/camlp4/pa_ifdef.cmi lib/camlp4/pa_ifdef.cmo +lib/camlp4/pa_lisp.cmo lib/camlp4/pa_o.cmi lib/camlp4/pa_o.cmo lib/camlp4/pa_olabl.cmo @@ -44,6 +50,7 @@ lib/camlp4/plexer.mli lib/camlp4/pr_depend.cmo lib/camlp4/pr_dump.cmo lib/camlp4/pr_extend.cmo +lib/camlp4/pr_extfun.cmo lib/camlp4/pr_null.cmo lib/camlp4/pr_o.cmo lib/camlp4/pr_op.cmo @@ -53,15 +60,15 @@ lib/camlp4/q_MLast.cmo lib/camlp4/q_phony.cmo lib/camlp4/quotation.cmi lib/camlp4/quotation.mli +lib/camlp4/spretty.cmi +lib/camlp4/spretty.mli lib/camlp4/stdpp.cmi lib/camlp4/stdpp.mli lib/camlp4/token.cmi lib/camlp4/token.mli man/man1/camlp4.1 man/man1/camlp4o.1 -man/man1/camlp4o.opt.1 man/man1/camlp4r.1 -man/man1/camlp4r.opt.1 man/man1/mkcamlp4.1 man/man1/ocpp.1 @dirrm lib/camlp4 diff --git a/lang/camlp4/pkg/PLIST.opt b/lang/camlp4/pkg/PLIST.opt index 71cdfdcf886..0611467b482 100644 --- a/lang/camlp4/pkg/PLIST.opt +++ b/lang/camlp4/pkg/PLIST.opt @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST.opt,v 1.2 2000/09/02 21:10:35 dmcmahill Exp $ -bin/camlp4o.opt -bin/camlp4r.opt +@comment $NetBSD: PLIST.opt,v 1.3 2001/07/13 16:20:58 wulf Exp $ +lib/camlp4/extfun.cmx +lib/camlp4/fstream.cmx lib/camlp4/gramext.cmx lib/camlp4/gramlib.a lib/camlp4/gramlib.cmxa -- cgit v1.2.3