From kiri@kiri.toba-cmt.ac.jp  Thu Jun  5 04:00:46 1997
Received: from kiri.toba-cmt.ac.jp (kiri.toba-cmt.ac.jp [202.26.248.91])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA07795
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 5 Jun 1997 03:59:56 -0700 (PDT)
Received: (from kiri@localhost)
	by kiri.toba-cmt.ac.jp (8.8.5/8.8.5) id UAA17870;
	Thu, 5 Jun 1997 20:03:00 +0900 (JST)
Message-Id: <199706051103.UAA17870@kiri.toba-cmt.ac.jp>
Date: Thu, 5 Jun 1997 20:03:00 +0900 (JST)
From: Kazuhiko Kiriyama(System administrator) <kiri@kiri.toba-cmt.ac.jp>
Reply-To: kiri@kiri.toba-cmt.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port camltk41-1.0 (x11/camltk41).
X-Send-Pr-Version: 3.2

>Number:         3795
>Category:       ports
>Synopsis:       Update port camltk41-1.0 (x11/camltk41).
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:
>Keywords:
>Date-Required:
>Class:          support
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun  5 04:10:15 PDT 1997
>Closed-Date:    Tue Jun 10 04:03:02 PDT 1997
>Last-Modified:  Tue Jun 10 04:05:55 PDT 1997
>Originator:     Kazuhiko Kiriyama
>Release:        FreeBSD 2.2.2-RELEASE i386
>Organization:
Toba National College of Maritime Technology.
                 Department of Electronic Mechanical Engineering
>Environment:
>Description:

	I've updated the port camltk41-1.0 (x11/camltk41).

	Current modifications is

		(1) Corresponded to Tcl7.6/Tk4.2.

	Add, Delete and Update files are respecively

	[Add] :
		files/patch-site.config.tmpl

	[Delete] :
		patches/patch-ab

	[Update] :
		Makefile
		patches/patch-aa
		pkg/COMMENT
		pkg/DESCR
		pkg/PLIST

	I put the diff from ports-current(x11/camltk41) in "Fix:".

>How-To-Repeat:
>Fix:
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/Makefile ./Makefile
--- ../../current/ports/x11/camltk41/Makefile	Sun Apr 27 21:19:17 1997
+++ ./Makefile	Sun Jun  1 16:06:29 1997
@@ -7,24 +7,31 @@
 #
 
 DISTNAME=	camltk41
-PKGNAME=	camltk41-1.0
-CATEGORIES=	x11 tk41
+PKGNAME?=	camltk41-1.0
+CATEGORIES?=	x11
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/Francois.Rouaix/mmm/ \
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/mmm/
 DISTFILES=	ocamltk41.tar.gz
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-LIB_DEPENDS=	tk41\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS?=	tcl76${LIBEXT}\\.:${PORTSDIR}/lang/tcl76 \
+		tk42${LIBEXT}\\.:${PORTSDIR}/x11/tk42
 BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} --tcl-version=7.6${LIBEXT} \
+		--tk-version=4.2${LIBEXT} \
 		--x-includes=${X11BASE}/include \
 		--with-config=site.config
 USE_GMAKE=	yes
 
 DOCDIR=		${PREFIX}/share/doc/camltk
+LIBEXT?=
+
+pre-patch:
+	@${SED} -e "s,%LIBEXT%,${LIBEXT},g" \
+		< ${FILESDIR}/patch-site.config.tmpl > ${PATCHDIR}/patch-ab
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -32,5 +39,8 @@
 	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 .endif
+
+pre-clean:
+	@${RM} -f ${PATCHDIR}/patch-ab
 
 .include <bsd.port.mk>
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/files/patch-site.config.tmpl ./files/patch-site.config.tmpl
--- ../../current/ports/x11/camltk41/files/patch-site.config.tmpl	Thu Jan  1 09:00:00 1970
+++ ./files/patch-site.config.tmpl	Sun Jun  1 10:18:10 1997
@@ -0,0 +1,34 @@
+--- site.config	Sun Dec  1 20:31:42 1996
++++ site.config	Wed Dec 18 19:00:36 1996
+@@ -1,24 +1,24 @@
+ ## Location of Objective Caml Libraries
+-OCAMLLIBDIR=/usr/local/lib/objective-caml
+-# OCAMLLIBDIR=/usr/local/lib/ocaml
++# OCAMLLIBDIR=/usr/local/lib/objective-caml
++OCAMLLIBDIR=${prefix}/lib/ocaml
+ 
+ ## Location of Tk sources
+ # In this directory, there are generic, unix, etc...
+-TK_SRC=/usr/local/src/tk41
++TK_SRC=${prefix}/include/tk${tk_version}
+ 
+ ## Compilation and link flags for Tcl/Tk applications
+ ## Preprocessor flags to find tcl.h and tk.h
+-#CPPFLAGS=-I/home/cahors/furuse/sun/include
++CPPFLAGS="-I${prefix}/include/tk${tk_version} -I${prefix}/include/tcl${tcl_version} -I${x_includes}"
+ ## ld flags to add path to libtcl*.* and libtk*.*
+-#LDFLAGS=-L/home/cahors/furuse/sun/lib
++LDFLAGS=-L${prefix}/lib
+ 
+ ## If you're building the japanised version of MMM, you must use the
+ ## japanised versions of Tcl and Tk. The libraries are usually installed
+ ## as libtclXXjp.a and libtkXXjp.a. Uncomment the following line if you
+ ## want "configure" to find the correct libraries
+-# LIBEXT=jp
++LIBEXT=%LIBEXT%
+ 
+ ## Installation directory
+ ## The default is $(OCAMLLIBDIR)/camltk41
+ ## This MUST be an absolute path
+-# INSTALLDIR=$HOME/ocamltk41/`arch`
++INSTALLDIR=${prefix}/lib/ocaml/camltk41
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/patches/patch-aa ./patches/patch-aa
--- ../../current/ports/x11/camltk41/patches/patch-aa	Mon Jan 27 22:57:37 1997
+++ ./patches/patch-aa	Sun Jun  1 10:11:11 1997
@@ -1,33 +1,36 @@
---- site.config	Sun Dec  1 20:31:42 1996
-+++ site.config	Wed Dec 18 19:00:36 1996
-@@ -1,24 +1,24 @@
- ## Location of Objective Caml Libraries
--OCAMLLIBDIR=/usr/local/lib/objective-caml
--# OCAMLLIBDIR=/usr/local/lib/ocaml
-+# OCAMLLIBDIR=/usr/local/lib/objective-caml
-+OCAMLLIBDIR=${prefix}/lib/ocaml
+--- configure.orig	Mon Dec  2 22:14:09 1996
++++ configure	Wed Feb 19 14:44:02 1997
+@@ -22,6 +22,8 @@
+ build=NONE
+ cache_file=./config.cache
+ exec_prefix=NONE
++tcl_version=
++tk_version=
+ host=NONE
+ no_create=
+ nonopt=NONE
+@@ -376,6 +378,24 @@
+   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries="$ac_optarg" ;;
++
++  -tcl-version | --tcl-version | --tcl-versio | --tcl-versi \
++  | --tcl-vers | --tcl-ver \
++  | --tcl-ve | --tcl-v)
++    ac_prev=tcl-version ;;
++  -tcl-version=* | --tcl-version=* | --tcl-versio=* | --tcl-versi=* \
++  | --tcl-vers=* | --tcl-ver=* \
++  | --tcl-ve=* | --tcl-v=*)
++    tcl_version="$ac_optarg" ;;
++
++  -tk-version | --tk-version | --tk-versio | --tk-versi \
++  | --tk-vers | --tk-ver \
++  | --tk-ve | --tk-v)
++    ac_prev=tk-version ;;
++  -tk-version=* | --tk-version=* | --tk-versio=* | --tk-versi=* \
++  | --tk-vers=* | --tk-ver=* \
++  | --tk-ve=* | --tk-v=*)
++    tk_version="$ac_optarg" ;;
  
- ## Location of Tk sources
- # In this directory, there are generic, unix, etc...
--TK_SRC=/usr/local/src/tk41
-+TK_SRC=${prefix}/include/tk4.1
- 
- ## Compilation and link flags for Tcl/Tk applications
- ## Preprocessor flags to find tcl.h and tk.h
--#CPPFLAGS=-I/home/cahors/furuse/sun/include
-+CPPFLAGS="-I${prefix}/include -I${x_includes}"
- ## ld flags to add path to libtcl*.* and libtk*.*
--#LDFLAGS=-L/home/cahors/furuse/sun/lib
-+LDFLAGS=-L${prefix}/lib
- 
- ## If you're building the japanised version of MMM, you must use the
- ## japanised versions of Tcl and Tk. The libraries are usually installed
- ## as libtclXXjp.a and libtkXXjp.a. Uncomment the following line if you
- ## want "configure" to find the correct libraries
- # LIBEXT=jp
- 
- ## Installation directory
- ## The default is $(OCAMLLIBDIR)/camltk41
- ## This MUST be an absolute path
--# INSTALLDIR=$HOME/ocamltk41/`arch`
-+INSTALLDIR=${prefix}/lib/ocaml/camltk41
+   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+     ;;
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/patches/patch-ab ./patches/patch-ab
--- ../../current/ports/x11/camltk41/patches/patch-ab	Mon Jan  6 23:13:27 1997
+++ ./patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,26 +0,0 @@
---- configure	Mon Dec  2 22:14:09 1996
-+++ configure	Sun Jan  5 09:04:29 1997
-@@ -22,6 +22,7 @@
- build=NONE
- cache_file=./config.cache
- exec_prefix=NONE
-+tk_src_prefix=
- host=NONE
- no_create=
- nonopt=NONE
-@@ -376,6 +377,15 @@
-   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries="$ac_optarg" ;;
-+
-+  -tk-src-prefix | --tk-src-prefix | --tk-src-prefi | --tk-src-pref \
-+  | --tk-src-pre | --tk-src-pr | --tk-src-p | --tk-src- | --tk-src \
-+  | --tk-sr | --tk-s)
-+    ac_prev=tk-src-prefix ;;
-+  -tk-src-prefix=* | --tk-src-prefix=* | --tk-src-prefi=* | --tk-src-pref=* \
-+  | --tk-src-pre=* | --tk-src-pr=* | --tk-src-p=* | --tk-src-=* | --tk-src=* \
-+  | --tk-sr=* | --tk-s=*)
-+    tk_src_prefix="$ac_optarg" ;;
- 
-   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-     ;;
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/pkg/COMMENT ./pkg/COMMENT
--- ../../current/ports/x11/camltk41/pkg/COMMENT	Fri Jan  3 21:12:47 1997
+++ ./pkg/COMMENT	Sun Jun  1 10:51:44 1997
@@ -1 +1 @@
-A library for interfacing Objective Caml with Tcl7.5/Tk4.1.
+A library for interfacing Objective Caml with Tcl/Tk
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/pkg/DESCR ./pkg/DESCR
--- ../../current/ports/x11/camltk41/pkg/DESCR	Fri Jan  3 21:12:47 1997
+++ ./pkg/DESCR	Sun Jun  1 10:51:59 1997
@@ -1,5 +1,5 @@
 CamlTk41 is a library for interfacing Objective Caml with the scripting
-language Tcl/Tk (versions 7.5/4.1 or 7.6/4.2 only).
+language Tcl/Tk.
 
 In addition to the basic interface with Tcl/Tk, this package contains
  * the "frx" library, written by Francois Rouaix; it contains some 
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/x11/camltk41/pkg/PLIST ./pkg/PLIST
--- ../../current/ports/x11/camltk41/pkg/PLIST	Fri Jan  3 21:12:47 1997
+++ ./pkg/PLIST	Sun Jun  1 10:50:39 1997
@@ -147,3 +147,5 @@
 lib/ocaml/camltk41/wm.mli
 share/doc/camltk/INSTALL
 share/doc/camltk/README
+@dirrm lib/ocaml/camltk41
+@dirrm share/doc/camltk
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: asami 
State-Changed-When: Tue Jun 10 04:03:02 PDT 1997 
State-Changed-Why:  

Thanks, committed! 
>Unformatted:
