From e890501d35dcca3b4eaf36b75cc0e192f9277054 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 13 Dec 2001 11:54:55 +0000 Subject: Update to: metakit-2.4.2-32 TCLKIT is no longer part of the distribution. METAKIT_WITH_TCL Option build metakit for tcl8.3 METAKIT_WITH_TCLKIT Option build metakit for tcl8.4 --- databases/metakit/Makefile | 37 ++++------------------ databases/metakit/distinfo | 2 +- databases/metakit/files/Makefile.kit | 52 ------------------------------- databases/metakit/files/patch-Makefile.in | 38 ++++++---------------- databases/metakit/files/patch-configure | 11 +++++++ databases/metakit/pkg-plist | 1 - 6 files changed, 28 insertions(+), 113 deletions(-) delete mode 100644 databases/metakit/files/Makefile.kit create mode 100644 databases/metakit/files/patch-configure (limited to 'databases/metakit') diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile index 4663da1dc856..23a08f290a88 100644 --- a/databases/metakit/Makefile +++ b/databases/metakit/Makefile @@ -6,11 +6,11 @@ # PORTNAME= metakit -PORTVERSION= 2.4.1 -PORTREVISION= 31 +PORTVERSION= 2.4.2 +PORTREVISION= 32 CATEGORIES= databases python MASTER_SITES= http://www.equi4.com/pub/mk/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-31 +DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTREVISION} MAINTAINER= dinoex@FreeBSD.org @@ -42,7 +42,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(METAKIT_WITH_TCL) -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V} +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} CATEGORIES+= tcl83 TCL_V= 8.3 TCL_SHORT_V= 83 @@ -52,50 +52,25 @@ PLIST_SUB+= WITH_TCL="@comment " .endif .if defined(METAKIT_WITH_TCLKIT) -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V} +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} TCL_V= 8.4 TCL_SHORT_V= 84 MAKE_ENV+= V=${TCL_V} SHORT_V=${TCL_SHORT_V} -VFIX= tcl/kit/kitsh.vfs/lib/vfs/vfs.tcl \ - tcl/kit/kit-unix.vfs/lib/tk8.4/pkgIndex.tcl PLIST_SUB+= WITH_TCLKIT="" .else PLIST_SUB+= WITH_TCLKIT="@comment " .endif pre-patch: - @${PERL5} -pi -e "s=\@TCL_BIN_DIR\@=${LOCALBASE}/lib=" \ - ${WRKSRC}/../unix/Makefile.in - @${PERL5} -pi -e "s=-ltclstub8.4=-ltclstub${TCL_SHORT_V}=" \ - ${WRKSRC}/../unix/Makefile.in - @${PERL5} -pi -e "s= -Ds = -s =" \ - ${WRKSRC}/../unix/Makefile.in - @${PERL5} -pi -e "s= -D = =" \ - ${WRKSRC}/../unix/Makefile.in - @${PERL5} -pi -e \ - "s=-I..TCL_BIN_DIR.=-I${LOCALBASE}/include/tcl${TCL_V}/unix=" \ + @${PERL5} -pi -e "s/= tclsh/=tclsh${TCL_V}/" \ ${WRKSRC}/../unix/Makefile.in @${PERL5} -pi -e "s=doc/==" ${WRKSRC}/../MetaKit.html -.if defined(METAKIT_WITH_TCLKIT) -post-patch: -.for i in ${VFIX} - @${PERL5} -pi -e "s=libtk8[.]4=libtk${TCL_SHORT_V}=" ${WRKSRC}/../${i} -.endfor - -post-build: - @(cd ${WRKSRC}/../tcl/kit && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${FILESDIR}/Makefile.kit ${MAKE_ARGS}) -.endif - post-install: .if !defined(METAKIT_WITHOUT_PYTHON) @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so \ ${PREFIX}/lib/python1.5/site-packages .endif -.if defined(METAKIT_WITH_TCLKIT) - @${INSTALL_PROGRAM} ${WRKSRC}/../tcl/kit/tclkit ${PREFIX}/bin -.endif .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/metakit (${TAR} -C ${WRKSRC}/../doc -cf - . | \ diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo index 5e9bfd37b344..4b7923c9aaa0 100644 --- a/databases/metakit/distinfo +++ b/databases/metakit/distinfo @@ -1 +1 @@ -MD5 (metakit-2.4.1-31.tar.gz) = dc2e2b33737e5ce33c5ef06719082614 +MD5 (metakit-2.4.2-32.tar.gz) = 6aa33f1a43d4438565599f83221b0f2f diff --git a/databases/metakit/files/Makefile.kit b/databases/metakit/files/Makefile.kit deleted file mode 100644 index 4bfb41f47f9d..000000000000 --- a/databases/metakit/files/Makefile.kit +++ /dev/null @@ -1,52 +0,0 @@ -# -# $FreeBSD$ -# - -D= -DNDEBUG -DKIT_INCLUDES_TK -DHAVE_UNISTD_H -A= -DTCL_LOCAL_APPINIT=TclKit_AppInit -I= -I. -I${LOCALBASE}/include/tcl${V}/generic \ - -I${LOCALBASE}/include/tk${V}/generic \ - -I../../include -I/usr/X11R6/include -I${LOCALBASE}/include -L= ${LOCALBASE}/lib/libtcl${SHORT_V}.a \ - ${LOCALBASE}/lib/libtk${SHORT_V}.a \ - ../../builds/libmk4tcl.a -X= /usr/X11R6/lib/libX11.a -C= ${LOCALBASE}/lib/tcl${V} -K= ${LOCALBASE}/lib/tk${V} - -all: tclkit - -tclkit: kit - mkdir -p kit.vfs/lib kitsh.vfs/lib kitsh.vfs/bin \ - kit-unix.vfs/lib kitsh-unix.vfs/lib \ - kitsh.vfs/lib/tcl${V} kitsh.vfs/lib/tk${V} - rm -f kitsh.vfs/bin/sync.tcl - cp -p sync.tcl kitsh.vfs/bin/ - (tar -C ${C} -cf - . | tar -C kitsh.vfs/lib/tcl${V} -xf -) - rm kitsh.vfs/lib/tcl${V}/encoding/* - for i in ascii cp1252 iso8859-1 iso8859-2 macRoman ; do \ - cp -p ${C}/encoding/$$i.enc \ - kitsh.vfs/lib/tcl${V}/encoding ; done - rm -rf kitsh.vfs/lib/tcl${V}/dde* - rm -rf kitsh.vfs/lib/tcl${V}/reg* - rm -rf kitsh.vfs/lib/tcl${V}/tcltest* - (tar -C ${K} -cf - . | tar -C kitsh.vfs/lib/tk${V} -xf -) - -FILES=`find kit.vfs/lib -type f -name license.terms -print` && \ - test -n "$$FILES" && rm $$FILES - rm -rf kit.vfs/lib/tk${V}/demos - rm -rf kit.vfs/lib/tk${V}/images - rm -f tclkit - ./kit - ls -l tclkit - -kit: - rm -f *.o - ${CC} -c ${CFLAGS} $I $D *.c - g++ -c $I $D -fexceptions *.cpp - ${CC} -c ${CFLAGS} $I $D $A ${LOCALBASE}/lib/tcl${V}/tclAppInit.c - g++ -static -o kit *.o $L $X -lm -lz - strip kit - -clean: - rm -f *.o tclkit kit - diff --git a/databases/metakit/files/patch-Makefile.in b/databases/metakit/files/patch-Makefile.in index d66de8044f3b..4c4584ae8159 100644 --- a/databases/metakit/files/patch-Makefile.in +++ b/databases/metakit/files/patch-Makefile.in @@ -1,29 +1,11 @@ ---- ../unix/Makefile.in.orig Wed Oct 24 06:42:00 2001 -+++ ../unix/Makefile.in Wed Oct 24 06:59:29 2001 -@@ -39,7 +39,7 @@ - CXX = @CXX@ - INSTALL = @LIBTOOL@ @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@ - LIBTOOL = @LIBTOOL@ - VERSION = @VERSION@ - TCL_BIN_DIR = /usr/local/lib -@@ -61,7 +61,7 @@ - -I$(includedir)/python1.5 \ - -I/usr/include/python1.5 - CXX_SWITCHES_LUA = $(CXXFLAGS) -I$(srcdir)/../include --CXX_SWITCHES_TEST = -I$(srcdir)/../include -+CXX_SWITCHES_TEST = $(CXXFLAGS) -I$(srcdir)/../include - - #---------- The targets normally specified when calling "make" - -@@ -79,7 +79,7 @@ - diff $(srcdir)/../tests/ok tests - - test-tcl: tcl -- cd $(srcdir)/../tcl/test && tclsh all.tcl -+ cd $(srcdir)/../tcl/test && tclsh8.3 all.tcl - - install: @MK_INSTALL@ +--- ../unix/Makefile.in.orig Thu Dec 13 12:13:47 2001 ++++ ../unix/Makefile.in Thu Dec 13 12:22:12 2001 +@@ -46,7 +46,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL_DATA@ + INSTALL_PROGRAM = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@ +-TCL_INCLUDE_DIR = @TCL_INCLUDE_DIR@ ++TCL_INCLUDE_DIR = @TCL_INCLUDE_DIR@ -I@TCL_INCLUDE_DIR@/generic + + #---------- Do not change, shorthand only diff --git a/databases/metakit/files/patch-configure b/databases/metakit/files/patch-configure new file mode 100644 index 000000000000..0550a35abe8a --- /dev/null +++ b/databases/metakit/files/patch-configure @@ -0,0 +1,11 @@ +--- ../unix/configure.orig Thu Dec 13 12:06:06 2001 ++++ ../unix/configure Thu Dec 13 12:12:36 2001 +@@ -6913,7 +6913,7 @@ + LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='libtool' + + # Prevent multiple expansion + diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist index b4450689bad1..66a510b58031 100644 --- a/databases/metakit/pkg-plist +++ b/databases/metakit/pkg-plist @@ -15,7 +15,6 @@ lib/libmk4.so.0 %%WITH_TCLKIT%%lib/libmk4tcl.a %%WITH_TCLKIT%%lib/libmk4tcl.so %%WITH_TCLKIT%%lib/libmk4tcl.so.0 -%%WITH_TCLKIT%%bin/tclkit %%PORTDOCS%%share/doc/metakit/api/c4_Bytes.html %%PORTDOCS%%share/doc/metakit/api/c4_BytesProp.html %%PORTDOCS%%share/doc/metakit/api/c4_BytesProp_desc.html -- cgit v1.2.3