Attachment #141381 for bug #188158

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




# Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
# $FreeBSD$

PORTNAME=	ocaml
PORTVERSION=	4.01.0
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
		${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR=	distfiles
PKGNAMESUFFIX=	${SFX}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	michipili@gmail.com
COMMENT=	The Objective Caml compiler and programming environment

SSP_UNSAFE=	yes
MAKE_JOBS_UNSAFE=	yes

MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
		-cc "${CC} ${CFLAGS}" \
		-as "${AS} ${ASFLAGS}" \


OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS
OPTIONS_DEFAULT=X11 TK THREADS
OPT_DEF_DESC=	Use system-optimized binaries by default
TK_DESC=	LablTk library (requires X11 support)
CMP_LIB_DESC=	Install compiler libraries
OPT_DEF_DESC=	Use system-optimizes binaries by default


MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]
DOCSDISTNAME=	${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}

CONFLICTS=	metaocaml-[0-9]*

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
DISTFILES+=	${DOCSDISTNAME}-refman-html.tar.gz \
		${DOCSDISTNAME}-refman.ps.gz \
		${DOCSDISTNAME}-refman.pdf
EXTRACT_ONLY+=	${DOCSDISTNAME}-refman-html.tar.gz
PLIST_SUB+=	DOC=""
PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
.else
PLIST_SUB+=	DOC="@comment "
.endif

.if ${PORT_OPTIONS:MTHREADS}

PORTEXAMPLES=	examples_camltk examples_labltk
.endif
. if ! ${PORT_OPTIONS:MX11}
IGNORE=requires X11 support to build TK bindings
. endif
USES+=		tk:84+
PLIST_SUB+=	TK=""

PLIST_SUB+=	PROF=""
.endif

.if ${OCAML_ARCH} == sparc64
BROKEN=	ocamlc.opt seg-faults on ${ARCH}, please try to fix
.endif

post-extract:
.if ${OCAML_ARCH} == power
	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S

		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
		${WRKSRC}/configure
# don't hardcode gcc for depend target
# be aware of staging
	@${REINPLACE_CMD} -E \
		-e 's|gcc|$$(CC)|' \
		-e '/^install/,/^$$/s@\$$\(((INSTALL_)?(BIN|LIB|STUBLIB|COMPLIB|MANO?|INSTALL|INSTALL_CUSTOM)DIR)\)@$$(STAGEDIR)$$(\1)@g' \
		`find ${WRKSRC} -name 'Makefile*'`
.if ${PORT_OPTIONS:MTK}
	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|' \
		${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl

# user's umask(1)
	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
		-e 's,\$$\(ARCH\),${OCAML_ARCH},g'	\
		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \

	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report

post-install:
#	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/ocaml/expunge
.if ${PORT_OPTIONS:MTK}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	@(cd ${WRKSRC}/otherlibs/labltk && \
		${COPYTREE_SHARE} examples_labltk ${STAGEDIR}${EXAMPLESDIR} \
		"! -name .ignore" && \
		${COPYTREE_SHARE} examples_camltk ${STAGEDIR}${EXAMPLESDIR} \
		"! -name .ignore")
.endif
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
.endif

.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${DOCSDIR}
	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR})
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR}
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR}
.endif

.for PROG in camlp4o.opt camlp4of.opt camlp4oof.opt camlp4orf.opt \
	camlp4r.opt camlp4rf.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
	ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
	@${STRIP_CMD} ${PREFIX}/bin/${PROG}
.endfor

# Fix permissions for ld.conf
	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf

# Do we want .opt version of tools to be the default ?
.if ${PORT_OPTIONS:MOPT_DEF}
. for module in ${MODOPT}
#	First, we save bytecode version
	@${MV} ${STAGEDIR}${PREFIX}/bin/${module} ${STAGEDIR}${PREFIX}/bin/${module}.byte

#	Next make .opt version be the default one (via link)
	@${LN} ${STAGEDIR}${PREFIX}/bin/${module}.opt ${STAGEDIR}${PREFIX}/bin/${module}
	@${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST}
	@${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST}
. endfor

Lines 1-8 Link Here

(-)b/ocaml/distinfo (-8 / +8 lines)
1	SHA256 (ocaml-4.00.1.tar.bz2) = 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951	1	SHA256 (ocaml-4.01.0.tar.bz2) = b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a
2	SIZE (ocaml-4.00.1.tar.bz2) = 2762205	2	SIZE (ocaml-4.01.0.tar.bz2) = 3691090
3	SHA256 (ocaml-4.00-refman-html.tar.gz) = 8ca43859d8a71f0941a2453b7b808d7e58ad54804a9cf285875fa30e6576b31a	3	SHA256 (ocaml-4.01-refman-html.tar.gz) = 01019c8f8a29a8a7f422e090704b666ade2a007d57ea9412285f88f716656001
4	SIZE (ocaml-4.00-refman-html.tar.gz) = 549757	4	SIZE (ocaml-4.01-refman-html.tar.gz) = 571422
5	SHA256 (ocaml-4.00-refman.ps.gz) = 6146264fef7ae73f7ebb8dc49a3b1adae9d5bd4f9a14a2670c9d43f7e6a253c3	5	SHA256 (ocaml-4.01-refman.ps.gz) = 4de67ef967b8b39a6f030df258087239d6f7dee869a3973d7a782b7986b809c6
6	SIZE (ocaml-4.00-refman.ps.gz) = 1075658	6	SIZE (ocaml-4.01-refman.ps.gz) = 1089703
7	SHA256 (ocaml-4.00-refman.pdf) = 76ba2cf60a605b2427f995563f6dc6c7dbb39be6b066f6d96b23926e8cc9babc	7	SHA256 (ocaml-4.01-refman.pdf) = 389e434f534153530ba234299d0f3a0e4271d18b091b9216e4a37335ebd33424
8	SIZE (ocaml-4.00-refman.pdf) = 1453678	8	SIZE (ocaml-4.01-refman.pdf) = 1478900




--- Makefile.orig	2013-06-17 15:15:18.000000000 +0200
+++ Makefile	2014-04-01 08:23:13.000000000 +0200
@@ -298,7 +298,7 @@
 	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
 	   else :; fi
 	cp config/Makefile $(LIBDIR)/Makefile.config
-	BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
+	BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) PREFIX=$(PREFIX) \
 	  ./build/partial-install.sh
 
 # Installation of the native-code compiler
@@ -318,14 +318,14 @@
 	cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
 	cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
 	cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
+	$(RANLIB) compilerlibs/ocamlcommon.a compilerlibs/ocamlbytecomp.a \
+		compilerlibs/ocamloptcomp.a
 	cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
 	   compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
 	   compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
 	   $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
 	   $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
 	   $(COMPLIBDIR)
-	cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
-	   ocamloptcomp.a
 
 clean:: partialclean
 




--- asmrun/Makefile.orig	2013-06-24 10:16:27.000000000 +0200
+++ asmrun/Makefile	2014-04-01 07:12:29.000000000 +0200
@@ -64,14 +64,12 @@
 
 install-default:
 	cp libasmrun.a $(LIBDIR)/libasmrun.a
-	cd $(LIBDIR); $(RANLIB) libasmrun.a
 
 install-noruntimed:
 .PHONY: install-noruntimed
 
 install-runtimed:
 	cp libasmrund.a $(LIBDIR)/libasmrund.a
-	cd $(LIBDIR); $(RANLIB) libasmrund.a
 .PHONY: install-runtimed
 
 install-noprof:
@@ -79,7 +77,6 @@
 
 install-prof:
 	cp libasmrunp.a $(LIBDIR)/libasmrunp.a
-	cd $(LIBDIR); $(RANLIB) libasmrunp.a
 
 power-bsd_elf.S: power-elf.S
 	cp power-elf.S power-bsd_elf.S

Added Link Here

(-)b/ocaml/files/patch-byterun-Makefile.common (+10 lines)
1	--- byterun/Makefile.common.orig 2014-04-01 07:13:45.000000000 +0200
2	+++ byterun/Makefile.common 2014-04-01 07:13:58.000000000 +0200
3	@@ -51,7 +51,6 @@
4	install::
5	cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
6	cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A)
7	- cd $(LIBDIR); $(RANLIB) libcamlrun.$(A)
8	if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
9	for i in $(PUBLIC_INCLUDES); do \
10	sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \




--- configure.orig	2013-08-23 02:22:36.000000000 -0400
+++ configure	2013-11-21 06:25:38.000000000 -0500
@@ -695,6 +695,7 @@
         withcurses=no;;
     -no-shared-libs|--no-shared-libs)
         withsharedlibs=no;;
+    -no-x11|--no-x11)
+        x11_wanted=no;;
     -x11include*|--x11include*)
         x11_include_dir=$2; shift;;
     -x11lib*|--x11lib*)
@@ -537,9 +539,9 @@ if test $withsharedlibs = "yes"; then
       mksharedlib="$flexlink"
       mkmaindll="$flexlink -maindll"
       shared_libraries_supported=true;;
-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
+    *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
       sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared"
+      mksharedlib="$bytecc $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       byteccrpath="-Wl,-rpath,"
       mksharedlibrpath="-Wl,-rpath,"
@@ -549,7 +551,7 @@ if test $withsharedlibs = "yes"; then
       case "$bytecc" in
         gcc*)
           sharedcccompopts="-fPIC"
-          mksharedlib="$bytecc -shared"
+          mksharedlib="$bytecc $bytecclinkopts -shared"
           byteccrpath="-Wl,-rpath,"
           mksharedlibrpath="-Wl,-rpath,"
           shared_libraries_supported=true;;
@@ -565,11 +567,11 @@ if test $withsharedlibs = "yes"; then
         gcc*)
           sharedcccompopts="-fPIC"
           if sh ./solaris-ld; then
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts -shared"
             byteccrpath="-R"
             mksharedlibrpath="-R"
           else
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts -shared"
             bytecclinkopts="$bytecclinkopts -Wl,-E"
             natdynlinkopts="-Wl,-E"
             byteccrpath="-Wl,-rpath,"
@@ -593,12 +595,12 @@ if test $withsharedlibs = "yes"; then
       mksharedlibrpath="-rpath "
       shared_libraries_supported=true;;
     i[3456]86-*-darwin[89].*)
-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
       bytecccompopts="$dl_defs $bytecccompopts"
       dl_needs_underscore=false
       shared_libraries_supported=true;;
     *-apple-darwin*)
-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress"
+      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress"
       bytecccompopts="$dl_defs $bytecccompopts"
       dl_needs_underscore=false
       shared_libraries_supported=true;;
@@ -608,7 +610,7 @@ if test $withsharedlibs = "yes"; then
       shared_libraries_supported=false;;
     *-*-openbsd*)
       sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared"
+      mksharedlib="$bytecc $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       natdynlinkopts="-Wl,-E"
       byteccrpath="-Wl,-rpath,"
@@ -633,7 +635,7 @@ if test $withsharedlibs = "yes"; then
     x86_64-*-linux*)              natdynlink=true;;
     i[3456]86-*-darwin[89].*)     natdynlink=true;;
     i[3456]86-*-darwin*)
-      if test $arch64 == true; then
+      if test $arch64 = true; then
         natdynlink=true
       fi;;
     x86_64-*-darwin*)             natdynlink=true;;
@@ -641,6 +643,8 @@ if test $withsharedlibs = "yes"; then
     sparc*-*-linux*)              natdynlink=true;;
     i686-*-kfreebsd*)             natdynlink=true;;
     x86_64-*-kfreebsd*)           natdynlink=true;;
+    i[345]86-*-dragonfly*)        natdynlink=true;;
+    x86_64-*-dragonfly*)          natdynlink=true;;
     i[345]86-*-freebsd*)          natdynlink=true;;
     x86_64-*-freebsd*)            natdynlink=true;;
     i[345]86-*-openbsd*)          natdynlink=true;;
@@ -672,6 +676,7 @@ case "$host" in
   sparc*-*-gnu*)                arch=sparc; system=gnu;;
   i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
   i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
+  i[3456]86-*-dragonfly*)       arch=i386; system=bsd_`sh ./runtest elf.c`;;
   i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
   i[3456]86-*-solaris*)         if $arch64; then
                                   arch=amd64; system=solaris
@@ -687,6 +692,7 @@ case "$host" in
                                 fi;;
   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
+  powerpc*-*-freebsd*)          arch=power; model=ppc; system=elf;;
   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
   powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
@@ -803,6 +804,7 @@
@@ -700,6 +706,7 @@ case "$host" in
   arm*-*-linux-gnueabi)         arch=arm; system=linux_eabi;;
   x86_64-*-linux*)              arch=amd64; system=linux;;
   x86_64-*-gnu*)                arch=amd64; system=gnu;;
+  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
@@ -724,7 +731,7 @@ else
 fi
 
 nativecccompopts=''
-nativecclinkopts=''
+nativecclinkopts=""
 nativeccrpath="$byteccrpath"
 
 case "$arch,$nativecc,$system,$host_type" in
@@ -786,6 +793,8 @@ case "$arch,$model,$system" in
   amd64,*,linux) profiling='prof';;
   amd64,*,gnu) profiling='prof';;
   arm,*,linux*) profiling='prof';;
+  *,*,dragonfly) profiling='prof';;
+  *,*,freebsd) profiling='prof';;
   *) profiling='noprof';;
 esac
 
@@ -1544,10 +1553,10 @@ fi
 # Look for BFD library
 
 if ./hasgot -i bfd.h && \
-   ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
+   ./hasgot -lbfd $dllib -liberty -lz bfd_openr; then
   echo "BFD library found."
   echo "#define HAS_LIBBFD" >> s.h
-  echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
+  echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
 else
   echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
   echo "LIBBFD_LINK=" >> Makefile




--- otherlibs/Makefile.shared.orig	2013-07-23 16:48:47.000000000 +0200
+++ otherlibs/Makefile.shared	2014-04-01 07:24:57.000000000 +0200
@@ -59,14 +59,14 @@
 install::
 	if test -f dll$(CLIBNAME)$(EXT_DLL); then \
 	  cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
+	$(RANLIB) lib$(CLIBNAME).$(A)
 	cp lib$(CLIBNAME).$(A) $(LIBDIR)/
-	cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
 	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
 	if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
 
 installopt:
+	$(RANLIB) $(LIBNAME).a
 	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
-	cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
 	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
 
 partialclean:




--- otherlibs/dynlink/Makefile.orig	2013-07-23 16:48:47.000000000 +0200
+++ otherlibs/dynlink/Makefile	2014-04-01 07:44:36.000000000 +0200
@@ -71,8 +71,8 @@
 
 installopt:
 	if $(NATDYNLINK); then \
-	  cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \
-	  cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \
+	  $(RANLIB) dynlink.$(A); \
+	  cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR); \
 	fi
 
 partialclean:

Added Link Here

(-)b/ocaml/files/patch-otherlibs-labltk-lib-Makefile (+11 lines)
1	--- otherlibs/labltk/lib/Makefile.orig 2012-09-30 14:31:27.000000000 +0200
2	+++ otherlibs/labltk/lib/Makefile 2014-04-01 07:22:17.000000000 +0200
3	@@ -99,7 +99,7 @@
4
5	installopt:
6	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
7	+ $(RANLIB) $(LIBNAME).$(A)
8	cp $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR)
9	- cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A)
10	chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
11	chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A)




--- otherlibs/labltk/support/Makefile.orig	2012-07-17 17:31:12.000000000 +0200
+++ otherlibs/labltk/support/Makefile	2014-04-01 07:23:59.000000000 +0200
@@ -43,8 +43,8 @@
 
 install:
 	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+	$(RANLIB) lib$(LIBNAME).$(A)
 	cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
-	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
 	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
 	if test -f dll$(LIBNAME)$(EXT_DLL); then \
 	   cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi




--- otherlibs/systhreads/Makefile.orig	2013-07-23 16:48:47.000000000 +0200
+++ otherlibs/systhreads/Makefile	2014-04-01 07:26:11.000000000 +0200
@@ -71,8 +71,8 @@
 
 install:
 	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
+	$(RANLIB) libthreads.a
 	cp libthreads.a $(LIBDIR)/libthreads.a
-	cd $(LIBDIR); $(RANLIB) libthreads.a
 	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
 	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
 	rm -f $(LIBDIR)/threads/stdlib.cma
@@ -80,10 +80,10 @@
 	cp threads.h $(LIBDIR)/caml/threads.h
 
 installopt:
+	$(RANLIB) libthreadsnat.a
 	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
-	cd $(LIBDIR); $(RANLIB) libthreadsnat.a
+	$(RANLIB) threads.a
 	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads
-	cd $(LIBDIR)/threads; $(RANLIB) threads.a
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
 




--- otherlibs/threads/Makefile.orig	2013-07-23 16:48:47.000000000 +0200
+++ otherlibs/threads/Makefile	2014-04-01 07:27:02.000000000 +0200
@@ -98,8 +98,8 @@
 install:
 	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
 	mkdir -p $(LIBDIR)/vmthreads
+	$(RANLIB) libvmthreads.a
 	cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
-	cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
 	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
 	   threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
 	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \




--- stdlib/Makefile.orig	2012-10-15 19:50:56.000000000 +0200
+++ stdlib/Makefile	2014-04-01 07:27:40.000000000 +0200
@@ -23,8 +23,8 @@
 installopt: installopt-default installopt-$(PROFILING)
 
 installopt-default:
+	$(RANLIB) stdlib.a
 	cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR)
-	cd $(LIBDIR); $(RANLIB) stdlib.a
 
 installopt-noprof:
 	rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa
@@ -34,8 +34,8 @@
 	rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
 
 installopt-prof:
+	$(RANLIB) stdlib.p.a
 	cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
-	cd $(LIBDIR); $(RANLIB) stdlib.p.a
 
 stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
 	$(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)

Removed Link Here

(-)a/ocaml/files/patch-testsuite-backtrace-Makefile (-11 lines)
1	--- testsuite/tests/backtrace/Makefile.orig 2012-11-01 20:28:23.000000000 +0100
2	+++ testsuite/tests/backtrace/Makefile 2012-11-01 20:28:30.000000000 +0100
3	@@ -6,7 +6,7 @@
4	$(OCAMLC) -g -o $(EXECNAME) $$file; \
5	for arg in a b c d ''; do \
6	printf " ... testing '$$file' (with argument '$$arg'):"; \
7	- OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg > `basename $$file ml`$$arg.result 2>&1; \
8	+ sh -c "OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg; true" > `basename $$file ml`$$arg.result 2>&1; \
9	$(DIFF) `basename $$file ml`$$arg.reference `basename $$file ml`$$arg.result > /dev/null && echo " => passed" \|\| (echo " => failed" && exit 1); \
10	done; \
11	done




bin/camlp4r.opt
bin/camlp4rf
bin/camlp4rf.opt
bin/labltk
bin/mkcamlp4
bin/ocaml
bin/ocamlbrowser
bin/ocamlbuild
bin/ocamlbuild.byte
bin/ocamlbuild.native

lib/ocaml/caml/printexc.h
lib/ocaml/caml/signals.h
lib/ocaml/caml/socketaddr.h
lib/ocaml/caml/threads.h
lib/ocaml/caml/unixsupport.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur

lib/ocaml/camlp4/Camlp4Top/Rprint.o
lib/ocaml/camlp4/Camlp4Top/Top.cmi
lib/ocaml/camlp4/Camlp4Top/Top.cmo
%%PROF%%lib/ocaml/camlp4/Camlp4Top/Top.cmx
lib/ocaml/camlp4/Camlp4Top/Top.o
lib/ocaml/camlp4/Camlp4_config.cmi
lib/ocaml/camlp4/Camlp4_import.cmi

lib/ocaml/compiler-libs/asmlibrarian.cmi
lib/ocaml/compiler-libs/asmlink.cmi
lib/ocaml/compiler-libs/asmpackager.cmi
lib/ocaml/compiler-libs/ast_mapper.cmi
lib/ocaml/compiler-libs/asttypes.cmi
lib/ocaml/compiler-libs/btype.cmi
lib/ocaml/compiler-libs/bytegen.cmi

lib/ocaml/compiler-libs/cmx_format.cmi
lib/ocaml/compiler-libs/coloring.cmi
lib/ocaml/compiler-libs/comballoc.cmi
lib/ocaml/compiler-libs/compenv.cmi
lib/ocaml/compiler-libs/compile.cmi
lib/ocaml/compiler-libs/compilenv.cmi
lib/ocaml/compiler-libs/compmisc.cmi
lib/ocaml/compiler-libs/config.cmi
lib/ocaml/compiler-libs/consistbl.cmi
lib/ocaml/compiler-libs/ctype.cmi

lib/ocaml/compiler-libs/emitaux.cmi
lib/ocaml/compiler-libs/emitcode.cmi
lib/ocaml/compiler-libs/env.cmi
lib/ocaml/compiler-libs/envaux.cmi
lib/ocaml/compiler-libs/errors.cmi
lib/ocaml/compiler-libs/expunge.cmi
lib/ocaml/compiler-libs/genprintval.cmi

lib/ocaml/compiler-libs/parsetree.cmi
lib/ocaml/compiler-libs/path.cmi
lib/ocaml/compiler-libs/pparse.cmi
lib/ocaml/compiler-libs/pprintast.cmi
lib/ocaml/compiler-libs/predef.cmi
lib/ocaml/compiler-libs/primitive.cmi
lib/ocaml/compiler-libs/printast.cmi

lib/ocaml/compiler-libs/typecore.cmi
lib/ocaml/compiler-libs/typedecl.cmi
lib/ocaml/compiler-libs/typedtree.cmi
lib/ocaml/compiler-libs/typedtreeIter.cmi
lib/ocaml/compiler-libs/typedtreeMap.cmi
lib/ocaml/compiler-libs/typemod.cmi
lib/ocaml/compiler-libs/typeopt.cmi
lib/ocaml/compiler-libs/types.cmi

lib/ocaml/complex.ml
lib/ocaml/complex.mli
%%PROF%%lib/ocaml/complex.p.cmx
lib/ocaml/condition.mli
lib/ocaml/digest.cmi
lib/ocaml/digest.cmx
lib/ocaml/digest.ml

lib/ocaml/dynlink.cmx
lib/ocaml/dynlink.cmxa
lib/ocaml/dynlink.mli
lib/ocaml/event.mli
lib/ocaml/expunge
lib/ocaml/extract_crc
lib/ocaml/filename.cmi

lib/ocaml/int64.mli
%%PROF%%lib/ocaml/int64.p.cmx
lib/ocaml/int_misc.cmx
lib/ocaml/labltk/balloon.cmi
lib/ocaml/labltk/balloon.cmx
lib/ocaml/labltk/balloon.mli
lib/ocaml/labltk/bell.cmi
lib/ocaml/labltk/bell.cmx
lib/ocaml/labltk/bell.mli
lib/ocaml/labltk/button.cmi
lib/ocaml/labltk/button.cmx
lib/ocaml/labltk/button.mli
lib/ocaml/labltk/cBell.cmi
lib/ocaml/labltk/cBell.cmx
lib/ocaml/labltk/cBell.mli
lib/ocaml/labltk/cButton.cmi
lib/ocaml/labltk/cButton.cmx
lib/ocaml/labltk/cButton.mli
lib/ocaml/labltk/cCanvas.cmi
lib/ocaml/labltk/cCanvas.cmx
lib/ocaml/labltk/cCanvas.mli
lib/ocaml/labltk/cCheckbutton.cmi
lib/ocaml/labltk/cCheckbutton.cmx
lib/ocaml/labltk/cCheckbutton.mli
lib/ocaml/labltk/cClipboard.cmi
lib/ocaml/labltk/cClipboard.cmx
lib/ocaml/labltk/cClipboard.mli
lib/ocaml/labltk/cDialog.cmi
lib/ocaml/labltk/cDialog.cmx
lib/ocaml/labltk/cDialog.mli
lib/ocaml/labltk/cEncoding.cmi
lib/ocaml/labltk/cEncoding.cmx
lib/ocaml/labltk/cEncoding.mli
lib/ocaml/labltk/cEntry.cmi
lib/ocaml/labltk/cEntry.cmx
lib/ocaml/labltk/cEntry.mli
lib/ocaml/labltk/cFocus.cmi
lib/ocaml/labltk/cFocus.cmx
lib/ocaml/labltk/cFocus.mli
lib/ocaml/labltk/cFont.cmi
lib/ocaml/labltk/cFont.cmx
lib/ocaml/labltk/cFont.mli
lib/ocaml/labltk/cFrame.cmi
lib/ocaml/labltk/cFrame.cmx
lib/ocaml/labltk/cFrame.mli
lib/ocaml/labltk/cGrab.cmi
lib/ocaml/labltk/cGrab.cmx
lib/ocaml/labltk/cGrab.mli
lib/ocaml/labltk/cGrid.cmi
lib/ocaml/labltk/cGrid.cmx
lib/ocaml/labltk/cGrid.mli
lib/ocaml/labltk/cImage.cmi
lib/ocaml/labltk/cImage.cmx
lib/ocaml/labltk/cImage.mli
lib/ocaml/labltk/cImagebitmap.cmi
%%PROF%%lib/ocaml/labltk/cImagebitmap.cmx
lib/ocaml/labltk/cImagebitmap.mli
lib/ocaml/labltk/cImagephoto.cmi
lib/ocaml/labltk/cImagephoto.cmx
lib/ocaml/labltk/cImagephoto.mli
lib/ocaml/labltk/cLabel.cmi
lib/ocaml/labltk/cLabel.cmx
lib/ocaml/labltk/cLabel.mli
lib/ocaml/labltk/cListbox.cmi
lib/ocaml/labltk/cListbox.cmx
lib/ocaml/labltk/cListbox.mli
lib/ocaml/labltk/cMenu.cmi
lib/ocaml/labltk/cMenu.cmx
lib/ocaml/labltk/cMenu.mli
lib/ocaml/labltk/cMenubutton.cmi
lib/ocaml/labltk/cMenubutton.cmx
lib/ocaml/labltk/cMenubutton.mli
lib/ocaml/labltk/cMessage.cmi
lib/ocaml/labltk/cMessage.cmx
lib/ocaml/labltk/cMessage.mli
lib/ocaml/labltk/cOption.cmi
lib/ocaml/labltk/cOption.cmx
lib/ocaml/labltk/cOption.mli
lib/ocaml/labltk/cOptionmenu.cmi
lib/ocaml/labltk/cOptionmenu.cmx
lib/ocaml/labltk/cOptionmenu.mli
lib/ocaml/labltk/cPack.cmi
lib/ocaml/labltk/cPack.cmx
lib/ocaml/labltk/cPack.mli
lib/ocaml/labltk/cPalette.cmi
lib/ocaml/labltk/cPalette.cmx
lib/ocaml/labltk/cPalette.mli
lib/ocaml/labltk/cPixmap.cmi
%%PROF%%lib/ocaml/labltk/cPixmap.cmx
lib/ocaml/labltk/cPixmap.mli
lib/ocaml/labltk/cPlace.cmi
lib/ocaml/labltk/cPlace.cmx
lib/ocaml/labltk/cPlace.mli
lib/ocaml/labltk/cRadiobutton.cmi
lib/ocaml/labltk/cRadiobutton.cmx
lib/ocaml/labltk/cRadiobutton.mli
lib/ocaml/labltk/cResource.cmi
lib/ocaml/labltk/cResource.cmx
lib/ocaml/labltk/cResource.mli
lib/ocaml/labltk/cScale.cmi
lib/ocaml/labltk/cScale.cmx
lib/ocaml/labltk/cScale.mli
lib/ocaml/labltk/cScrollbar.cmi
lib/ocaml/labltk/cScrollbar.cmx
lib/ocaml/labltk/cScrollbar.mli
lib/ocaml/labltk/cSelection.cmi
lib/ocaml/labltk/cSelection.cmx
lib/ocaml/labltk/cSelection.mli
lib/ocaml/labltk/cText.cmi
lib/ocaml/labltk/cText.cmx
lib/ocaml/labltk/cText.mli
lib/ocaml/labltk/cTk.cmi
lib/ocaml/labltk/cTk.cmx
lib/ocaml/labltk/cTkvars.cmi
lib/ocaml/labltk/cTkvars.cmx
lib/ocaml/labltk/cTkvars.mli
lib/ocaml/labltk/cTkwait.cmi
lib/ocaml/labltk/cTkwait.cmx
lib/ocaml/labltk/cTkwait.mli
lib/ocaml/labltk/cToplevel.cmi
lib/ocaml/labltk/cToplevel.cmx
lib/ocaml/labltk/cToplevel.mli
lib/ocaml/labltk/cWinfo.cmi
lib/ocaml/labltk/cWinfo.cmx
lib/ocaml/labltk/cWinfo.mli
lib/ocaml/labltk/cWm.cmi
lib/ocaml/labltk/cWm.cmx
lib/ocaml/labltk/cWm.mli
lib/ocaml/labltk/camltk.cmi
lib/ocaml/labltk/camltk.cmx
lib/ocaml/labltk/canvas.cmi
lib/ocaml/labltk/canvas.cmx
lib/ocaml/labltk/canvas.mli
lib/ocaml/labltk/checkbutton.cmi
lib/ocaml/labltk/checkbutton.cmx
lib/ocaml/labltk/checkbutton.mli
lib/ocaml/labltk/clipboard.cmi
lib/ocaml/labltk/clipboard.cmx
lib/ocaml/labltk/clipboard.mli
lib/ocaml/labltk/dialog.cmi
lib/ocaml/labltk/dialog.cmx
lib/ocaml/labltk/dialog.mli
lib/ocaml/labltk/encoding.cmi
lib/ocaml/labltk/encoding.cmx
lib/ocaml/labltk/encoding.mli
lib/ocaml/labltk/entry.cmi
lib/ocaml/labltk/entry.cmx
lib/ocaml/labltk/entry.mli
lib/ocaml/labltk/fileevent.cmi
lib/ocaml/labltk/fileevent.cmx
lib/ocaml/labltk/fileevent.mli
lib/ocaml/labltk/fileselect.cmi
lib/ocaml/labltk/fileselect.cmx
lib/ocaml/labltk/fileselect.mli
lib/ocaml/labltk/focus.cmi
lib/ocaml/labltk/focus.cmx
lib/ocaml/labltk/focus.mli
lib/ocaml/labltk/font.cmi
lib/ocaml/labltk/font.cmx
lib/ocaml/labltk/font.mli
lib/ocaml/labltk/frame.cmi
lib/ocaml/labltk/frame.cmx
lib/ocaml/labltk/frame.mli
lib/ocaml/labltk/frx_after.cmi
lib/ocaml/labltk/frx_after.mli
lib/ocaml/labltk/frx_color.cmi
lib/ocaml/labltk/frx_color.mli
lib/ocaml/labltk/frx_ctext.cmi
lib/ocaml/labltk/frx_ctext.mli
lib/ocaml/labltk/frx_dialog.cmi
lib/ocaml/labltk/frx_dialog.mli
lib/ocaml/labltk/frx_entry.cmi
lib/ocaml/labltk/frx_entry.mli
lib/ocaml/labltk/frx_fillbox.cmi
lib/ocaml/labltk/frx_fillbox.mli
lib/ocaml/labltk/frx_fit.cmi
lib/ocaml/labltk/frx_fit.mli
lib/ocaml/labltk/frx_focus.cmi
lib/ocaml/labltk/frx_focus.mli
lib/ocaml/labltk/frx_font.cmi
lib/ocaml/labltk/frx_font.mli
lib/ocaml/labltk/frx_lbutton.mli
lib/ocaml/labltk/frx_listbox.cmi
lib/ocaml/labltk/frx_listbox.mli
lib/ocaml/labltk/frx_mem.cmi
lib/ocaml/labltk/frx_mem.mli
lib/ocaml/labltk/frx_misc.cmi
lib/ocaml/labltk/frx_misc.mli
lib/ocaml/labltk/frx_req.cmi
lib/ocaml/labltk/frx_req.mli
lib/ocaml/labltk/frx_rpc.cmi
lib/ocaml/labltk/frx_rpc.mli
lib/ocaml/labltk/frx_selection.cmi
lib/ocaml/labltk/frx_selection.mli
lib/ocaml/labltk/frx_synth.cmi
lib/ocaml/labltk/frx_synth.mli
lib/ocaml/labltk/frx_text.cmi
lib/ocaml/labltk/frx_text.mli
lib/ocaml/labltk/frx_toplevel.mli
lib/ocaml/labltk/frx_widget.cmi
lib/ocaml/labltk/frx_widget.mli
lib/ocaml/labltk/frxlib.a
lib/ocaml/labltk/frxlib.cma
lib/ocaml/labltk/frxlib.cmxa
lib/ocaml/labltk/grab.cmi
lib/ocaml/labltk/grab.cmx
lib/ocaml/labltk/grab.mli
lib/ocaml/labltk/grid.cmi
lib/ocaml/labltk/grid.cmx
lib/ocaml/labltk/grid.mli
lib/ocaml/labltk/image.cmi
lib/ocaml/labltk/image.cmx
lib/ocaml/labltk/image.mli
lib/ocaml/labltk/imagebitmap.cmi
%%PROF%%lib/ocaml/labltk/imagebitmap.cmx
lib/ocaml/labltk/imagebitmap.mli
lib/ocaml/labltk/imagephoto.cmi
lib/ocaml/labltk/imagephoto.cmx
lib/ocaml/labltk/imagephoto.mli
lib/ocaml/labltk/jpf_font.cmi
lib/ocaml/labltk/jpf_font.cmx
lib/ocaml/labltk/jpf_font.mli
lib/ocaml/labltk/jpflib.a
lib/ocaml/labltk/jpflib.cma
lib/ocaml/labltk/jpflib.cmxa
lib/ocaml/labltk/label.cmi
lib/ocaml/labltk/label.cmx
lib/ocaml/labltk/label.mli
lib/ocaml/labltk/labltk.a
lib/ocaml/labltk/labltk.cma
lib/ocaml/labltk/labltk.cmi
lib/ocaml/labltk/labltk.cmx
lib/ocaml/labltk/labltk.cmxa
lib/ocaml/labltk/labltktop
lib/ocaml/labltk/liblabltk.a
lib/ocaml/labltk/listbox.cmi
lib/ocaml/labltk/listbox.cmx
lib/ocaml/labltk/listbox.mli
lib/ocaml/labltk/menu.cmi
lib/ocaml/labltk/menu.cmx
lib/ocaml/labltk/menu.mli
lib/ocaml/labltk/menubutton.cmi
lib/ocaml/labltk/menubutton.cmx
lib/ocaml/labltk/menubutton.mli
lib/ocaml/labltk/message.cmi
lib/ocaml/labltk/message.cmx
lib/ocaml/labltk/message.mli
lib/ocaml/labltk/option.cmi
lib/ocaml/labltk/option.cmx
lib/ocaml/labltk/option.mli
lib/ocaml/labltk/optionmenu.cmi
lib/ocaml/labltk/optionmenu.cmx
lib/ocaml/labltk/optionmenu.mli
lib/ocaml/labltk/pack.cmi
lib/ocaml/labltk/pack.cmx
lib/ocaml/labltk/pack.mli
lib/ocaml/labltk/palette.cmi
lib/ocaml/labltk/palette.cmx
lib/ocaml/labltk/palette.mli
lib/ocaml/labltk/pixmap.cmi
%%PROF%%lib/ocaml/labltk/pixmap.cmx
lib/ocaml/labltk/pixmap.mli
lib/ocaml/labltk/place.cmi
lib/ocaml/labltk/place.cmx
lib/ocaml/labltk/place.mli
lib/ocaml/labltk/pp
lib/ocaml/labltk/protocol.cmi
lib/ocaml/labltk/protocol.cmx
lib/ocaml/labltk/protocol.mli
lib/ocaml/labltk/radiobutton.cmi
lib/ocaml/labltk/radiobutton.cmx
lib/ocaml/labltk/radiobutton.mli
lib/ocaml/labltk/rawwidget.cmi
lib/ocaml/labltk/rawwidget.cmx
lib/ocaml/labltk/rawwidget.mli
lib/ocaml/labltk/scale.cmi
lib/ocaml/labltk/scale.cmx
lib/ocaml/labltk/scale.mli
lib/ocaml/labltk/scrollbar.cmi
lib/ocaml/labltk/scrollbar.cmx
lib/ocaml/labltk/scrollbar.mli
lib/ocaml/labltk/selection.cmi
lib/ocaml/labltk/selection.cmx
lib/ocaml/labltk/selection.mli
lib/ocaml/labltk/shell.cmi
lib/ocaml/labltk/shell.cmx
lib/ocaml/labltk/shell.mli
lib/ocaml/labltk/text.cmi
lib/ocaml/labltk/text.cmx
lib/ocaml/labltk/text.mli
lib/ocaml/labltk/textvariable.cmi
lib/ocaml/labltk/textvariable.cmx
lib/ocaml/labltk/textvariable.mli
lib/ocaml/labltk/timer.cmi
lib/ocaml/labltk/timer.cmx
lib/ocaml/labltk/timer.mli
lib/ocaml/labltk/tk.cmi
lib/ocaml/labltk/tk.cmx
lib/ocaml/labltk/tkcompiler
lib/ocaml/labltk/tkthread.cmi
lib/ocaml/labltk/tkthread.cmo
lib/ocaml/labltk/tkthread.cmx
lib/ocaml/labltk/tkthread.mli
lib/ocaml/labltk/tkthread.o
lib/ocaml/labltk/tkvars.cmi
lib/ocaml/labltk/tkvars.cmx
lib/ocaml/labltk/tkvars.mli
lib/ocaml/labltk/tkwait.cmi
lib/ocaml/labltk/tkwait.cmx
lib/ocaml/labltk/tkwait.mli
lib/ocaml/labltk/toplevel.cmi
lib/ocaml/labltk/toplevel.cmx
lib/ocaml/labltk/toplevel.mli
lib/ocaml/labltk/widget.cmi
lib/ocaml/labltk/widget.cmx
lib/ocaml/labltk/widget.mli
lib/ocaml/labltk/winfo.cmi
lib/ocaml/labltk/winfo.cmx
lib/ocaml/labltk/winfo.mli
lib/ocaml/labltk/wm.cmi
lib/ocaml/labltk/wm.cmx
lib/ocaml/labltk/wm.mli
lib/ocaml/lazy.cmi
lib/ocaml/lazy.cmx
lib/ocaml/lazy.ml

lib/ocaml/libcamlstr.a
%%X11%%lib/ocaml/libgraphics.a
lib/ocaml/libnums.a
lib/ocaml/libthreads.a
lib/ocaml/libthreadsnat.a
lib/ocaml/libunix.a
lib/ocaml/list.cmi
lib/ocaml/list.cmx

lib/ocaml/listLabels.mli
%%PROF%%lib/ocaml/listLabels.p.cmx
lib/ocaml/map.cmi
%%PROF%%lib/ocaml/map.cmx
lib/ocaml/map.ml
lib/ocaml/map.mli
%%PROF%%lib/ocaml/map.p.cmx

lib/ocaml/moreLabels.ml
lib/ocaml/moreLabels.mli
%%PROF%%lib/ocaml/moreLabels.p.cmx
lib/ocaml/mutex.mli
lib/ocaml/nat.cmi
lib/ocaml/nat.cmx
lib/ocaml/nat.mli

lib/ocaml/ocamlbuild/ocamlbuildlib.a
lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
lib/ocaml/ocamldoc/custom/.keep
lib/ocaml/ocamldoc/ocamldoc.hva
lib/ocaml/ocamldoc/odoc.cmi
lib/ocaml/ocamldoc/odoc_analyse.cmi

lib/ocaml/stublibs/dllbigarray.so
lib/ocaml/stublibs/dllcamlstr.so
%%X11%%lib/ocaml/stublibs/dllgraphics.so
lib/ocaml/stublibs/dlllabltk.so
lib/ocaml/stublibs/dllnums.so
lib/ocaml/stublibs/dllthreads.so
lib/ocaml/stublibs/dllunix.so
lib/ocaml/stublibs/dllvmthreads.so
lib/ocaml/sys.cmi

lib/ocaml/sys.ml
lib/ocaml/sys.mli
%%PROF%%lib/ocaml/sys.p.cmx
lib/ocaml/thread.mli
lib/ocaml/threadUnix.mli
lib/ocaml/threads/condition.cmi
lib/ocaml/threads/condition.cmx
lib/ocaml/threads/event.cmi
lib/ocaml/threads/event.cmx
lib/ocaml/threads/mutex.cmi
lib/ocaml/threads/mutex.cmx
lib/ocaml/threads/thread.cmi
lib/ocaml/threads/thread.cmx
lib/ocaml/threads/threadUnix.cmi
lib/ocaml/threads/threadUnix.cmx
lib/ocaml/threads/threads.a
lib/ocaml/threads/threads.cma
lib/ocaml/threads/threads.cmxa
lib/ocaml/topdirs.cmi
lib/ocaml/unix.a
lib/ocaml/unix.cma

lib/ocaml/weak.ml
lib/ocaml/weak.mli
%%PROF%%lib/ocaml/weak.p.cmx
man/man1/ocamlbuild.1.gz
man/mann/Arg.3o.gz
man/mann/Array.3o.gz
man/mann/ArrayLabels.3o.gz
man/mann/Bigarray.3o.gz
man/mann/Bigarray.Array1.3o.gz
man/mann/Bigarray.Array2.3o.gz
man/mann/Bigarray.Array3.3o.gz
man/mann/Bigarray.Genarray.3o.gz
man/mann/Buffer.3o.gz
man/mann/Callback.3o.gz
man/mann/CamlinternalLazy.3o.gz
man/mann/CamlinternalMod.3o.gz
man/mann/CamlinternalOO.3o.gz
man/mann/Complex.3o.gz
man/mann/Digest.3o.gz
man/mann/Filename.3o.gz
man/mann/Format.3o.gz
man/mann/Gc.3o.gz
man/mann/Genlex.3o.gz
man/mann/Hashtbl.3o.gz
man/mann/Hashtbl.HashedType.3o.gz
man/mann/Hashtbl.Make.3o.gz
man/mann/Hashtbl.MakeSeeded.3o.gz
man/mann/Hashtbl.S.3o.gz
man/mann/Hashtbl.SeededHashedType.3o.gz
man/mann/Hashtbl.SeededS.3o.gz
man/mann/Int32.3o.gz
man/mann/Int64.3o.gz
man/mann/Lexing.3o.gz
man/mann/List.3o.gz
man/mann/ListLabels.3o.gz
man/mann/Map.3o.gz
man/mann/Map.Make.3o.gz
man/mann/Map.OrderedType.3o.gz
man/mann/Map.S.3o.gz
man/mann/Marshal.3o.gz
man/mann/MoreLabels.3o.gz
man/mann/MoreLabels.Hashtbl.3o.gz
man/mann/MoreLabels.Hashtbl.HashedType.3o.gz
man/mann/MoreLabels.Hashtbl.Make.3o.gz
man/mann/MoreLabels.Hashtbl.MakeSeeded.3o.gz
man/mann/MoreLabels.Hashtbl.S.3o.gz
man/mann/MoreLabels.Hashtbl.SeededHashedType.3o.gz
man/mann/MoreLabels.Hashtbl.SeededS.3o.gz
man/mann/MoreLabels.Map.3o.gz
man/mann/MoreLabels.Map.Make.3o.gz
man/mann/MoreLabels.Map.OrderedType.3o.gz
man/mann/MoreLabels.Map.S.3o.gz
man/mann/MoreLabels.Set.3o.gz
man/mann/MoreLabels.Set.Make.3o.gz
man/mann/MoreLabels.Set.OrderedType.3o.gz
man/mann/MoreLabels.Set.S.3o.gz
man/mann/Nativeint.3o.gz
man/mann/Num.3o.gz
man/mann/Obj.3o.gz
man/mann/Oo.3o.gz
man/mann/Parsing.3o.gz
man/mann/Pervasives.3o.gz
man/mann/Pervasives.LargeFile.3o.gz
man/mann/Printexc.3o.gz
man/mann/Printf.3o.gz
man/mann/Queue.3o.gz
man/mann/Random.3o.gz
man/mann/Random.State.3o.gz
man/mann/Scanf.3o.gz
man/mann/Scanf.Scanning.3o.gz
man/mann/Set.Make.3o.gz
man/mann/Set.OrderedType.3o.gz
man/mann/Set.S.3o.gz
man/mann/Sort.3o.gz
man/mann/Stack.3o.gz
man/mann/StdLabels.3o.gz
man/mann/StdLabels.Array.3o.gz
man/mann/StdLabels.List.3o.gz
man/mann/StdLabels.String.3o.gz
man/mann/Str.3o.gz
man/mann/Stream.3o.gz
man/mann/StringLabels.3o.gz
man/mann/Sys.3o.gz
man/mann/Unix.3o.gz
man/mann/Unix.LargeFile.3o.gz
man/mann/Weak.3o.gz
man/mann/Weak.Make.3o.gz
man/mann/Weak.S.3o.gz
@dirrmtry lib/ocaml/vmthreads
@dirrmtry lib/ocaml/threads
@dirrmtry lib/ocaml/stublibs
@dirrmtry lib/ocaml/ocamldoc
@dirrmtry lib/ocaml/ocamlbuild
@dirrmtry lib/ocaml/labltk
@dirrmtry lib/ocaml/compiler-libs
@dirrmtry lib/ocaml/camlp4/Camlp4Top
@dirrmtry lib/ocaml/camlp4/Camlp4Printers
@dirrmtry lib/ocaml/camlp4/Camlp4Parsers
@dirrmtry lib/ocaml/camlp4/Camlp4Filters
@dirrmtry lib/ocaml/camlp4
@dirrmtry lib/ocaml/caml
@dirrmtry lib/ocaml

Return to bug 188158

Lines 1-16 Link Here

(-)b/ocaml/Makefile (-38 / +38 lines)
1	# Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>	1	# Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
2	# $FreeBSD: head/lang/ocaml/Makefile 349300 2014-03-26 21:58:06Z marino $	2	# $FreeBSD$
3		3
4	PORTNAME= ocaml	4	PORTNAME= ocaml
5	PORTVERSION= 4.00.1	5	PORTVERSION= 4.01.0
6	PORTREVISION= 1
7	CATEGORIES= lang	6	CATEGORIES= lang
8	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \	7	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
9	${MASTER_SITE_GENTOO}	8	${MASTER_SITE_GENTOO}
10	MASTER_SITE_SUBDIR= distfiles	9	MASTER_SITE_SUBDIR= distfiles
11	PKGNAMESUFFIX= ${SFX}	10	PKGNAMESUFFIX= ${SFX}
12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	11	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
13	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	12	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14		13
15	MAINTAINER= michipili@gmail.com	14	MAINTAINER= michipili@gmail.com
16	COMMENT= The Objective Caml compiler and programming environment	15	COMMENT= The Objective Caml compiler and programming environment
Lines 29-34 STRIP= Link Here
29	SSP_UNSAFE= yes	28	SSP_UNSAFE= yes
30	MAKE_JOBS_UNSAFE= yes	29	MAKE_JOBS_UNSAFE= yes
31		30
		31	MAKE_ENV+= STAGEDIR="${STAGEDIR}"
32	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \	32	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \
33	-cc "${CC} ${CFLAGS}" \	33	-cc "${CC} ${CFLAGS}" \
34	-as "${AS} ${ASFLAGS}" \	34	-as "${AS} ${ASFLAGS}" \
Lines 37-42 CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ Link Here
37		37
38	OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS	38	OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS
39	OPTIONS_DEFAULT=X11 TK THREADS	39	OPTIONS_DEFAULT=X11 TK THREADS
		40	OPT_DEF_DESC= Use system-optimized binaries by default
40	TK_DESC= LablTk library (requires X11 support)	41	TK_DESC= LablTk library (requires X11 support)
41	CMP_LIB_DESC= Install compiler libraries	42	CMP_LIB_DESC= Install compiler libraries
42	OPT_DEF_DESC= Use system-optimizes binaries by default	43	OPT_DEF_DESC= Use system-optimizes binaries by default
Lines 45-59 PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz \ Link Here
45		46
46	MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt	47	MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
47	PATTERN= [[:space:]](do\|then)?[[:space:]])(\$$\(CP\)\|cp)([[:space:]]	48	PATTERN= [[:space:]](do\|then)?[[:space:]])(\$$\(CP\)\|cp)([[:space:]]
48	DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}	49	DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
		50
		51	CONFLICTS= metaocaml-[0-9]*
49		52
50	NO_STAGE= yes
51	.include <bsd.port.options.mk>	53	.include <bsd.port.options.mk>
52		54
53	.if ${PORT_OPTIONS:MDOCS}	55	.if ${PORT_OPTIONS:MDOCS}
54	DISTFILES+= ${DOCSDISTNAME}-refman-html.tar.gz \	56	DISTFILES+= ${DOCSDISTNAME}-refman-html.tar.gz \
55	${DOCSDISTNAME}-refman.ps.gz \	57	${DOCSDISTNAME}-refman.ps.gz \
56	${DOCSDISTNAME}-refman.pdf	58	${DOCSDISTNAME}-refman.pdf
		59	EXTRACT_ONLY+= ${DOCSDISTNAME}-refman-html.tar.gz
		60	PLIST_SUB+= DOC=""
		61	PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
		62	.else
		63	PLIST_SUB+= DOC="@comment "
57	.endif	64	.endif
58		65
59	.if ${PORT_OPTIONS:MTHREADS}	66	.if ${PORT_OPTIONS:MTHREADS}
Lines 84-90 CONFIGURE_ARGS+=-no-graph Link Here
84	PORTEXAMPLES= examples_camltk examples_labltk	91	PORTEXAMPLES= examples_camltk examples_labltk
85	.endif	92	.endif
86	. if ! ${PORT_OPTIONS:MX11}	93	. if ! ${PORT_OPTIONS:MX11}
87	IGNORE= : TK support requires X11 support	94	IGNORE=requires X11 support to build TK bindings
88	. endif	95	. endif
89	USES+= tk:84+	96	USES+= tk:84+
90	PLIST_SUB+= TK=""	97	PLIST_SUB+= TK=""
Lines 108-113 PLIST_SUB+= PROF="@comment " Link Here
108	PLIST_SUB+= PROF=""	115	PLIST_SUB+= PROF=""
109	.endif	116	.endif
110		117
		118	.if ${OCAML_ARCH} == sparc64
		119	BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix
		120	.endif
		121
111	post-extract:	122	post-extract:
112	.if ${OCAML_ARCH} == power	123	.if ${OCAML_ARCH} == power
113	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S	124	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
Lines 131-139 post-patch: Link Here
131	-e 's\|-lbfd -ldl\|-lbfd $$dllib\|' \	142	-e 's\|-lbfd -ldl\|-lbfd $$dllib\|' \
132	${WRKSRC}/configure	143	${WRKSRC}/configure
133	# don't hardcode gcc for depend target	144	# don't hardcode gcc for depend target
134	@${REINPLACE_CMD} -e 's\|gcc\|$$(CC)\|' \	145	# be aware of staging
135	${WRKSRC}/*/Makefile \	146	@${REINPLACE_CMD} -E \
136	${WRKSRC}///Makefile	147	-e 's\|gcc\|$$(CC)\|' \
		148	-e '/^install/,/^$$/s@\$$\(((INSTALL_)?(BIN\|LIB\|STUBLIB\|COMPLIB\|MANO?\|INSTALL\|INSTALL_CUSTOM)DIR)\)@$$(STAGEDIR)$$(\1)@g' \
		149	`find ${WRKSRC} -name 'Makefile*'`
137	.if ${PORT_OPTIONS:MTK}	150	.if ${PORT_OPTIONS:MTK}
138	@${REINPLACE_CMD} -e 's\|/usr/bin/wish\|${WISH}\|' \	151	@${REINPLACE_CMD} -e 's\|/usr/bin/wish\|${WISH}\|' \
139	${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl	152	${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
Lines 151-157 post-configure: Link Here
151	# user's umask(1)	164	# user's umask(1)
152	@${FIND} ${WRKDIR} -type f -name Makefile -print0 \| \	165	@${FIND} ${WRKDIR} -type f -name Makefile -print0 \| \
153	${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \	166	${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
154	-e 's,\$$\(ARCH\),${OCAML_ARCH},g' \	167	-e 's,\$$\(ARCH\),${OCAML_ARCH},g' \
155	-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \	168	-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
156	-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \	169	-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
157	-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \	170	-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
Lines 164-210 check test: install Link Here
164	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report	177	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
165		178
166	post-install:	179	post-install:
167	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep	180	# @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
168	@${CHMOD} 755 ${PREFIX}/lib/ocaml/expunge	181	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/ocaml/expunge
169	.if ${PORT_OPTIONS:MTK}	182	.if ${PORT_OPTIONS:MTK}
170	@${MKDIR} ${EXAMPLESDIR}	183	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
171	@(cd ${WRKSRC}/otherlibs/labltk && \	184	@(cd ${WRKSRC}/otherlibs/labltk && \
172	${COPYTREE_SHARE} examples_labltk ${EXAMPLESDIR} \	185	${COPYTREE_SHARE} examples_labltk ${STAGEDIR}${EXAMPLESDIR} \
173	"! -name .ignore" && \	186	"! -name .ignore" && \
174	${COPYTREE_SHARE} examples_camltk ${EXAMPLESDIR} \	187	${COPYTREE_SHARE} examples_camltk ${STAGEDIR}${EXAMPLESDIR} \
175	"! -name .ignore")	188	"! -name .ignore")
176	.endif	189	.endif
177	.if ${PORT_OPTIONS:MDOCS}	190	.if ${PORT_OPTIONS:MDOCS}
178	${MKDIR} ${DOCSDIR}	191	${MKDIR} ${STAGEDIR}${DOCSDIR}
179	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR})	192	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
180	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR}	193	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
181	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR}	194	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
182	.endif	195	.endif
183		196
184	.if ${PORT_OPTIONS:MDOCS}
185	${MKDIR} ${DOCSDIR}
186	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR})
187	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR}
188	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR}
189	.endif
190
191	.for PROG in camlp4o.opt camlp4of.opt camlp4oof.opt camlp4orf.opt \
192	camlp4r.opt camlp4rf.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
193	ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
194	@${STRIP_CMD} ${PREFIX}/bin/${PROG}
195	.endfor
196
197	# Fix permissions for ld.conf	197	# Fix permissions for ld.conf
198	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf	198	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf
199		199
200	# Do we want .opt version of tools to be the default ?	200	# Do we want .opt version of tools to be the default ?
201	.if ${PORT_OPTIONS:MOPT_DEF}	201	.if ${PORT_OPTIONS:MOPT_DEF}
202	. for module in ${MODOPT}	202	. for module in ${MODOPT}
203	# First, we save bytecode version	203	# First, we save bytecode version
204	@${MV} ${PREFIX}/bin/${module} ${PREFIX}/bin/${module}.byte	204	@${MV} ${STAGEDIR}${PREFIX}/bin/${module} ${STAGEDIR}${PREFIX}/bin/${module}.byte
205		205
206	# Next make .opt version be the default one (via link)	206	# Next make .opt version be the default one (via link)
207	@${LN} ${PREFIX}/bin/${module}.opt ${PREFIX}/bin/${module}	207	@${LN} ${STAGEDIR}${PREFIX}/bin/${module}.opt ${STAGEDIR}${PREFIX}/bin/${module}
208	@${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST}	208	@${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST}
209	@${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST}	209	@${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST}
210	. endfor	210	. endfor

Added Link Here

(-)b/ocaml/files/patch-Makefile (+28 lines)
1	--- Makefile.orig 2013-06-17 15:15:18.000000000 +0200
2	+++ Makefile 2014-04-01 08:23:13.000000000 +0200
3	@@ -298,7 +298,7 @@
4	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
5	else :; fi
6	cp config/Makefile $(LIBDIR)/Makefile.config
7	- BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
8	+ BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) PREFIX=$(PREFIX) \
9	./build/partial-install.sh
10
11	# Installation of the native-code compiler
12	@@ -318,14 +318,14 @@
13	cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
14	cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
15	cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
16	+ $(RANLIB) compilerlibs/ocamlcommon.a compilerlibs/ocamlbytecomp.a \
17	+ compilerlibs/ocamloptcomp.a
18	cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
19	compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
20	compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
21	$(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
22	$(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
23	$(COMPLIBDIR)
24	- cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
25	- ocamloptcomp.a
26
27	clean:: partialclean
28

Added Link Here

(-)b/ocaml/files/patch-asmrun-Makefile (+25 lines)
1	--- asmrun/Makefile.orig 2013-06-24 10:16:27.000000000 +0200
2	+++ asmrun/Makefile 2014-04-01 07:12:29.000000000 +0200
3	@@ -64,14 +64,12 @@
4
5	install-default:
6	cp libasmrun.a $(LIBDIR)/libasmrun.a
7	- cd $(LIBDIR); $(RANLIB) libasmrun.a
8
9	install-noruntimed:
10	.PHONY: install-noruntimed
11
12	install-runtimed:
13	cp libasmrund.a $(LIBDIR)/libasmrund.a
14	- cd $(LIBDIR); $(RANLIB) libasmrund.a
15	.PHONY: install-runtimed
16
17	install-noprof:
18	@@ -79,7 +77,6 @@
19
20	install-prof:
21	cp libasmrunp.a $(LIBDIR)/libasmrunp.a
22	- cd $(LIBDIR); $(RANLIB) libasmrunp.a
23
24	power-bsd_elf.S: power-elf.S
25	cp power-elf.S power-bsd_elf.S

Lines 1-143 Link Here

(-)b/ocaml/files/patch-configure (-131 / +6 lines)
1	--- configure.orig 2012-06-26 15:33:50.000000000 +0000	1	--- configure.orig 2013-08-23 02:22:36.000000000 -0400
2	+++ configure	2	+++ configure 2013-11-21 06:25:38.000000000 -0500
3	@@ -88,6 +88,8 @@ while : ; do	3	@@ -695,6 +695,7 @@
4	withcurses=no;;
5	-no-shared-libs\|--no-shared-libs)
6	withsharedlibs=no;;
7	+ -no-x11\|--no-x11)
8	+ x11_wanted=no;;
9	-x11include\|--x11include)
10	x11_include_dir=$2; shift;;
11	-x11lib\|--x11lib)
12	@@ -537,9 +539,9 @@ if test $withsharedlibs = "yes"; then
13	mksharedlib="$flexlink"
14	mkmaindll="$flexlink -maindll"
15	shared_libraries_supported=true;;
16	- --linux-gnu\|--linux\|--freebsd[3-9]\|--openbsd\|--netbsd\|--gnu)
17	+ --linux-gnu\|--linux\|--dragonfly\|--freebsd\|--openbsd\|--netbsd\|--gnu*)
18	sharedcccompopts="-fPIC"
19	- mksharedlib="$bytecc -shared"
20	+ mksharedlib="$bytecc $bytecclinkopts -shared"
21	bytecclinkopts="$bytecclinkopts -Wl,-E"
22	byteccrpath="-Wl,-rpath,"
23	mksharedlibrpath="-Wl,-rpath,"
24	@@ -549,7 +551,7 @@ if test $withsharedlibs = "yes"; then
25	case "$bytecc" in
26	gcc*)
27	sharedcccompopts="-fPIC"
28	- mksharedlib="$bytecc -shared"
29	+ mksharedlib="$bytecc $bytecclinkopts -shared"
30	byteccrpath="-Wl,-rpath,"
31	mksharedlibrpath="-Wl,-rpath,"
32	shared_libraries_supported=true;;
33	@@ -565,11 +567,11 @@ if test $withsharedlibs = "yes"; then
34	gcc*)
35	sharedcccompopts="-fPIC"
36	if sh ./solaris-ld; then
37	- mksharedlib="$bytecc -shared"
38	+ mksharedlib="$bytecc $bytecclinkopts -shared"
39	byteccrpath="-R"
40	mksharedlibrpath="-R"
41	else
42	- mksharedlib="$bytecc -shared"
43	+ mksharedlib="$bytecc $bytecclinkopts -shared"
44	bytecclinkopts="$bytecclinkopts -Wl,-E"
45	natdynlinkopts="-Wl,-E"
46	byteccrpath="-Wl,-rpath,"
47	@@ -593,12 +595,12 @@ if test $withsharedlibs = "yes"; then
48	mksharedlibrpath="-rpath "
49	shared_libraries_supported=true;;
50	i[3456]86--darwin[89].)
51	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
52	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
53	bytecccompopts="$dl_defs $bytecccompopts"
54	dl_needs_underscore=false
55	shared_libraries_supported=true;;
56	-apple-darwin)
57	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress"
58	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress"
59	bytecccompopts="$dl_defs $bytecccompopts"
60	dl_needs_underscore=false
61	shared_libraries_supported=true;;
62	@@ -608,7 +610,7 @@ if test $withsharedlibs = "yes"; then
63	shared_libraries_supported=false;;
64	--openbsd*)
65	sharedcccompopts="-fPIC"
66	- mksharedlib="$bytecc -shared"
67	+ mksharedlib="$bytecc $bytecclinkopts -shared"
68	bytecclinkopts="$bytecclinkopts -Wl,-E"
69	natdynlinkopts="-Wl,-E"
70	byteccrpath="-Wl,-rpath,"
71	@@ -633,7 +635,7 @@ if test $withsharedlibs = "yes"; then
72	x86_64--linux) natdynlink=true;;
73	i[3456]86--darwin[89].) natdynlink=true;;
74	i[3456]86--darwin)
75	- if test $arch64 == true; then
76	+ if test $arch64 = true; then
77	natdynlink=true
78	fi;;
79	x86_64--darwin) natdynlink=true;;
80	@@ -641,6 +643,8 @@ if test $withsharedlibs = "yes"; then
81	sparc--linux*) natdynlink=true;;
82	i686--kfreebsd) natdynlink=true;;
83	x86_64--kfreebsd) natdynlink=true;;
84	+ i[345]86--dragonfly) natdynlink=true;;
85	+ x86_64--dragonfly) natdynlink=true;;
86	i[345]86--freebsd) natdynlink=true;;
87	x86_64--freebsd) natdynlink=true;;
88	i[345]86--openbsd) natdynlink=true;;
89	@@ -672,6 +676,7 @@ case "$host" in
90	sparc--gnu*) arch=sparc; system=gnu;;
91	i[3456]86--linux) arch=i386; system=linux_`sh ./runtest elf.c`;;
92	i[3456]86--bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
93	+ i[3456]86--dragonfly) arch=i386; system=bsd_`sh ./runtest elf.c`;;
94	i[3456]86--nextstep) arch=i386; system=nextstep;;
95	i[3456]86--solaris) if $arch64; then
96	arch=amd64; system=solaris
97	@@ -687,6 +692,7 @@ case "$host" in
98	fi;;	4	fi;;
99	i[3456]86--gnu) arch=i386; system=gnu;;	5	i[3456]86--gnu) arch=i386; system=gnu;;
100	powerpc--linux*) arch=power; model=ppc; system=elf;;	6	powerpc--linux*) arch=power; model=ppc; system=elf;;
101	+ powerpc--freebsd) arch=power; model=ppc; system=elf;;	7	+ powerpc--freebsd*) arch=power; model=ppc; system=elf;;
102	powerpc--netbsd) arch=power; model=ppc; system=elf;;	8	powerpc--netbsd) arch=power; model=ppc; system=elf;;
		9	powerpc--openbsd) arch=power; model=ppc; system=bsd_elf;;
103	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;	10	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;
104	powerpc--darwin) arch=power; system=rhapsody	11	@@ -803,6 +804,7 @@
105	@@ -700,6 +706,7 @@ case "$host" in
106	arm--linux-gnueabi) arch=arm; system=linux_eabi;;
107	x86_64--linux) arch=amd64; system=linux;;
108	x86_64--gnu) arch=amd64; system=gnu;;
109	+ x86_64--dragonfly) arch=amd64; system=dragonfly;;
110	x86_64--freebsd) arch=amd64; system=freebsd;;
111	x86_64--netbsd) arch=amd64; system=netbsd;;
112	x86_64--openbsd) arch=amd64; system=openbsd;;
113	@@ -724,7 +731,7 @@ else
114	fi
115
116	nativecccompopts=''
117	-nativecclinkopts=''
118	+nativecclinkopts=""
119	nativeccrpath="$byteccrpath"
120
121	case "$arch,$nativecc,$system,$host_type" in
122	@@ -786,6 +793,8 @@ case "$arch,$model,$system" in
123	amd64,*,linux) profiling='prof';;	12	amd64,*,linux) profiling='prof';;
124	amd64,*,gnu) profiling='prof';;	13	amd64,*,gnu) profiling='prof';;
125	arm,,linux) profiling='prof';;	14	arm,,linux) profiling='prof';;
126	+ ,,dragonfly) profiling='prof';;
127	+ ,,freebsd) profiling='prof';;	15	+ ,,freebsd) profiling='prof';;
128	*) profiling='noprof';;	16	*) profiling='noprof';;
129	esac	17	esac
130		18
131	@@ -1544,10 +1553,10 @@ fi
132	# Look for BFD library
133
134	if ./hasgot -i bfd.h && \
135	- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
136	+ ./hasgot -lbfd $dllib -liberty -lz bfd_openr; then
137	echo "BFD library found."
138	echo "#define HAS_LIBBFD" >> s.h
139	- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
140	+ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
141	else
142	echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files"
143	echo "LIBBFD_LINK=" >> Makefile

Added Link Here

(-)b/ocaml/files/patch-otherlibs-Makefile.shared (+19 lines)
1	--- otherlibs/Makefile.shared.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/Makefile.shared 2014-04-01 07:24:57.000000000 +0200
3	@@ -59,14 +59,14 @@
4	install::
5	if test -f dll$(CLIBNAME)$(EXT_DLL); then \
6	cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
7	+ $(RANLIB) lib$(CLIBNAME).$(A)
8	cp lib$(CLIBNAME).$(A) $(LIBDIR)/
9	- cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
10	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
11	if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
12
13	installopt:
14	+ $(RANLIB) $(LIBNAME).a
15	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
16	- cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
17	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
18
19	partialclean:

Added Link Here

(-)b/ocaml/files/patch-otherlibs-dynlink-Makefile (+13 lines)
1	--- otherlibs/dynlink/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/dynlink/Makefile 2014-04-01 07:44:36.000000000 +0200
3	@@ -71,8 +71,8 @@
4
5	installopt:
6	if $(NATDYNLINK); then \
7	- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \
8	- cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \
9	+ $(RANLIB) dynlink.$(A); \
10	+ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR); \
11	fi
12
13	partialclean:

Added Link Here

(-)b/ocaml/files/patch-otherlibs-labltk-support-Makefile (+12 lines)
1	--- otherlibs/labltk/support/Makefile.orig 2012-07-17 17:31:12.000000000 +0200
2	+++ otherlibs/labltk/support/Makefile 2014-04-01 07:23:59.000000000 +0200
3	@@ -43,8 +43,8 @@
4
5	install:
6	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
7	+ $(RANLIB) lib$(LIBNAME).$(A)
8	cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
9	- cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
10	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
11	if test -f dll$(LIBNAME)$(EXT_DLL); then \
12	cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi

Added Link Here

(-)b/ocaml/files/patch-otherlibs-systhreads-Makefile (+25 lines)
1	--- otherlibs/systhreads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/systhreads/Makefile 2014-04-01 07:26:11.000000000 +0200
3	@@ -71,8 +71,8 @@
4
5	install:
6	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
7	+ $(RANLIB) libthreads.a
8	cp libthreads.a $(LIBDIR)/libthreads.a
9	- cd $(LIBDIR); $(RANLIB) libthreads.a
10	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
11	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
12	rm -f $(LIBDIR)/threads/stdlib.cma
13	@@ -80,10 +80,10 @@
14	cp threads.h $(LIBDIR)/caml/threads.h
15
16	installopt:
17	+ $(RANLIB) libthreadsnat.a
18	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
19	- cd $(LIBDIR); $(RANLIB) libthreadsnat.a
20	+ $(RANLIB) threads.a
21	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads
22	- cd $(LIBDIR)/threads; $(RANLIB) threads.a
23
24	.SUFFIXES: .ml .mli .cmo .cmi .cmx
25

Added Link Here

(-)b/ocaml/files/patch-otherlibs-threads-Makefile (+12 lines)
1	--- otherlibs/threads/Makefile.orig 2013-07-23 16:48:47.000000000 +0200
2	+++ otherlibs/threads/Makefile 2014-04-01 07:27:02.000000000 +0200
3	@@ -98,8 +98,8 @@
4	install:
5	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
6	mkdir -p $(LIBDIR)/vmthreads
7	+ $(RANLIB) libvmthreads.a
8	cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
9	- cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
10	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
11	threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
12	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \

Added Link Here

(-)b/ocaml/files/patch-stdlib-Makefile (+22 lines)
1	--- stdlib/Makefile.orig 2012-10-15 19:50:56.000000000 +0200
2	+++ stdlib/Makefile 2014-04-01 07:27:40.000000000 +0200
3	@@ -23,8 +23,8 @@
4	installopt: installopt-default installopt-$(PROFILING)
5
6	installopt-default:
7	+ $(RANLIB) stdlib.a
8	cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR)
9	- cd $(LIBDIR); $(RANLIB) stdlib.a
10
11	installopt-noprof:
12	rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa
13	@@ -34,8 +34,8 @@
14	rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
15
16	installopt-prof:
17	+ $(RANLIB) stdlib.p.a
18	cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
19	- cd $(LIBDIR); $(RANLIB) stdlib.p.a
20
21	stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
22	$(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)

Lines 13-22 bin/camlp4r Link Here

(-)b/ocaml/pkg-plist (-398 / +452 lines)
13	bin/camlp4r.opt	13	bin/camlp4r.opt
14	bin/camlp4rf	14	bin/camlp4rf
15	bin/camlp4rf.opt	15	bin/camlp4rf.opt
16	%%TK%%bin/labltk	16	bin/labltk
17	bin/mkcamlp4	17	bin/mkcamlp4
18	bin/ocaml	18	bin/ocaml
19	%%TK%%bin/ocamlbrowser	19	bin/ocamlbrowser
20	bin/ocamlbuild	20	bin/ocamlbuild
21	bin/ocamlbuild.byte	21	bin/ocamlbuild.byte
22	bin/ocamlbuild.native	22	bin/ocamlbuild.native
Lines 95-101 lib/ocaml/caml/mlvalues.h Link Here
95	lib/ocaml/caml/printexc.h	95	lib/ocaml/caml/printexc.h
96	lib/ocaml/caml/signals.h	96	lib/ocaml/caml/signals.h
97	lib/ocaml/caml/socketaddr.h	97	lib/ocaml/caml/socketaddr.h
98	%%THREADS%%lib/ocaml/caml/threads.h	98	lib/ocaml/caml/threads.h
99	lib/ocaml/caml/unixsupport.h	99	lib/ocaml/caml/unixsupport.h
100	lib/ocaml/camlheader	100	lib/ocaml/camlheader
101	lib/ocaml/camlheader_ur	101	lib/ocaml/camlheader_ur
Lines 239-245 lib/ocaml/camlp4/Camlp4Top/Rprint.cmx Link Here
239	lib/ocaml/camlp4/Camlp4Top/Rprint.o	239	lib/ocaml/camlp4/Camlp4Top/Rprint.o
240	lib/ocaml/camlp4/Camlp4Top/Top.cmi	240	lib/ocaml/camlp4/Camlp4Top/Top.cmi
241	lib/ocaml/camlp4/Camlp4Top/Top.cmo	241	lib/ocaml/camlp4/Camlp4Top/Top.cmo
242	lib/ocaml/camlp4/Camlp4Top/Top.cmx	242	%%PROF%%lib/ocaml/camlp4/Camlp4Top/Top.cmx
243	lib/ocaml/camlp4/Camlp4Top/Top.o	243	lib/ocaml/camlp4/Camlp4Top/Top.o
244	lib/ocaml/camlp4/Camlp4_config.cmi	244	lib/ocaml/camlp4/Camlp4_config.cmi
245	lib/ocaml/camlp4/Camlp4_import.cmi	245	lib/ocaml/camlp4/Camlp4_import.cmi
Lines 270-275 lib/ocaml/compiler-libs/asmgen.cmi Link Here
270	lib/ocaml/compiler-libs/asmlibrarian.cmi	270	lib/ocaml/compiler-libs/asmlibrarian.cmi
271	lib/ocaml/compiler-libs/asmlink.cmi	271	lib/ocaml/compiler-libs/asmlink.cmi
272	lib/ocaml/compiler-libs/asmpackager.cmi	272	lib/ocaml/compiler-libs/asmpackager.cmi
		273	lib/ocaml/compiler-libs/ast_mapper.cmi
273	lib/ocaml/compiler-libs/asttypes.cmi	274	lib/ocaml/compiler-libs/asttypes.cmi
274	lib/ocaml/compiler-libs/btype.cmi	275	lib/ocaml/compiler-libs/btype.cmi
275	lib/ocaml/compiler-libs/bytegen.cmi	276	lib/ocaml/compiler-libs/bytegen.cmi
Lines 289-296 lib/ocaml/compiler-libs/cmt_format.cmi Link Here
289	lib/ocaml/compiler-libs/cmx_format.cmi	290	lib/ocaml/compiler-libs/cmx_format.cmi
290	lib/ocaml/compiler-libs/coloring.cmi	291	lib/ocaml/compiler-libs/coloring.cmi
291	lib/ocaml/compiler-libs/comballoc.cmi	292	lib/ocaml/compiler-libs/comballoc.cmi