Index: head/devel/ocaml-classes/Makefile =================================================================== --- head/devel/ocaml-classes/Makefile (revision 169438) +++ head/devel/ocaml-classes/Makefile (revision 169439) @@ -1,25 +1,27 @@ # New ports collection makefile for: ocaml-classes # Date created: Ven 16 aoû 2002 02:05:08 CEST # Whom: Michaël Grünewald # # $FreeBSD$ # PORTNAME= classes PORTVERSION= 3.05 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/\ ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/\ ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/ PKGNAMEPREFIX= ocaml- DISTNAME= ocaml-${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ssedov@mbsd.msk.ru COMMENT= Ocaml Object interface for ocaml's standard library modules BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml +RUN_DEPENDS= ${BUILD_DEPENDS} post-extract: @${CP} ${FILESDIR}/META ${WRKSRC} .include Property changes on: head/devel/ocaml-classes/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/ocaml-classes/files/patch-Makefile =================================================================== --- head/devel/ocaml-classes/files/patch-Makefile (revision 169438) +++ head/devel/ocaml-classes/files/patch-Makefile (revision 169439) @@ -1,33 +1,53 @@ ---- Makefile.orig Thu Apr 18 20:39:26 2002 -+++ Makefile Fri Sep 20 21:16:25 2002 -@@ -1,10 +1,11 @@ +--- Makefile.orig Thu Apr 18 16:39:26 2002 ++++ Makefile Tue Aug 1 12:53:14 2006 +@@ -1,10 +1,12 @@ #Adjust this directory for installation -LIBDIR=`ocamlc -where` -+LIBDIR=$(PREFIX)/lib/ocaml/site-lib/classes ++LIBDIR=$(LOCALBASE)/lib/ocaml/site-lib/classes ++DISTDIR=$(PREFIX)/lib/ocaml/site-lib/classes COMPILER=ocamlc -c LIBRARIAN=ocamlc -a OPTCOMP=ocamlopt -c OPTLIB=ocamlopt -a -INSTALL=cp +INSTALL=install -o root -g wheel -m 644 +INSTALLDIR=install -d -o root -g wheel -m 755 OBJECTS=obuffer.cmo ohashtbl.cmo oqueue.cmo ostack.cmo \ omap.cmo oset.cmo ostream.cmo omapping.cmo -@@ -43,12 +44,15 @@ +@@ -16,13 +18,13 @@ + .SUFFIXES: .ml .mli .cmo .cmi .cmx + + .ml.cmo: +- $(COMPILER) $(INCLUDES) $< ++ $(COMPILER) -ccopt "${CFLAGS}" $(INCLUDES) $< + + .ml.cmx: +- $(OPTCOMP) $(INCLUDES) $< ++ $(OPTCOMP) -ccopt "${CFLAGS}" $(INCLUDES) $< + + .mli.cmi: +- $(COMPILER) $(INCLUDES) $< ++ $(COMPILER) -ccopt "${CFLAGS}" $(INCLUDES) $< + + all: stdclass.cma + opt: stdclass.cmxa +@@ -43,12 +45,15 @@ @$(MAKE) real-install LIBDIR=$(LIBDIR) real-install: -+ $(INSTALLDIR) $(LIBDIR) - $(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR) +- $(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR) ++ $(INSTALLDIR) $(DISTDIR) ++ $(INSTALL) stdclass.cma *.cmi *.mli $(DISTDIR) if test -f stdclass.cmxa; \ - then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi +- then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi ++ then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DISTDIR); fi + if test -f META; \ -+ then $(INSTALL) META $(LIBDIR); fi ++ then $(INSTALL) META $(DISTDIR); fi clean: - rm -f *.cm* *.o *.a *~ #* + rm -f *.cm* *.o *.a *~ depend: ocamldep *.ml *.mli > .depend Property changes on: head/devel/ocaml-classes/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/ocaml-classes/pkg-plist =================================================================== --- head/devel/ocaml-classes/pkg-plist (revision 169438) +++ head/devel/ocaml-classes/pkg-plist (revision 169439) @@ -1,21 +1,21 @@ +lib/ocaml/site-lib/classes/META lib/ocaml/site-lib/classes/obuffer.cmi lib/ocaml/site-lib/classes/obuffer.mli lib/ocaml/site-lib/classes/ogenlex.mli lib/ocaml/site-lib/classes/ohashtbl.cmi lib/ocaml/site-lib/classes/ohashtbl.mli lib/ocaml/site-lib/classes/omap.cmi lib/ocaml/site-lib/classes/omap.mli lib/ocaml/site-lib/classes/omapping.cmi lib/ocaml/site-lib/classes/omapping.mli lib/ocaml/site-lib/classes/oqueue.cmi lib/ocaml/site-lib/classes/oqueue.mli lib/ocaml/site-lib/classes/oset.cmi lib/ocaml/site-lib/classes/oset.mli lib/ocaml/site-lib/classes/ostack.cmi lib/ocaml/site-lib/classes/ostack.mli lib/ocaml/site-lib/classes/ostream.cmi lib/ocaml/site-lib/classes/ostream.mli lib/ocaml/site-lib/classes/stdclass.cma -lib/ocaml/site-lib/classes/META @dirrm lib/ocaml/site-lib/classes -@dirrm lib/ocaml/site-lib +@dirrmtry lib/ocaml/site-lib Property changes on: head/devel/ocaml-classes/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property