mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Respect CFLAGS, PREFIX

Browse Source 
- Add missing RUN_DEPENDS on ocaml
- Pass maintainership to submitter

PR:		ports/101148
Submitted by:	Stanislav Sedov <ssedov at mbsd.msk.ru>
This commit is contained in:
Rong-En Fan 2006-08-02 08:25:04 +00:00
parent df98f1dff5
commit 6dc91d4950
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=169439
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/ocaml-classes/Makefile
View File

@ -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}

38
devel/ocaml-classes/files/patch-Makefile
View File

@ -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 *~ #*

4
devel/ocaml-classes/pkg-plist
View File

@ -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