diff options
Diffstat (limited to 'databases/metakit')
| -rw-r--r-- | databases/metakit/Makefile | 66 | ||||
| -rw-r--r-- | databases/metakit/distinfo | 2 | ||||
| -rw-r--r-- | databases/metakit/files/patch-Makefile.in | 29 | ||||
| -rw-r--r-- | databases/metakit/files/patch-aa | 11 | ||||
| -rw-r--r-- | databases/metakit/files/patch-ab | 41 | ||||
| -rw-r--r-- | databases/metakit/files/patch-ac | 15 | ||||
| -rw-r--r-- | databases/metakit/files/patch-ad | 19 | ||||
| -rw-r--r-- | databases/metakit/pkg-plist | 16 |
8 files changed, 98 insertions, 101 deletions
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile index 840ac21ae228..8f5f11c16144 100644 --- a/databases/metakit/Makefile +++ b/databases/metakit/Makefile @@ -6,33 +6,79 @@ # PORTNAME= metakit -PORTVERSION= 2.01 +PORTVERSION= 2.4.1 +PORTREVISION= 31 CATEGORIES= databases python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://www.equi4.com/pub/mk/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-31 -MAINTAINER= rcarter@pinyon.org +MAINTAINER= dinoex@FreeBSD.org +.if !defined(METAKIT_WITHOUT_PYTHON) BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15 RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15 +.endif +.if defined(METAKIT_WITH_TCL) +LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 +.endif -WRKSRC= ${WRKDIR}/${DISTNAME}/builds - +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds USE_LIBTOOL= yes CONFIGURE_SCRIPT= ../unix/configure LIBTOOLFILES= ${CONFIGURE_SCRIPT} INSTALLS_SHLIB= yes +MAKE_ARGS= CXXFLAGS="-Dq4_INLINE ${CFLAGS} -fpermissive" + +.if !defined(METAKIT_WITHOUT_PYTHON) +CONFIGURE_ARGS+= --enable-python +CATEGORIES+= python +PLIST_SUB+= WITH_PYTHON="" +.else +PLIST_SUB+= WITH_PYTHON="@comment " +.endif -CONFIGURE_ARGS= --enable-python -MAKE_ARGS= CXXFLAGS="-Dq4_STD ${CFLAGS} -fpermissive" -ALL_TARGET= all Mk4py.so +.if defined(METAKIT_WITH_TCL) +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.3 +CATEGORIES+= tcl83 +PLIST_SUB+= WITH_TCL="" +.else +PLIST_SUB+= WITH_TCL="@comment " +.endif + +pre-patch: + @${PERL5} -pi -e "s=\@TCL_BIN_DIR\@=${LOCALBASE}/lib=" \ + ${WRKSRC}/../unix/Makefile.in + @${PERL5} -pi -e "s=-ltclstub8.4=-ltclstub83=" \ + ${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/tcl8.3/unix=" \ + ${WRKSRC}/../unix/Makefile.in + @${PERL5} -pi -e "s=doc/==" ${WRKSRC}/../MetaKit.html post-install: - @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so ${PREFIX}/lib/python1.5/site-packages +.if !defined(METAKIT_WITHOUT_PYTHON) + @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so \ + ${PREFIX}/lib/python1.5/site-packages +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/metakit (cd ${WRKSRC}/../doc && ${TAR} -c -f - .) \ | (cd ${PREFIX}/share/doc/metakit && ${TAR} --unlink -x -f -) + ${INSTALL_DATA} ${WRKSRC}/../MetaKit.html ${WRKSRC}/../CHANGES \ + ${WRKSRC}/../README ${WRKSRC}/../WHATSNEW \ + ${PREFIX}/share/doc/metakit +.endif + +test: + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) +.if defined(METAKIT_WITH_TCL) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl) .endif .include <bsd.port.mk> diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo index 70f98493299d..5e9bfd37b344 100644 --- a/databases/metakit/distinfo +++ b/databases/metakit/distinfo @@ -1 +1 @@ -MD5 (metakit-2.01.tar.gz) = 8102ad38c8895cdec4caf89ef43b134b +MD5 (metakit-2.4.1-31.tar.gz) = dc2e2b33737e5ce33c5ef06719082614 diff --git a/databases/metakit/files/patch-Makefile.in b/databases/metakit/files/patch-Makefile.in new file mode 100644 index 000000000000..d66de8044f3b --- /dev/null +++ b/databases/metakit/files/patch-Makefile.in @@ -0,0 +1,29 @@ +--- ../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@ + diff --git a/databases/metakit/files/patch-aa b/databases/metakit/files/patch-aa deleted file mode 100644 index e56b177d859c..000000000000 --- a/databases/metakit/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur ./src/fileio.cpp ../metakit-2.0.new/src/fileio.cpp ---- ../src/fileio.cpp Tue Dec 14 05:05:54 1999 -+++ ../metakit-2.0.new/src/fileio.cpp Sat Dec 25 20:19:15 1999 -@@ -14,6 +14,7 @@ - #endif - - #if q4_UNIX && HAVE_MMAP -+#include <sys/types.h> - #include <sys/mman.h> - #endif - diff --git a/databases/metakit/files/patch-ab b/databases/metakit/files/patch-ab deleted file mode 100644 index 0f7c26be757c..000000000000 --- a/databases/metakit/files/patch-ab +++ /dev/null @@ -1,41 +0,0 @@ ---- ../unix/Makefile.in.orig Fri Mar 17 18:25:27 2000 -+++ ../unix/Makefile.in Sat Jul 29 15:31:03 2000 -@@ -76,15 +76,15 @@ - $(INSTALL_DATA) ../include/mk4str.h $(includedir)/mk4str.h - $(INSTALL_DATA) ../include/mk4str.inl $(includedir)/mk4str.inl - $(INSTALL_DATA) -s libmk4.a $(libdir)/libmk4.a -- $(INSTALL_PROGRAM) -s libmk4.la $(libdir)/libmk4.la -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s libmk4.la $(libdir)/libmk4.la - - install-tcl: libmk4tcl.a libmk4tcl.la - $(INSTALL_DATA) -s libmk4tcl.a $(libdir)/libmk4tcl.a -- $(INSTALL_PROGRAM) -s libmk4tcl.la $(libdir)/libmk4tcl.la -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s libmk4tcl.la $(libdir)/libmk4tcl.la - - install-python: libmk4py.a libmk4py.la - $(INSTALL_DATA) -s libmk4py.a $(libdir)/libmk4py.a -- $(INSTALL_PROGRAM) -s libmk4py.la $(libdir)/libmk4py.la -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s libmk4py.la $(libdir)/libmk4py.la - - clean: - rm -f *.a *.la *.o *.lo *.so -@@ -108,8 +108,8 @@ - config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck - --$(srcdir)/configure: $(srcdir)/configure.in -- cd $(srcdir) && autoconf -+#$(srcdir)/configure: $(srcdir)/configure.in -+# cd $(srcdir) && autoconf - - dist-tar: - rm -rf metakit-$(VERSION) -@@ -150,7 +150,7 @@ - -rpath $(libdir) $(SPYOBJS) $(SHLOBJS) - - Mk4py.so: $(PYOBJS) libmk4.a -- $(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS) -+ $(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS) - - demo: ../demos/demo.cpp libmk4.a - $(LIBTOOL) --mode=link $(CXX) $(CXX_SWITCHES) -o $@ \ diff --git a/databases/metakit/files/patch-ac b/databases/metakit/files/patch-ac deleted file mode 100644 index deba454c7823..000000000000 --- a/databases/metakit/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- ../tcl/mk4tcl.cpp.orig Fri Jul 28 19:40:17 2000 -+++ ../tcl/mk4tcl.cpp Fri Jul 28 19:40:21 2000 -@@ -565,10 +565,12 @@ - #include <fcntl.h> - #include <errno.h> - -+#if !defined(__FreeBSD__) - #define LOCK_SH 1 /* Shared lock. */ - #define LOCK_EX 2 /* Exclusive lock. */ - #define LOCK_UN 8 /* Unlock. */ - #define LOCK_NB 4 /* Don't block when locking. */ -+#endif - - static int my_flock(int fd, int type) - { diff --git a/databases/metakit/files/patch-ad b/databases/metakit/files/patch-ad deleted file mode 100644 index c47c0b6a6937..000000000000 --- a/databases/metakit/files/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ ---- ../unix/configure.orig Fri Mar 17 09:57:30 2000 -+++ ../unix/configure Sun Aug 13 19:45:58 2000 -@@ -652,7 +652,6 @@ - if test x"${ac_cv_c_tclconfig}" = x ; then - TCL_BIN_DIR="# no Tcl configs found" - echo "configure: warning: Can't find Tcl configuration definitions" 1>&2 -- exit 0 - else - TCL_BIN_DIR=${ac_cv_c_tclconfig} - echo "$ac_t""found $TCL_BIN_DIR/tclConfig.sh" 1>&6 -@@ -1594,7 +1593,7 @@ - if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in -- *.c | *.o | *.obj) ;; -+ *.[Cc] | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist index 2f13208ab0ae..aa05ffcaf224 100644 --- a/databases/metakit/pkg-plist +++ b/databases/metakit/pkg-plist @@ -5,10 +5,13 @@ include/mk4str.inl lib/libmk4.a lib/libmk4.so lib/libmk4.so.0 -lib/libmk4py.a -lib/libmk4py.so -lib/libmk4py.so.0 -lib/python1.5/site-packages/Mk4py.so +%%WITH_PYTHON%%lib/libmk4py.a +%%WITH_PYTHON%%lib/libmk4py.so +%%WITH_PYTHON%%lib/libmk4py.so.0 +%%WITH_PYTHON%%lib/python1.5/site-packages/Mk4py.so +%%WITH_TCL%%lib/libmk4tcl.a +%%WITH_TCL%%lib/libmk4tcl.so +%%WITH_TCL%%lib/libmk4tcl.so.0 %%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 @@ -110,9 +113,14 @@ lib/python1.5/site-packages/Mk4py.so %%PORTDOCS%%share/doc/metakit/api/tips.html %%PORTDOCS%%share/doc/metakit/e4s.gif %%PORTDOCS%%share/doc/metakit/format.html +%%PORTDOCS%%share/doc/metakit/metakit.png %%PORTDOCS%%share/doc/metakit/python.html %%PORTDOCS%%share/doc/metakit/python.jpg %%PORTDOCS%%share/doc/metakit/tcl.gif %%PORTDOCS%%share/doc/metakit/tcl.html +%%PORTDOCS%%share/doc/metakit/CHANGES +%%PORTDOCS%%share/doc/metakit/MetaKit.html +%%PORTDOCS%%share/doc/metakit/README +%%PORTDOCS%%share/doc/metakit/WHATSNEW %%PORTDOCS%%@dirrm share/doc/metakit/api %%PORTDOCS%%@dirrm share/doc/metakit |