Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Dec 1997 20:03:46 +0900 (JST)
From:      Kazuhiko Kiriyama(System administrator) <kiri@kiri.toba-cmt.ac.jp>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/5375: Update the port: ocaml-1.07(lang/ocaml)
Message-ID:  <199712241103.UAA24335@kiri.toba-cmt.ac.jp>
Resent-Message-ID: <199712241110.DAA00611@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         5375
>Category:       ports
>Synopsis:       Update the port: ocaml-1.07(lang/ocaml)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Class:          support
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 24 03:10:01 PST 1997
>Last-Modified:
>Originator:     Kazuhiko Kiriyama
>Organization:
Toba National College of Maritime Technology.
                 Department of Electronic Mechanical Engineering
>Release:        FreeBSD 2.2.5-STABLE i386
>Environment:
>Description:
	I've updated the port: ocaml-1.07(lang/ocaml)
	I put the diff from ports-current(lang/ocaml) in "Fix:".
    Note! :
	I've already send-pr(ports/5252),so please apply patch ports/5252 
	and this succesivelly.
>How-To-Repeat:
>Fix:
diff -aurN ../../submitted/lang/ocaml/Makefile ./Makefile
--- ../../submitted/lang/ocaml/Makefile	Wed Dec 24 19:45:53 1997
+++ ./Makefile	Tue Dec 23 20:38:57 1997
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Objective Caml
-# Version required:	1.06
+# Version required:	1.07
 # Date created:		24 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $Id: Makefile,v 1.2 1997/11/18 12:31:08 tg Exp $
 #
 
-DISTNAME=	ocaml-1.06
+DISTNAME=	ocaml-1.07
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/ \
 		ftp://ftp.inria.fr/lang/caml-light/
@@ -20,7 +20,7 @@
 MAN1=		ocaml.1 ocamlc.1 ocamlcp.1 ocamldep.1 ocamllex.1 \
 		ocamlopt.1 ocamlprof.1 ocamlrun.1 ocamlyacc.1
 
-CONFIGURE_ENV+=	PREFIX=${PREFIX} X11BASE=${X11BASE} BATCH=${BATCH}
+CONFIGURE_ENV=	PREFIX=${PREFIX} X11BASE=${X11BASE} BATCH=${BATCH}
 
 .if !defined(NOPORTDOCS)
 DOCFILES=	${DISTNAME}-refman.html.tar.gz
@@ -28,8 +28,8 @@
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ocaml/html
-	cd ${WRKDIR}/htmlman; ${INSTALL_DATA} * ${PREFIX}/share/doc/ocaml/html
+	@${MKDIR} ${PREFIX}/share/doc/ocaml/html
+	@cd ${WRKDIR}/htmlman; ${INSTALL_DATA} * ${PREFIX}/share/doc/ocaml/html
 .endif
 	@strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc
 
diff -aurN ../../submitted/lang/ocaml/files/md5 ./files/md5
--- ../../submitted/lang/ocaml/files/md5	Wed Dec 24 19:45:53 1997
+++ ./files/md5	Tue Dec 23 20:13:19 1997
@@ -1,2 +1,2 @@
-MD5 (ocaml-1.06.tar.gz) = 76c6aee6305b723b05fe0cdf0145499a
-MD5 (ocaml-1.06-refman.html.tar.gz) = 09a051efa2b52e81fc0ab346bed89534
+MD5 (ocaml-1.07.tar.gz) = c5bf08086a866b80f55a91a4468f20b7
+MD5 (ocaml-1.07-refman.html.tar.gz) = 045be9ae7ca6c19a34bc1912b4d7f272
diff -aurN ../../submitted/lang/ocaml/files/md5.orig ./files/md5.orig
--- ../../submitted/lang/ocaml/files/md5.orig	Wed Dec 24 19:45:15 1997
+++ ./files/md5.orig	Thu Jan  1 09:00:00 1970
@@ -1,2 +0,0 @@
-MD5 (ocaml-1.03.tar.gz) = 933ececf83e12d713e1867e5f7423d0e
-MD5 (ocaml-1.03-refman.html.tar.gz) = 4a00b7ae77353b2b03dfebe40287f226
diff -aurN ../../submitted/lang/ocaml/patches/patch-aa ./patches/patch-aa
--- ../../submitted/lang/ocaml/patches/patch-aa	Wed Dec 24 19:45:53 1997
+++ ./patches/patch-aa	Tue Dec 23 21:47:07 1997
@@ -1,107 +1,130 @@
-*** configure~	Tue Nov 11 03:20:46 1997
---- configure	Mon Dec  8 13:13:48 1997
-***************
-*** 13,21 ****
-  
-  # $Id: configure,v 1.51 1997/11/10 18:20:46 xleroy Exp $
-  
-! bindir=/usr/local/bin
-! libdir=/usr/local/lib/ocaml
-! mandir=/usr/local/man/man1
-  manext=1
-  host_type=unknown
-  cc=''
---- 13,21 ----
-  
-  # $Id: configure,v 1.51 1997/11/10 18:20:46 xleroy Exp $
-  
-! bindir=${PREFIX}/bin
-! libdir=${PREFIX}/lib/ocaml
-! mandir=${PREFIX}/man/man1
-  manext=1
-  host_type=unknown
-  cc=''
-***************
-*** 110,115 ****
---- 110,117 ----
-  
-  # Check for buggy versions of GCC
-  
-+ if [ ! "${BATCH}" ]; then
-+ 
-  case "$host,$cc" in
-    i[3456]86-*-*,gcc*)
-      case `$cc --version` in
-***************
-*** 132,137 ****
---- 134,141 ----
-      esac;;
-  esac
-  
-+ fi
-+ 
-  # Configure the bytecode compiler
-  
-  bytecc="$cc"
-***************
-*** 620,633 ****
-  x11_link="not found"
-  
-  for dir in $x11_include_dir \
-!   /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include \
-    /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-!   /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include \
-!   /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 \
-!   /usr/X11/include /usr/include/X11 /usr/local/X11/include \
-!   /usr/local/include/X11 /usr/X386/include /usr/x386/include \
-!   /usr/XFree86/include/X11 /usr/include /usr/local/include \
-!   /usr/unsupported/include /usr/athena/include /usr/local/x11r5/include \
-    /usr/lpp/Xamples/include /usr/openwin/include /usr/openwin/share/include \
-    /opt/X11R6/include /opt/X11R5/include
-  do
---- 624,637 ----
-  x11_link="not found"
-  
-  for dir in $x11_include_dir \
-!   ${X11BASE}/include /usr/X11R5/include /usr/X11R4/include \
-    /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-!   ${PREFIX}/X11R6/include ${PREFIX}/X11R5/include ${PREFIX}/X11R4/include \
-!   ${PREFIX}/include/X11R6 ${PREFIX}/include/X11R5 ${PREFIX}/include/X11R4 \
-!   /usr/X11/include /usr/include/X11 ${PREFIX}/X11/include \
-!   ${PREFIX}/include/X11 /usr/X386/include /usr/x386/include \
-!   /usr/XFree86/include/X11 /usr/include ${PREFIX}/include \
-!   /usr/unsupported/include /usr/athena/include ${PREFIX}/x11r5/include \
-    /usr/lpp/Xamples/include /usr/openwin/include /usr/openwin/share/include \
-    /opt/X11R6/include /opt/X11R5/include
-  do
-***************
-*** 638,651 ****
-  done
-  
-  for dir in $x11_lib_dir \
-!   /usr/X11R6/lib /usr/X11R5/lib /usr/X11R4/lib \
-    /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-!   /usr/local/X11R6/lib /usr/local/X11R5/lib /usr/local/X11R4/lib \
-!   /usr/local/lib/X11R6 /usr/local/lib/X11R5 /usr/local/lib/X11R4 \
-!   /usr/X11/lib /usr/lib/X11 /usr/local/X11/lib \
-!   /usr/local/lib/X11 /usr/X386/lib /usr/x386/lib \
-!   /usr/XFree86/lib/X11 /usr/lib /usr/local/lib \
-!   /usr/unsupported/lib /usr/athena/lib /usr/local/x11r5/lib \
-    /usr/lpp/Xamples/lib /usr/openwin/lib /usr/openwin/share/lib \
-    /opt/X11R6/lib /opt/X11R5/lib
-  do
---- 642,655 ----
-  done
-  
-  for dir in $x11_lib_dir \
-!   ${X11BASE}/lib /usr/X11R5/lib /usr/X11R4/lib \
-    /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-!   ${PREFIX}/X11R6/lib ${PREFIX}/X11R5/lib ${PREFIX}/X11R4/lib \
-!   ${PREFIX}/lib/X11R6 ${PREFIX}/lib/X11R5 ${PREFIX}/lib/X11R4 \
-!   /usr/X11/lib /usr/lib/X11 ${PREFIX}/X11/lib \
-!   ${PREFIX}/lib/X11 /usr/X386/lib /usr/x386/lib \
-!   /usr/XFree86/lib/X11 /usr/lib ${PREFIX}/lib \
-!   /usr/unsupported/lib /usr/athena/lib ${PREFIX}/x11r5/lib \
-    /usr/lpp/Xamples/lib /usr/openwin/lib /usr/openwin/share/lib \
-    /opt/X11R6/lib /opt/X11R5/lib
-  do
+--- configure.orig	Tue Dec  9 18:13:38 1997
++++ configure	Tue Dec 23 21:46:31 1997
+@@ -13,9 +13,9 @@
+ 
+ # $Id: configure,v 1.53 1997/12/09 09:13:38 xleroy Exp $
+ 
+-bindir=/usr/local/bin
+-libdir=/usr/local/lib/ocaml
+-mandir=/usr/local/man/man1
++bindir='${PREFIX}/bin'
++libdir='${PREFIX}/lib/ocaml'
++mandir='${PREFIX}/man/man1'
+ manext=1
+ host_type=unknown
+ cc=''
+@@ -35,7 +35,7 @@
+         libdir=$2; shift;;
+     -mandir|--mandir)
+         mandir=$2
+-        manext=`echo $mandir | sed -e 's/^.*\(.\)$/\1/'`
++        manext=`eval echo $mandir | sed -e 's/^.*\(.\)$/\1/'`
+         shift;;
+     -host*|--host*)
+         host_type=$2; shift;;
+@@ -56,15 +56,15 @@
+ 
+ # Sanity checks
+ 
+-case "$bindir" in
++case "`eval echo $bindir`" in
+   /*) ;;
+    *) echo "The -bindir directory must be absolute." 1>&2; exit 2;;
+ esac
+-case "$libdir" in
++case "`eval echo $libdir`" in
+   /*) ;;
+    *) echo "The -libdir directory must be absolute." 1>&2; exit 2;;
+ esac
+-case "$mandir" in
++case "`eval echo $mandir`" in
+   /*) ;;
+    *) echo "The -mandir directory must be absolute." 1>&2; exit 2;;
+ esac
+@@ -110,6 +110,8 @@
+ 
+ # Check for buggy versions of GCC
+ 
++if [ ! "${BATCH}" ]; then
++
+ case "$host,$cc" in
+   i[3456]86-*-*,gcc*)
+     case `$cc --version` in
+@@ -132,6 +134,8 @@
+     esac;;
+ esac
+ 
++fi
++
+ # Configure the bytecode compiler
+ 
+ bytecc="$cc"
+@@ -338,9 +342,9 @@
+   echo "#! appears to work in shell scripts"
+   case "$host" in
+     *-*-sunos*)
+-      if test `echo $bindir/ocamlrun | wc -c` -gt 32; then
++      if test `eval echo $bindir/ocamlrun | wc -c` -gt 32; then
+         echo "We won't use it, though, because the path"
+-        echo "      $bindir/ocamlrun"
++        eval echo "      $bindir/ocamlrun"
+         echo "is too long (more than 32 characters -- some kernels don't support this)"
+         echo "SHARPBANGSCRIPTS=false" >> Makefile
+       else
+@@ -620,14 +624,14 @@
+ x11_link="not found"
+ 
+ for dir in $x11_include_dir \
+-  /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include \
++  ${X11BASE}/include /usr/X11R5/include /usr/X11R4/include \
+   /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
+-  /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include \
+-  /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 \
+-  /usr/X11/include /usr/include/X11 /usr/local/X11/include \
+-  /usr/local/include/X11 /usr/X386/include /usr/x386/include \
+-  /usr/XFree86/include/X11 /usr/include /usr/local/include \
+-  /usr/unsupported/include /usr/athena/include /usr/local/x11r5/include \
++  ${PREFIX}/X11R6/include ${PREFIX}/X11R5/include ${PREFIX}/X11R4/include \
++  ${PREFIX}/include/X11R6 ${PREFIX}/include/X11R5 ${PREFIX}/include/X11R4 \
++  /usr/X11/include /usr/include/X11 ${PREFIX}/X11/include \
++  ${PREFIX}/include/X11 /usr/X386/include /usr/x386/include \
++  /usr/XFree86/include/X11 /usr/include ${PREFIX}/include \
++  /usr/unsupported/include /usr/athena/include ${PREFIX}/x11r5/include \
+   /usr/lpp/Xamples/include /usr/openwin/include /usr/openwin/share/include \
+   /opt/X11R6/include /opt/X11R5/include
+ do
+@@ -638,14 +642,14 @@
+ done
+ 
+ for dir in $x11_lib_dir \
+-  /usr/X11R6/lib /usr/X11R5/lib /usr/X11R4/lib \
++  ${X11BASE}/lib /usr/X11R5/lib /usr/X11R4/lib \
+   /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
+-  /usr/local/X11R6/lib /usr/local/X11R5/lib /usr/local/X11R4/lib \
+-  /usr/local/lib/X11R6 /usr/local/lib/X11R5 /usr/local/lib/X11R4 \
+-  /usr/X11/lib /usr/lib/X11 /usr/local/X11/lib \
+-  /usr/local/lib/X11 /usr/X386/lib /usr/x386/lib \
+-  /usr/XFree86/lib/X11 /usr/lib /usr/local/lib \
+-  /usr/unsupported/lib /usr/athena/lib /usr/local/x11r5/lib \
++  ${PREFIX}/X11R6/lib ${PREFIX}/X11R5/lib ${PREFIX}/X11R4/lib \
++  ${PREFIX}/lib/X11R6 ${PREFIX}/lib/X11R5 ${PREFIX}/lib/X11R4 \
++  /usr/X11/lib /usr/lib/X11 ${PREFIX}/X11/lib \
++  ${PREFIX}/lib/X11 /usr/X386/lib /usr/x386/lib \
++  /usr/XFree86/lib/X11 /usr/lib ${PREFIX}/lib \
++  /usr/unsupported/lib /usr/athena/lib ${PREFIX}/x11r5/lib \
+   /usr/lpp/Xamples/lib /usr/openwin/lib /usr/openwin/share/lib \
+   /opt/X11R6/lib /opt/X11R5/lib
+ do
+@@ -701,9 +705,9 @@
+ echo "** Configuration summary **"
+ echo
+ echo "Directories where Objective Caml will be installed:"
+-echo "	binaries.................. $bindir"
+-echo "	standard library.......... $libdir"
+-echo "	manual pages.............. $mandir (with extension .$manext)"
++eval echo "	binaries.................. $bindir"
++eval echo "	standard library.......... $libdir"
++echo "	manual pages.............. `eval echo $mandir` (with extension .$manext)"
+ 
+ echo "Configuration for the bytecode compiler:"
+ echo "	C compiler used........... $bytecc"
diff -aurN ../../submitted/lang/ocaml/pkg/PLIST ./pkg/PLIST
--- ../../submitted/lang/ocaml/pkg/PLIST	Wed Dec 24 19:45:53 1997
+++ ./pkg/PLIST	Tue Dec 23 20:53:43 1997
@@ -259,6 +259,7 @@
 share/doc/ocaml/html/node17.26.html
 share/doc/ocaml/html/node17.27.html
 share/doc/ocaml/html/node17.28.html
+share/doc/ocaml/html/node17.29.html
 share/doc/ocaml/html/node17.3.html
 share/doc/ocaml/html/node17.4.html
 share/doc/ocaml/html/node17.5.html
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199712241103.UAA24335>