- Update to 2.4.9.7

- Introduce OPTIONS for python and tcl support
- Take advantage of USE_TCL
- Take maintainership

5 files changed, 49 insertions, 82 deletions

diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 33aeb592b468..0aeb1a97fdf7 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	metakit
-PORTVERSION=	2.4.9.3
-PORTREVISION=	4
+PORTVERSION=	2.4.9.7
 CATEGORIES=	databases
-MASTER_SITES=	http://www.equi4.com/pub/mk/older/
+MASTER_SITES=	http://www.equi4.com/pub/mk/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	C++ embedded database engine, supports Python and Tcl
 
-.if defined(METAKIT_WITH_TCL83)
-LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
-.endif
-.if defined(METAKIT_WITH_TCL84)
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../unix/configure
 USE_LDCONFIG=	yes
-MAKE_ARGS=	CXXFLAGS="-Dq4_INLINE ${CFLAGS} -fpermissive"
 ONLY_FOR_ARCHS=	i386 alpha amd64
 
-.if defined(WITHOUT_PYTHON)
-METAKIT_WITHOUT_PYTHON=yes
-.endif
+OPTIONS=	PYTHON	"Enable Python support"	on \
+		TCL	"Enable Tcl support" off
 
-.if !defined(METAKIT_WITHOUT_PYTHON)
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_PYTHON)
 USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python=${LOCALBASE}
 CATEGORIES+=	python
 PLIST_SUB+=	WITH_PYTHON=""
@@ -42,49 +34,34 @@ PLIST_SUB+=	WITH_PYTHON=""
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-.if defined(METAKIT_WITH_TCL83)
+.if defined(WITH_TCL) 
 CATEGORIES+=	tcl
-TCL_V=		8.3
-TCL_SHORT_V=	83
+USE_TCL=	83+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 .endif
 
-.if defined(METAKIT_WITH_TCL84)
-CATEGORIES+=	tcl
-TCL_V=		8.4
-TCL_SHORT_V=	84
-.endif
-
-.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/include/tcl${TCL_V}
-CONFIGURE_ENV+=	V=${TCL_V} SHORT_V=${TCL_SHORT_V}
-MAKE_ENV+=	V=${TCL_V} SHORT_V=${TCL_SHORT_V}
-PLIST_SUB+=	TCL_V="${TCL_V}"
+.if defined(USE_TCL)
+CONFIGURE_ARGS+=	--with-tcl=${TCL_INCLUDEDIR}
+CONFIGURE_ENV+=		TCL_LIBDIR=${TCL_LIBDIR}
+PLIST_SUB+=	TCL_V="${TCL_VER}"
 PLIST_SUB+=	WITH_TCL=""
 .else
 PLIST_SUB+=	WITH_TCL="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html
-	${REINPLACE_CMD} -e "s=echo aout=echo elf=" ${WRKSRC}/../unix/configure
-.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
-	${REINPLACE_CMD} \
-		-e "s/= tclsh/=tclsh${TCL_V}/" -e "s/tcl8.4/tcl${TCL_V}/" \
+.if defined(USE_TCL)
+	${REINPLACE_CMD} -e "s/= tclsh/=tclsh${TCL_VER}/" \
 		${WRKSRC}/../unix/Makefile.in
 .endif
-.if !defined(METAKIT_WITHOUT_PYTHON)
+.if !defined(WITHOUT_PYTHON)
 	${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
 		${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure
 .endif
 
 post-build:
-	(cd ${WRKSRC} && cc -shared `make -V LIBTOOL_SHLIB_FLAGS -V SHLOBJS` \
-		-lc  -Wl,-soname -Wl,libmk4.so -o .libs/libmk4.so )
-	${SED} -e 's|nstalled=no|installed=yes|' \
-		${WRKSRC}/libmk4.la > ${WRKSRC}/.libs/libmk4.lai
-.if !defined(METAKIT_WITHOUT_PYTHON)
+.if !defined(WITHOUT_PYTHON)
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		${WRKSRC}/../python
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
@@ -92,30 +69,21 @@ post-build:
 .endif
 
 post-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4.so \
+	@${INSTALL_PROGRAM} ${WRKSRC}/libmk4.so \
 		${PREFIX}/lib/libmk4.so.0
 	@${LN} -sf libmk4.so.0 ${PREFIX}/lib/libmk4.so
-	@${MV}  ${PREFIX}/lib/libmk4.al ${PREFIX}/lib/libmk4.a
-.if !defined(METAKIT_WITHOUT_PYTHON)
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4py.a ${PREFIX}/lib
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4py.so ${PREFIX}/lib
-.endif
-.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4tcl.a ${PREFIX}/lib
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4tcl.so ${PREFIX}/lib
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/../doc --exclude "*CVS" -cf - . | \
 		${TAR} -C ${DOCSDIR} --unlink -xf -
 	${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \
-		${WRKSRC}/../README ${WRKSRC}/../WHATSNEW ${DOCSDIR}/
+		${WRKSRC}/../README ${DOCSDIR}/
 .endif
 
 test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
-.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
+.if defined(USE_TCL)
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)
 .endif
diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo
index 80892f5d9cac..ff72060293ac 100644
--- a/databases/metakit/distinfo
+++ b/databases/metakit/distinfo
@@ -1,3 +1,3 @@
-MD5 (metakit-2.4.9.3.tar.gz) = 89a25775fee5db536937f36deb5223f6
-SHA256 (metakit-2.4.9.3.tar.gz) = 4d6c46289b1f1dea4e8bbc78332901491bde0c552727c27431ca9cb0234658da
-SIZE (metakit-2.4.9.3.tar.gz) = 894808
+MD5 (metakit-2.4.9.7.tar.gz) = 17330257376eea657827ed632ea62c9e
+SHA256 (metakit-2.4.9.7.tar.gz) = d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d
+SIZE (metakit-2.4.9.7.tar.gz) = 868310
diff --git a/databases/metakit/files/patch-Makefile.in b/databases/metakit/files/patch-Makefile.in
index bd0969903df2..437ce0a0422d 100644
--- a/databases/metakit/files/patch-Makefile.in
+++ b/databases/metakit/files/patch-Makefile.in
@@ -1,19 +1,19 @@
---- ../unix/Makefile.in.orig	Sun Feb 23 12:24:55 2003
-+++ ../unix/Makefile.in	Sun Feb 23 12:26:32 2003
-@@ -58,6 +58,7 @@
+--- ../unix/Makefile.in.orig	2009-01-05 13:53:33.418671360 +0100
++++ ../unix/Makefile.in	2009-01-05 13:54:09.085615012 +0100
+@@ -51,6 +51,7 @@
  INSTALL = @INSTALL@
- INSTALL_DATA = $L --mode=install @INSTALL_DATA@
- INSTALL_PROGRAM = $L --mode=install @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = $L --mode=install @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ LIB_SUFFIX = @LIB_SUFFIX@
+ SHLIB_SUFFIX = @SHLIB_SUFFIX@
+ SHLIB_LD = @SHLIB_LD@
+@@ -108,7 +109,7 @@
  
- LIBTOOL_SHLIB_FLAGS = $(LDFLAGS) @LIBTOOL_SHLIB_FLAGS@
- LIBTOOL_MODULE_FLAGS = $(LDFLAGS) @LIBTOOL_MODULE_FLAGS@
-@@ -124,7 +125,7 @@
- 
- install-python: Mk4py@MODULE_SUFFIX@
- 	$(INSTALL_PROGRAM) Mk4py@MODULE_SUFFIX@ $(DESTDIR)$(pylibdir)
+ install-python: Mk4py$(LIBEXT)
+ 	$(INSTALL_PROGRAM) Mk4py$(LIBEXT) $(DESTDIR)$(pylibdir)
 -	$(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
 +	$(INSTALL_SCRIPT) $(srcdir)/../python/metakit.* $(DESTDIR)$(pylibdir)
  
  clean:
- 	$L rm -f *.la *.o *.lo
+ 	rm -f *$(LIBEXT) *.o
diff --git a/databases/metakit/files/patch-configure b/databases/metakit/files/patch-configure
index 37e417218acf..5998f7f19208 100644
--- a/databases/metakit/files/patch-configure
+++ b/databases/metakit/files/patch-configure
@@ -1,11 +1,17 @@
---- ../unix/configure.orig	Sun Feb 23 12:46:00 2003
-+++ ../unix/configure	Sun Feb 23 12:48:43 2003
-@@ -1526,7 +1526,7 @@
+--- ../unix/configure.orig	2009-01-05 14:01:40.024365003 +0100
++++ ../unix/configure	2009-01-05 14:03:08.152289554 +0100
+@@ -1409,13 +1409,9 @@
+   "no" )
+ 	TCL_INCLUDE_DIR="# no Tcl headers"
    ;;
+-  *","* )
+-	TCL_INCLUDE_DIR="`echo $with_tcl | sed -e 's/,.*$//'`"
+-	TCL_LIB_DIR="`echo $with_tcl | sed -e 's/^.*,//'`"
+-  ;;
    * )
      TCL_INCLUDE_DIR="$with_tcl"
 -    TCL_LIB_DIR="$with_tcl/../lib"
-+    TCL_LIB_DIR="$with_tcl/../../lib/tcl${V}"
++    TCL_LIB_DIR="${TCL_LIBDIR}"
    ;;
  esac
  
diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist
index 146d29a2c80c..ccc8b061c7c3 100644
--- a/databases/metakit/pkg-plist
+++ b/databases/metakit/pkg-plist
@@ -2,19 +2,13 @@ include/mk4.h
 include/mk4.inl
 include/mk4str.h
 include/mk4str.inl
-lib/libmk4.a
-lib/libmk4.la
 lib/libmk4.so.0
 @exec ln -s libmk4.so.0 %D/lib/libmk4.so
 @rmtry lib/libmk4.so
-%%WITH_PYTHON%%lib/libmk4py.a
-%%WITH_PYTHON%%lib/libmk4py.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo
-%%WITH_TCL%%lib/libmk4tcl.a
-%%WITH_TCL%%lib/libmk4tcl.so
 %%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
 %%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
 %%WITH_TCL%%@dirrm lib/tcl%%TCL_V%%/Mk4tcl
@@ -127,6 +121,5 @@ lib/libmk4.so.0
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/Metakit.html
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%