[88561] trunk/dports/lang/ocaml-dypgen
mww at macports.org
mww at macports.org
Wed Jan 4 02:29:47 PST 2012
Revision: 88561
http://trac.macports.org/changeset/88561
Author: mww at macports.org
Date: 2012-01-04 02:29:45 -0800 (Wed, 04 Jan 2012)
Log Message:
-----------
ocaml-dypgen: version 20111127-1
Modified Paths:
--------------
trunk/dports/lang/ocaml-dypgen/Portfile
trunk/dports/lang/ocaml-dypgen/files/patch-Makefile.diff
trunk/dports/lang/ocaml-dypgen/files/patch-dyplib-Makefile.diff
Removed Paths:
-------------
trunk/dports/lang/ocaml-dypgen/files/dypgen.sh
Modified: trunk/dports/lang/ocaml-dypgen/Portfile
===================================================================
--- trunk/dports/lang/ocaml-dypgen/Portfile 2012-01-04 09:59:02 UTC (rev 88560)
+++ trunk/dports/lang/ocaml-dypgen/Portfile 2012-01-04 10:29:45 UTC (rev 88561)
@@ -1,8 +1,10 @@
# $Id$
PortSystem 1.0
+PortGroup ocaml 1.0
+
name ocaml-dypgen
-version 20091118
+version 20111127-1
categories lang devel ml
platforms darwin
maintainers mww openmaintainer
@@ -14,21 +16,29 @@
distname dypgen-${version}
use_bzip2 yes
-checksums md5 e5037450094ab0332340e233b323cff6 \
- sha1 df8e4cfc4b148428ebada7c5118a4a71ce26eb6f \
- rmd160 82d181518bd035ec02a4d344cd6635cc743ec828
+checksums md5 507a812a5dae7c61fb8e38e8f9677f99 \
+ sha1 33fcd137bb5187043451b956605bf7dff5b195f7 \
+ rmd160 5f80156d3d950a0ea8811a0c496d4eba9631f9a0
depends_lib port:ocaml-findlib \
port:ocaml
+worksrcdir dypgen
+
patchfiles patch-Makefile.diff patch-dyplib-Makefile.diff
+configure {
+ reinplace "s|@ocamlfind@|${ocamlfind_wrapper}|g" ${worksrcpath}/dyplib/Makefile
+}
+
use_configure no
use_parallel_build no
-destroot.args BINDIR=${prefix}/bin
+build.target dyp
+destroot.args BINDIR=${prefix}/bin MANDIR=${prefix}/share/man/man1
+
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/examples \
${destroot}${prefix}/share/doc/${name}
@@ -36,7 +46,5 @@
xinstall -m 644 -W ${worksrcpath} dypgen-doc.pdf CHANGES \
CREDITS INSTALL Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt \
${destroot}${prefix}/share/doc/${name}
- xinstall -m 755 ${filespath}/dypgen.sh ${destroot}${prefix}/bin/dypgen
- reinplace "s|@prefix@|${prefix}|g" ${destroot}${prefix}/bin/dypgen
}
Deleted: trunk/dports/lang/ocaml-dypgen/files/dypgen.sh
===================================================================
--- trunk/dports/lang/ocaml-dypgen/files/dypgen.sh 2012-01-04 09:59:02 UTC (rev 88560)
+++ trunk/dports/lang/ocaml-dypgen/files/dypgen.sh 2012-01-04 10:29:45 UTC (rev 88561)
@@ -1,2 +0,0 @@
-#!/bin/sh
- at prefix@/bin/dypgen.ml --ocamlc "-I @prefix@/lib/ocaml/site-lib/dyp" $*
Modified: trunk/dports/lang/ocaml-dypgen/files/patch-Makefile.diff
===================================================================
--- trunk/dports/lang/ocaml-dypgen/files/patch-Makefile.diff 2012-01-04 09:59:02 UTC (rev 88560)
+++ trunk/dports/lang/ocaml-dypgen/files/patch-Makefile.diff 2012-01-04 10:29:45 UTC (rev 88561)
@@ -1,32 +1,34 @@
---- work/dypgen-20091118/Makefile 2009-11-18 19:14:18.000000000 +0100
-+++ Makefile 2009-12-03 21:19:39.000000000 +0100
-@@ -6,7 +6,7 @@
- cd dyplib; $(MAKE)
- cd dypgen; $(MAKE)
+--- Makefile 2010-06-24 22:57:53.000000000 +0200
++++ Makefile 2012-01-04 11:10:24.000000000 +0100
+@@ -22,26 +22,26 @@
--all:
-+all: dyp
- $(MAKE) dypgen
- $(MAKE) examples
-
-@@ -21,11 +21,11 @@
- done
-
+ #install with ocaml-findlib
install: install_opt
-- mkdir -p $(BINDIR)
-- cp dypgen/dypgen $(BINDIR)
-- cp dyp2gram.pl $(BINDIR)
-- chmod +x $(BINDIR)/dyp2gram.pl
-- cd dyplib; $(MAKE) install
-+ mkdir -p $(DESTDIR)$(BINDIR)
-+ cp dypgen/dypgen $(DESTDIR)$(BINDIR)/dypgen.ml
-+ cp dyp2gram.pl $(DESTDIR)$(BINDIR)
-+ chmod +x $(DESTDIR)$(BINDIR)/dyp2gram.pl
-+ cd dyplib; $(MAKE) install DESTDIR=$(DESTDIR)
+- install -D --mode=755 dypgen/dypgen $(BINDIR)
+- install -D --mode=755 dyp2gram.pl $(BINDIR)/dyp2gram
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dypgen.1
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dypgen.opt.1
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dyp2gram.1
++ install -m 755 dypgen/dypgen $(DESTDIR)$(BINDIR)
++ install -m 755 dyp2gram.pl $(DESTDIR)$(BINDIR)/dyp2gram
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dypgen.1
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dypgen.opt.1
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dyp2gram.1
+ cd dyplib; $(MAKE) install
+ #install without ocaml-findlib
install2: install_opt
- mkdir -p $(BINDIR)
-@@ -35,8 +35,8 @@
+- install -D --mode=755 dypgen/dypgen $(BINDIR)
+- install -D --mode=755 dyp2gram.pl $(BINDIR)/dyp2gram
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dypgen.1
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dypgen.opt.1
+- install -D --mode=644 doc/dypgen.1 $(MANDIR)/dyp2gram.1
++ install -m 755 dypgen/dypgen $(DESTDIR)$(BINDIR)
++ install -m 755 dyp2gram.pl $(DESTDIR)$(BINDIR)/dyp2gram
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dypgen.1
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dypgen.opt.1
++ install -m 644 doc/dypgen.1 $(DESTDIR)$(MANDIR)/dyp2gram.1
+ cd dyplib; $(MAKE) install2
ifdef CAMLOPT
install_opt:
Modified: trunk/dports/lang/ocaml-dypgen/files/patch-dyplib-Makefile.diff
===================================================================
--- trunk/dports/lang/ocaml-dypgen/files/patch-dyplib-Makefile.diff 2012-01-04 09:59:02 UTC (rev 88560)
+++ trunk/dports/lang/ocaml-dypgen/files/patch-dyplib-Makefile.diff 2012-01-04 10:29:45 UTC (rev 88561)
@@ -1,14 +1,24 @@
---- dyplib/Makefile 2009-11-18 19:14:18.000000000 +0100
-+++ dyplib/Makefile 2009-12-03 21:23:07.000000000 +0100
-@@ -19,8 +19,9 @@
+--- dyplib/Makefile 2011-11-25 15:26:27.000000000 +0100
++++ dyplib/Makefile 2012-01-04 11:13:13.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ REP=
+ CAMLC=ocamlc
+-OCAMLFIND=ocamlfind
++OCAMLFIND=@ocamlfind@
+
+ all: dyp opt prof
+
+@@ -19,10 +19,8 @@
prof:
endif
-install: uninstall
-- $(OCAMLFIND) install dyp META dyp.cma dyp.cmxa dyp.a dyp.cmi
+- install -d $(DYPGENLIBDIR)
+- $(OCAMLFIND) install -destdir $(DYPGENLIBDIR) dyp META dyp.cma dyp.cmxa dyp.a dyp.cmi
+- chmod a-x $(DYPGENLIBDIR)/dyp/META #why is this needed ?
+install:
-+ mkdir -p $(DESTDIR)/`$(OCAMLFIND) printconf destdir`
-+ $(OCAMLFIND) install -destdir $(DESTDIR)/`$(OCAMLFIND) printconf destdir` dyp META dyp.cma dyp.cmxa dyp.a dyp.cmi dyp.mli
++ $(OCAMLFIND) install dyp META dyp.cma dyp.cmxa dyp.a dyp.cmi
uninstall:
- $(OCAMLFIND) remove dyp
+ - $(OCAMLFIND) remove -destdir $(DYPGENLIBDIR) dyp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120104/ae8fd5b5/attachment.html>
More information about the macports-changes
mailing list