View | Details | Raw Unified | Return to bug 89701
Collapse All | Expand All

(-)metaocaml/Makefile (-4 / +6 lines)
Lines 6-18 Link Here
6
#
6
#
7
7
8
PORTNAME=	metaocaml
8
PORTNAME=	metaocaml
9
PORTVERSION=	3.08.a23
9
PORTVERSION=	3.08.a27
10
CATEGORIES=	lang
10
CATEGORIES=	lang
11
MASTER_SITES=	http://www.metaocaml.org/dist/ \
11
MASTER_SITES=	http://www.metaocaml.org/dist/old/ \
12
		http://www.metaocaml.org/dist/old/ \
13
		${MASTER_SITE_LOCAL}
12
		${MASTER_SITE_LOCAL}
14
MASTER_SITE_SUBDIR=	jylefort
13
MASTER_SITE_SUBDIR=	jylefort
15
DISTNAME=	MetaOCaml_308_alpha_023
14
DISTNAME=	MetaOCaml_308_alpha_027
16
15
17
MAINTAINER=	mainland@apeiron.net
16
MAINTAINER=	mainland@apeiron.net
18
COMMENT=	The MetaOCaml compiler and programming environment
17
COMMENT=	The MetaOCaml compiler and programming environment
Lines 76-84 Link Here
76
PLIST_SUB+=	X11="@comment "
75
PLIST_SUB+=	X11="@comment "
77
.endif
76
.endif
78
77
78
# We would like to use bsd.tcl.mk here, but we can't USE_TCL after including
79
# bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk
79
.if defined(WITH_LABLTK)
80
.if defined(WITH_LABLTK)
80
LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
81
LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
81
CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4"
82
CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4"
83
CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib"
82
PLIST_SUB+=	LABLTK=""
84
PLIST_SUB+=	LABLTK=""
83
.if defined(WITHOUT_X11)
85
.if defined(WITHOUT_X11)
84
CONFIGURE_ARGS+=-tk-no-x11
86
CONFIGURE_ARGS+=-tk-no-x11
(-)metaocaml/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
MD5 (MetaOCaml_308_alpha_023.tar.gz) = e24bf3a24bd10839f80d4b8a963c8dde
1
MD5 (MetaOCaml_308_alpha_027.tar.gz) = cbe2ed6f3465fdd2bab138babebf8087
2
SIZE (MetaOCaml_308_alpha_023.tar.gz) = 2643391
2
SHA256 (MetaOCaml_308_alpha_027.tar.gz) = 204b1458752062d2301542acf2ef8356a1cde23d0026f281f0fc04b11be4bf82
3
SIZE (MetaOCaml_308_alpha_027.tar.gz) = 2673440
(-)metaocaml/files/patch-camlp4::man::Makefile (+21 lines)
Line 0 Link Here
1
--- camlp4/man/Makefile.orig	Fri Mar 25 18:56:24 2005
2
+++ camlp4/man/Makefile	Sat Nov  5 22:27:56 2005
3
@@ -3,7 +3,6 @@
4
 include ../config/Makefile
5
 
6
 TARGET=camlp4.1
7
-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
8
 
9
 all: $(TARGET)
10
 
11
@@ -18,10 +17,6 @@
12
 	if test -n '$(MANDIR)'; then \
13
 	  $(MKDIR) $(MANDIR)/man1 ; \
14
 	  cp $(TARGET) $(MANDIR)/man1/. ; \
15
-	  for i in $(ALIASES); do \
16
-            rm -f $(MANDIR)/man1/$$i; \
17
-            echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
18
-          done; \
19
 	fi
20
 
21
 camlp4.1: camlp4.1.tpl
(-)metaocaml/files/patch-camlp4_man_Makefile (-21 lines)
Lines 1-21 Link Here
1
--- camlp4/man/Makefile.orig	Sat Nov 22 17:30:44 2003
2
+++ camlp4/man/Makefile	Sat Nov 22 04:48:25 2003
3
@@ -3,7 +3,6 @@
4
 include ../config/Makefile
5
 
6
 TARGET=camlp4.1
7
-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
8
 
9
 all: $(TARGET)
10
 
11
@@ -18,10 +17,6 @@
12
 	if test -n '$(MANDIR)'; then \
13
 	  $(MKDIR) $(MANDIR)/man1 ; \
14
 	  cp $(TARGET) $(MANDIR)/man1/. ; \
15
-	  for i in $(ALIASES); do \
16
-            rm -f $(MANDIR)/man1/$$i; \
17
-            echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
18
-          done; \
19
 	fi
20
 
21
 camlp4.1: camlp4.1.tpl
(-)metaocaml/files/patch-configure (-3 / +12 lines)
Lines 1-6 Link Here
1
--- configure.orig	Thu Jul 15 16:17:46 2004
1
--- configure.orig	Mon Oct 17 10:20:41 2005
2
+++ configure	Thu Jul 15 16:58:51 2004
2
+++ configure	Sat Nov  5 22:40:41 2005
3
@@ -1113,116 +1113,14 @@
3
@@ -653,6 +653,7 @@
4
   alpha,*,digital) profiling='prof';;
5
   i386,*,linux_elf) profiling='prof';;
6
   i386,*,bsd_elf) profiling='prof';;
7
+  *,*,freebsd) profiling='prof';;
8
   sparc,*,solaris)
9
     profiling='prof'
10
     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
11
@@ -1123,117 +1124,14 @@
4
 x11_include="not found"
12
 x11_include="not found"
5
 x11_link="not found"
13
 x11_link="not found"
6
 
14
 
Lines 63-68 Link Here
63
-    $x11_lib_dir          \
71
-    $x11_lib_dir          \
64
-    $x11_try_lib_dir      \
72
-    $x11_try_lib_dir      \
65
-                          \
73
-                          \
74
-    /usr/X11R6/lib64      \
66
-    /usr/X11R6/lib        \
75
-    /usr/X11R6/lib        \
67
-    /usr/lib/X11R6        \
76
-    /usr/lib/X11R6        \
68
-    /usr/local/X11R6/lib  \
77
-    /usr/local/X11R6/lib  \
(-)metaocaml/files/patch-ocamldoc::Makefile (+22 lines)
Line 0 Link Here
1
--- ocamldoc/Makefile.orig	Sat Nov 22 17:38:34 2003
2
+++ ocamldoc/Makefile	Sat Nov 22 04:34:14 2003
3
@@ -40,7 +40,7 @@
4
 OCAMLDOC_LIBA=odoc_info.a
5
 INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
6
 INSTALL_BINDIR=$(OCAMLBIN)
7
-INSTALL_MANODIR=$(MANDIR)/man3
8
+INSTALL_MANODIR=$(MANDIR)/mann
9
 
10
 INSTALL_MLIS=odoc_info.mli 
11
 INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
12
@@ -281,7 +281,9 @@
13
 	$(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
14
 	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
15
 	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
16
-	$(CP) stdlib_man/* $(INSTALL_MANODIR)
17
+	for f in stdlib_man/*; do \
18
+		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
19
+	done
20
 
21
 installopt:
22
 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
(-)metaocaml/files/patch-ocamldoc_Makefile (-22 lines)
Lines 1-22 Link Here
1
--- ocamldoc/Makefile.orig	Sat Nov 22 17:38:34 2003
2
+++ ocamldoc/Makefile	Sat Nov 22 04:34:14 2003
3
@@ -40,7 +40,7 @@
4
 OCAMLDOC_LIBA=odoc_info.a
5
 INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
6
 INSTALL_BINDIR=$(OCAMLBIN)
7
-INSTALL_MANODIR=$(MANDIR)/man3
8
+INSTALL_MANODIR=$(MANDIR)/mann
9
 
10
 INSTALL_MLIS=odoc_info.mli 
11
 INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
12
@@ -281,7 +281,9 @@
13
 	$(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
14
 	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
15
 	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
16
-	$(CP) stdlib_man/* $(INSTALL_MANODIR)
17
+	for f in stdlib_man/*; do \
18
+		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
19
+	done
20
 
21
 installopt:
22
 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
(-)metaocaml/files/patch-stdlib::Makefile (+11 lines)
Line 0 Link Here
1
--- stdlib/Makefile.orig	Sat Aug 20 02:39:05 2005
2
+++ stdlib/Makefile	Sat Aug 20 02:39:27 2005
3
@@ -47,7 +47,7 @@
4
 	rm -f std_exit.p.cmi
5
 
6
 install:
7
-	cp stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
8
+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
9
            $(LIBDIR)
10
 
11
 installopt: installopt-default installopt-$(PROFILING)
(-)metaocaml/files/patch-stdlib_Makefile (-11 lines)
Lines 1-11 Link Here
1
--- stdlib/Makefile.orig	Sat Aug 20 02:39:05 2005
2
+++ stdlib/Makefile	Sat Aug 20 02:39:27 2005
3
@@ -47,7 +47,7 @@
4
 	rm -f std_exit.p.cmi
5
 
6
 install:
7
-	cp stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
8
+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
9
            $(LIBDIR)
10
 
11
 installopt: installopt-default installopt-$(PROFILING)
(-)metaocaml/pkg-plist (-7 / +20 lines)
Lines 81-86 Link Here
81
lib/metaocaml/lib/caml/memory.h
81
lib/metaocaml/lib/caml/memory.h
82
lib/metaocaml/lib/caml/misc.h
82
lib/metaocaml/lib/caml/misc.h
83
lib/metaocaml/lib/caml/mlvalues.h
83
lib/metaocaml/lib/caml/mlvalues.h
84
lib/metaocaml/lib/caml/printexc.h
84
lib/metaocaml/lib/caml/signals.h
85
lib/metaocaml/lib/caml/signals.h
85
lib/metaocaml/lib/camlheader
86
lib/metaocaml/lib/camlheader
86
lib/metaocaml/lib/camlheader_ur
87
lib/metaocaml/lib/camlheader_ur
Lines 89-94 Link Here
89
lib/metaocaml/lib/camlinternalOO.ml
90
lib/metaocaml/lib/camlinternalOO.ml
90
lib/metaocaml/lib/camlinternalOO.mli
91
lib/metaocaml/lib/camlinternalOO.mli
91
lib/metaocaml/lib/camlinternalOO.p.cmx
92
lib/metaocaml/lib/camlinternalOO.p.cmx
93
lib/metaocaml/lib/camlp4/argl.cmi
94
lib/metaocaml/lib/camlp4/argl.cmo
95
lib/metaocaml/lib/camlp4/argl.cmx
96
lib/metaocaml/lib/camlp4/argl.o
92
lib/metaocaml/lib/camlp4/ast2pt.cmi
97
lib/metaocaml/lib/camlp4/ast2pt.cmi
93
lib/metaocaml/lib/camlp4/ast2pt.mli
98
lib/metaocaml/lib/camlp4/ast2pt.mli
94
lib/metaocaml/lib/camlp4/camlp4.a
99
lib/metaocaml/lib/camlp4/camlp4.a
Lines 98-114 Link Here
98
lib/metaocaml/lib/camlp4/camlp4o.cma
103
lib/metaocaml/lib/camlp4/camlp4o.cma
99
lib/metaocaml/lib/camlp4/camlp4r.cma
104
lib/metaocaml/lib/camlp4/camlp4r.cma
100
lib/metaocaml/lib/camlp4/extfold.cmi
105
lib/metaocaml/lib/camlp4/extfold.cmi
106
lib/metaocaml/lib/camlp4/extfold.cmx
101
lib/metaocaml/lib/camlp4/extfold.mli
107
lib/metaocaml/lib/camlp4/extfold.mli
102
lib/metaocaml/lib/camlp4/extfun.cmi
108
lib/metaocaml/lib/camlp4/extfun.cmi
109
lib/metaocaml/lib/camlp4/extfun.cmx
103
lib/metaocaml/lib/camlp4/extfun.mli
110
lib/metaocaml/lib/camlp4/extfun.mli
104
lib/metaocaml/lib/camlp4/fstream.cmi
111
lib/metaocaml/lib/camlp4/fstream.cmi
112
lib/metaocaml/lib/camlp4/fstream.cmx
105
lib/metaocaml/lib/camlp4/fstream.mli
113
lib/metaocaml/lib/camlp4/fstream.mli
106
lib/metaocaml/lib/camlp4/gramext.cmi
114
lib/metaocaml/lib/camlp4/gramext.cmi
115
lib/metaocaml/lib/camlp4/gramext.cmx
107
lib/metaocaml/lib/camlp4/gramext.mli
116
lib/metaocaml/lib/camlp4/gramext.mli
108
lib/metaocaml/lib/camlp4/gramlib.a
117
lib/metaocaml/lib/camlp4/gramlib.a
109
lib/metaocaml/lib/camlp4/gramlib.cma
118
lib/metaocaml/lib/camlp4/gramlib.cma
110
lib/metaocaml/lib/camlp4/gramlib.cmxa
119
lib/metaocaml/lib/camlp4/gramlib.cmxa
111
lib/metaocaml/lib/camlp4/grammar.cmi
120
lib/metaocaml/lib/camlp4/grammar.cmi
121
lib/metaocaml/lib/camlp4/grammar.cmx
112
lib/metaocaml/lib/camlp4/grammar.mli
122
lib/metaocaml/lib/camlp4/grammar.mli
113
lib/metaocaml/lib/camlp4/mLast.cmi
123
lib/metaocaml/lib/camlp4/mLast.cmi
114
lib/metaocaml/lib/camlp4/mLast.mli
124
lib/metaocaml/lib/camlp4/mLast.mli
Lines 167-172 Link Here
167
lib/metaocaml/lib/camlp4/pcaml.cmi
177
lib/metaocaml/lib/camlp4/pcaml.cmi
168
lib/metaocaml/lib/camlp4/pcaml.mli
178
lib/metaocaml/lib/camlp4/pcaml.mli
169
lib/metaocaml/lib/camlp4/plexer.cmi
179
lib/metaocaml/lib/camlp4/plexer.cmi
180
lib/metaocaml/lib/camlp4/plexer.cmx
170
lib/metaocaml/lib/camlp4/plexer.mli
181
lib/metaocaml/lib/camlp4/plexer.mli
171
lib/metaocaml/lib/camlp4/pr_depend.cmo
182
lib/metaocaml/lib/camlp4/pr_depend.cmo
172
lib/metaocaml/lib/camlp4/pr_depend.cmx
183
lib/metaocaml/lib/camlp4/pr_depend.cmx
Lines 206-213 Link Here
206
lib/metaocaml/lib/camlp4/spretty.cmi
217
lib/metaocaml/lib/camlp4/spretty.cmi
207
lib/metaocaml/lib/camlp4/spretty.mli
218
lib/metaocaml/lib/camlp4/spretty.mli
208
lib/metaocaml/lib/camlp4/stdpp.cmi
219
lib/metaocaml/lib/camlp4/stdpp.cmi
220
lib/metaocaml/lib/camlp4/stdpp.cmx
209
lib/metaocaml/lib/camlp4/stdpp.mli
221
lib/metaocaml/lib/camlp4/stdpp.mli
210
lib/metaocaml/lib/camlp4/token.cmi
222
lib/metaocaml/lib/camlp4/token.cmi
223
lib/metaocaml/lib/camlp4/token.cmx
211
lib/metaocaml/lib/camlp4/token.mli
224
lib/metaocaml/lib/camlp4/token.mli
212
lib/metaocaml/lib/char.cmi
225
lib/metaocaml/lib/char.cmi
213
lib/metaocaml/lib/char.cmx
226
lib/metaocaml/lib/char.cmx
Lines 585-590 Link Here
585
%%X11%%lib/metaocaml/lib/stublibs/dllgraphics.so
598
%%X11%%lib/metaocaml/lib/stublibs/dllgraphics.so
586
%%LABLTK%%lib/metaocaml/bin/labltk
599
%%LABLTK%%lib/metaocaml/bin/labltk
587
%%LABLTK%%lib/metaocaml/bin/ocamlbrowser
600
%%LABLTK%%lib/metaocaml/bin/ocamlbrowser
601
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi
602
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx
603
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli
604
%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi
605
%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx
606
%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli
588
%%LABLTK%%lib/metaocaml/lib/labltk/button.cmi
607
%%LABLTK%%lib/metaocaml/lib/labltk/button.cmi
589
%%LABLTK%%lib/metaocaml/lib/labltk/button.cmx
608
%%LABLTK%%lib/metaocaml/lib/labltk/button.cmx
590
%%LABLTK%%lib/metaocaml/lib/labltk/button.mli
609
%%LABLTK%%lib/metaocaml/lib/labltk/button.mli
Lines 895-906 Link Here
895
%%LABLTK%%lib/metaocaml/lib/labltk/wm.mli
914
%%LABLTK%%lib/metaocaml/lib/labltk/wm.mli
896
%%LABLTK%%lib/metaocaml/lib/stublibs/dlllabltk.so
915
%%LABLTK%%lib/metaocaml/lib/stublibs/dlllabltk.so
897
%%LABLTK%%lib/metaocaml/lib/stublibs/dlltkanim.so
916
%%LABLTK%%lib/metaocaml/lib/stublibs/dlltkanim.so
898
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi
899
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx
900
%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli
901
%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi
902
%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx
903
%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli
904
%%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile
917
%%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile
905
%%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile.nt
918
%%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile.nt
906
%%LABLTK%%%%EXAMPLESDIR%%/camltk/addition.ml
919
%%LABLTK%%%%EXAMPLESDIR%%/camltk/addition.ml
Lines 938-949 Link Here
938
@dirrm lib/metaocaml/bin
951
@dirrm lib/metaocaml/bin
939
@dirrm lib/metaocaml/lib/caml
952
@dirrm lib/metaocaml/lib/caml
940
@dirrm lib/metaocaml/lib/camlp4
953
@dirrm lib/metaocaml/lib/camlp4
954
%%LABLTK%%@dirrm lib/metaocaml/lib/labltk
941
@dirrm lib/metaocaml/lib/ocamldoc/custom
955
@dirrm lib/metaocaml/lib/ocamldoc/custom
942
@dirrm lib/metaocaml/lib/ocamldoc
956
@dirrm lib/metaocaml/lib/ocamldoc
943
@dirrm lib/metaocaml/lib/stublibs
957
@dirrm lib/metaocaml/lib/stublibs
944
@dirrm lib/metaocaml/lib/threads
958
@dirrm lib/metaocaml/lib/threads
945
@dirrm lib/metaocaml/lib/vmthreads
959
@dirrm lib/metaocaml/lib/vmthreads
946
%%LABLTK%%@dirrm lib/metaocaml/lib/labltk
947
@dirrm lib/metaocaml/lib
960
@dirrm lib/metaocaml/lib
948
@dirrm lib/metaocaml
961
@dirrm lib/metaocaml
949
@dirrm %%DATADIR%%/man/man1
962
@dirrm %%DATADIR%%/man/man1

Return to bug 89701