aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2006-08-02 08:25:04 +0000
committerRong-En Fan <rafan@FreeBSD.org>2006-08-02 08:25:04 +0000
commit6dc91d49504c5aac6f7c3884f920246b9da33461 (patch)
tree2d62286b766087ec630b395b40920ad84cfe21a3 /devel
parentdf98f1dff58acf2a9f6ea3aba332fc4738c614fc (diff)
downloadports-6dc91d49504c5aac6f7c3884f920246b9da33461.tar.gz
ports-6dc91d49504c5aac6f7c3884f920246b9da33461.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/ocaml-classes/Makefile4
-rw-r--r--devel/ocaml-classes/files/patch-Makefile38
-rw-r--r--devel/ocaml-classes/pkg-plist4
3 files changed, 34 insertions, 12 deletions
diff --git a/devel/ocaml-classes/Makefile b/devel/ocaml-classes/Makefile
index dbc677b5fc8e..de12bfbde21c 100644
--- a/devel/ocaml-classes/Makefile
+++ b/devel/ocaml-classes/Makefile
@@ -7,6 +7,7 @@
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/\
@@ -14,10 +15,11 @@ MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/\
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}
diff --git a/devel/ocaml-classes/files/patch-Makefile b/devel/ocaml-classes/files/patch-Makefile
index 677e1b22db4a..47ffdf4e1d0f 100644
--- a/devel/ocaml-classes/files/patch-Makefile
+++ b/devel/ocaml-classes/files/patch-Makefile
@@ -1,9 +1,10 @@
---- 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
@@ -14,16 +15,35 @@
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 *~ #*
diff --git a/devel/ocaml-classes/pkg-plist b/devel/ocaml-classes/pkg-plist
index 1e6d5ab983a5..8880a7132fcd 100644
--- a/devel/ocaml-classes/pkg-plist
+++ b/devel/ocaml-classes/pkg-plist
@@ -1,3 +1,4 @@
+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
@@ -16,6 +17,5 @@ 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