Upgrade to v0.75. Unbreak for non-i386 architectures.

4 files changed, 47 insertions, 24 deletions

diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 7540eaaefb72..9e94ed8555fb 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -6,29 +6,25 @@
 #
 
 PORTNAME=	caml
-PORTVERSION=	0.74
+PORTVERSION=	0.75
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
 	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \
 	ftp://arcadia.informatik.uni-muenchen.de/pub/comp/programming/languages/functional/caml-light/ \
 	ftp://sunsite.icm.edu.pl/pub/programming/caml/ \
 	http://wwwfun.kurims.kyoto-u.ac.jp/soft/caml-light/
-DISTNAME=	cl74unix
+DISTNAME=	cl75unix
 
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	A strongly typed functional language belonging to the ML family
 
 USE_XLIB=	yes
-WRKSRC=		${WRKDIR}/cl74
+WRKSRC=		${WRKDIR}/cl75
 ALL_TARGET=	configure world bootstrap
 MAN1=	camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
-
 do-build:
 	cd ${WRKSRC}/src; ${MAKE} ${ALL_TARGET} PREFIX=${PREFIX} \
 	X11BASE=${X11BASE}
diff --git a/lang/caml-light/distinfo b/lang/caml-light/distinfo
index 23b05ed4146e..2b34bbfd8818 100644
--- a/lang/caml-light/distinfo
+++ b/lang/caml-light/distinfo
@@ -1 +1,2 @@
-MD5 (cl74unix.tar.gz) = 72c44d8751402f571979ab5d9aa98224
+MD5 (cl75unix.tar.gz) = 6c236074e4487949ec22001c7a498057
+SIZE (cl75unix.tar.gz) = 1108206
diff --git a/lang/caml-light/files/patch-aa b/lang/caml-light/files/patch-aa
index a94c693c0087..a0d8f35c3470 100644
--- a/lang/caml-light/files/patch-aa
+++ b/lang/caml-light/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.orig	Thu Apr 24 20:21:03 1997
-+++ src/Makefile	Tue Jul 28 08:30:13 1998
-@@ -24,19 +24,19 @@
+--- src/Makefile.orig	Wed Mar  3 18:55:57 1999
++++ src/Makefile	Sat Mar  6 19:51:31 2004
+@@ -26,19 +26,19 @@
  # not all Unix C preprocessors define it.
  # If your cpp is too fussy, make tools/clprepro and use this:
  # CPP=../../src/tools/clprepro -Dunix
--CPP=/lib/cpp -P -Dunix
-+CPP=/usr/bin/cpp -P -Dunix
+-CPP=/lib/cpp -P -traditional -Dunix
++CPP=/usr/bin/cpp -P -traditional -Dunix
  
  # The directory where public executables will be installed
 -BINDIR=/usr/local/bin
@@ -24,7 +24,7 @@
  
  # Some "make"s need this to ensure that they call the Bourne shell,
  # not the C shell. Seems harmless on most other "make"s.
-@@ -118,8 +118,8 @@
+@@ -120,8 +120,8 @@
  
  # Install the Caml Light system
  install:
diff --git a/lang/caml-light/files/patch-ab b/lang/caml-light/files/patch-ab
index f9fb792626a3..0bc8b66a8880 100644
--- a/lang/caml-light/files/patch-ab
+++ b/lang/caml-light/files/patch-ab
@@ -1,5 +1,5 @@
---- contrib/Makefile--	Mon Dec  1 23:47:01 1997
-+++ contrib/Makefile	Mon Jul 27 12:27:01 1998
+--- contrib/Makefile.orig	Sat Nov 11 15:57:42 2000
++++ contrib/Makefile	Sat Mar  6 06:42:32 2004
 @@ -5,7 +5,7 @@
  # Remember that "libunix" is required for
  # "debugger", "libgraph", "camltk", "camltk4", and "search_isos".
@@ -18,7 +18,7 @@
  
  # Test to see whether ranlib exists on the machine
  RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
-@@ -31,26 +31,26 @@
+@@ -31,27 +31,27 @@
  RANLIB=ranlib
  
  # The directory where public executables will be installed
@@ -41,21 +41,17 @@
  # Needed for the "libgraph" and "camltk" packages.
 -X11_INCLUDES=/usr/X11R6/include
 +X11_INCLUDES=${X11BASE}/include
+ #X11_INCLUDES=/usr/include/X11
  
  # The path to the directory containing the X11 libraries.
  # (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib)
  # Needed for the "libgraph" and "camltk" packages.
 -X11_LIB=/usr/X11R6/lib
 +X11_LIB=${X11BASE}/lib
+ #X11_LIB=/usr/lib/X11
  
  # Name of the target architecture.
- # Used only for the libnum library (arbitrary-precision arithmetic), to
-@@ -62,15 +62,15 @@
- # See the file libnum/README for more explanations.
- # If you don't know, leave BIGNUM_ARCH=C, which selects a portable
- # C implementation of these routines.
--BIGNUM_ARCH=C
-+BIGNUM_ARCH=pentium
+@@ -68,19 +68,19 @@
  
  # Name of the directory where LaTeX style files should be installed.
  # Needed only for the "caml-tex" and "caml-latex2e" packages.
@@ -69,3 +65,33 @@
  
  # Name of the directories where the tcl.h and tk.h includes can be found.
  # Needed only for the "camltk" package.
+ 
+ # /usr/local configuration
+ # True64 configuration
+-TCLINCLDIR=/usr/local/lib/tcl8.0/include
+-TKINCLDIR=/usr/local/lib/tk8.0/include
++TCLINCLDIR=${LOCALBASE}/lib/tcl8.4/include
++TKINCLDIR=${LOCALBASE}/lib/tk8.4/include
+ # RedHat Linux configuration
+ #TCLINCLDIR=/usr/include
+ #TKINCLDIR=/usr/include
+@@ -89,8 +89,8 @@
+ # Needed only for the "camltk" package.
+ # /usr/local configuration
+ # True64 Unix configuration
+-TKLIBDIR=/usr/local/lib/tk8.0/lib
+-TCLLIBDIR=/usr/local/lib/tcl8.0/lib
++TKLIBDIR=${LOCALBASE}/lib/tk8.4/lib
++TCLLIBDIR=${LOCALBASE}/lib/tcl8.4/lib
+ 
+ # RedHat Linux configuration
+ #TKLIBDIR=/usr/lib
+@@ -100,7 +100,7 @@
+ # a custom Tcl/Tk with various extensions (such as Xpm)
+ #TKLIBS=-ltk -ltcl -lX11
+ # True64 Unix configuration
+-TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -lm
++TKLIBS=-ltk8.4 -ltcl8.4 -lX11 -lm
+ # RedHat Linux configuration
+ #TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -ldl -lm
+