diff options
author | timur <timur@FreeBSD.org> | 2011-08-02 04:05:57 +0800 |
---|---|---|
committer | timur <timur@FreeBSD.org> | 2011-08-02 04:05:57 +0800 |
commit | 39c5925d55128f91a05952d2f9eacf1a17b42473 (patch) | |
tree | 4c69cfbf66c2a762ac187b87d5c42fc9d95c3232 /databases/tdb | |
parent | 12d20004ce1d268f76d43b7430f25c3b2a3a7d57 (diff) | |
download | freebsd-ports-graphics-39c5925d55128f91a05952d2f9eacf1a17b42473.tar.gz freebsd-ports-graphics-39c5925d55128f91a05952d2f9eacf1a17b42473.tar.zst freebsd-ports-graphics-39c5925d55128f91a05952d2f9eacf1a17b42473.zip |
Update to version 1.2.9
Diffstat (limited to 'databases/tdb')
-rw-r--r-- | databases/tdb/Makefile | 73 | ||||
-rw-r--r-- | databases/tdb/distinfo | 4 | ||||
-rw-r--r-- | databases/tdb/files/patch-buildtools__wafsamba__samba_install.py | 11 | ||||
-rw-r--r-- | databases/tdb/files/patch-tdb.mk | 68 | ||||
-rw-r--r-- | databases/tdb/files/patch-wscript | 11 | ||||
-rw-r--r-- | databases/tdb/files/tdbbackup.8 | 4 | ||||
-rw-r--r-- | databases/tdb/files/tdbdump.8 | 4 | ||||
-rw-r--r-- | databases/tdb/files/tdbrestore.8 | 45 | ||||
-rw-r--r-- | databases/tdb/files/tdbtool.8 | 4 |
9 files changed, 131 insertions, 93 deletions
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 60688155d18..ef80de965b7 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tdb -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.2.9 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \ @@ -20,42 +20,81 @@ COMMENT= Trivial Database CONFLICTS= *samba3[0-4]-3.* -USE_PYTHON= yes -USE_GMAKE= yes +USE_PYTHON_BUILD= yes USE_LDCONFIG= yes -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes +WAF_TOOL= buildtools/bin/waf +CONFIGURE_SCRIPT= ${WAF_TOOL} configure USE_GNOME= pkgconfig -USE_AUTOTOOLS= autoconf autoheader LICENSE= GPLv3 MAKE_JOBS_SAFE= yes -IPATHS= -I${WRKSRC}/libreplace -AUTOHEADER_ARGS= ${IPATHS} -AUTOCONF_ARGS= ${IPATHS} PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig -PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||} -PYTHON_SITELIBDIR_REL?= ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||} +PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" +OPTIONS= PYTHON "Python bindings" on + +.include <bsd.port.options.mk> MAN8= tdbbackup.8 \ tdbdump.8 \ + tdbrestore.8 \ tdbtool.8 PLIST_FILES= bin/tdbbackup \ bin/tdbdump \ + bin/tdbrestore \ bin/tdbtool \ include/tdb.h \ - lib/libtdb.a \ lib/libtdb.so \ lib/libtdb.so.1 \ - ${PKGCONFIGDIR_REL}/tdb.pc \ - ${PYTHON_SITELIBDIR_REL}/tdb.so + %%PKGCONFIGDIR%%/tdb.pc + +CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" +CONFIGURE_ENV+= NOCOLOR=yes +MAKE_ENV+= NOCOLOR=yes + +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man + +.if !defined(DISABLE_MAKE_JOBS) +CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} +_MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER} +.endif -pre-install: +.if defined(WITH_PYTHON) +USE_PYTHON_RUN= yes +PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so +PLIST_DIRSTRY+= %%PYTHON_SITELIBDIR%% \ + %%PYTHON_LIBDIR%% +.else +CONFIGURE_ARGS+= --disable-python +.endif + +ALL_TARGET= build +INSTALL_TARGET= install + +post-patch: + @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ + ${WRKSRC}/wscript + +pre-build: .for man in ${MAN8} - @${INSTALL_MAN} ${FILESDIR}/${man} ${WRKSRC}/manpages + @${MKDIR} ${BUILD_WRKSRC}/bin/default/manpages + @${INSTALL_MAN} ${FILESDIR}/${man} ${BUILD_WRKSRC}/bin/default/manpages .endfor +do-build: + @(cd ${BUILD_WRKSRC}; \ + if ! ${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \ + if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ + ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ + (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + fi; \ + ${FALSE}; \ + fi) + +do-install: + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install) + .include <bsd.port.mk> diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index ba295d26b66..39a56027a75 100644 --- a/databases/tdb/distinfo +++ b/databases/tdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdb-1.2.1.tar.gz) = ef423b934c5ddfeddaa3d3b1567072b0d6f7243bbae5fd363a1b090b0573cdfa -SIZE (tdb-1.2.1.tar.gz) = 268142 +SHA256 (tdb-1.2.9.tar.gz) = 886fbca71710b9fcf168ffcae47f05a6c3ff3392cf951f4cb1f949851c04f9ed +SIZE (tdb-1.2.9.tar.gz) = 368475 diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py new file mode 100644 index 00000000000..db564bd2376 --- /dev/null +++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py @@ -0,0 +1,11 @@ +--- buildtools/wafsamba/samba_install.py.orig 2010-12-21 02:00:02.000000000 +0100 ++++ buildtools/wafsamba/samba_install.py 2011-06-21 11:46:28.000000000 +0200 +@@ -109,7 +109,7 @@ + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) + inst_name = bld.make_libname(t.target) + if not self.private_library: diff --git a/databases/tdb/files/patch-tdb.mk b/databases/tdb/files/patch-tdb.mk deleted file mode 100644 index 889f4479c37..00000000000 --- a/databases/tdb/files/patch-tdb.mk +++ /dev/null @@ -1,68 +0,0 @@ ---- tdb.mk.orig 2010-02-08 16:12:57.000000000 +0100 -+++ tdb.mk 2010-10-29 14:36:26.000000000 +0200 -@@ -5,8 +5,7 @@ - PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT) - ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) - --TDB_SONAME = libtdb.$(SHLIBEXT).1 --TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION) -+TDB_SOLIB = libtdb.$(SHLIBEXT).1 - TDB_STLIB = libtdb.a - - TDB_LIB = $(TDB_STLIB) -@@ -28,7 +27,7 @@ - - test:: abi_checks - --test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME) -+test:: bin/tdbtorture$(EXEEXT) $(TDB_SOLIB) - $(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT) - - abi_checks:: -@@ -37,7 +36,7 @@ - - clean:: - rm -f test.db test.tdb torture.tdb test.gdbm -- rm -f $(TDB_SONAME) $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT) -+ rm -f $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT) - rm -f $(ALL_PROGS) tdb.pc - rm -f tdb.exports.sort tdb.exports.check tdb.exports.check.sort - rm -f tdb.signatures.sort tdb.signatures.check tdb.signatures.check.sort -@@ -70,7 +69,7 @@ - mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - cp tdb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - --check-python:: build-python $(TDB_SONAME) -+check-python:: build-python $(TDB_SOLIB) - $(LIB_PATH_VAR)=. PYTHONPATH=".:$(tdbdir)" $(PYTHON) $(tdbdir)/python/tests/simple.py - - clean:: -@@ -80,7 +79,7 @@ - mkdir -p $(DESTDIR)$(bindir) - mkdir -p $(DESTDIR)$(includedir) - mkdir -p $(DESTDIR)$(libdir) -- mkdir -p $(DESTDIR)$(libdir)/pkgconfig -+ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig - - installbin:: all installdirs - cp $(PROGS) $(DESTDIR)$(bindir) -@@ -89,18 +88,13 @@ - cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir) - - installlibs:: all installdirs -- cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig -+ cp tdb.pc $(DESTDIR)$(prefix)/libdata/pkgconfig - cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir) - rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) - ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) -- rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) -- ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) - - $(TDB_STLIB): $(TDB_OBJ) - ar -rv $(TDB_STLIB) $(TDB_OBJ) - - libtdb.$(SHLIBEXT): $(TDB_SOLIB) - ln -fs $< $@ -- --$(TDB_SONAME): $(TDB_SOLIB) -- ln -fs $< $@ diff --git a/databases/tdb/files/patch-wscript b/databases/tdb/files/patch-wscript new file mode 100644 index 00000000000..562ac55ec28 --- /dev/null +++ b/databases/tdb/files/patch-wscript @@ -0,0 +1,11 @@ +--- ./wscript.orig 2011-04-05 03:59:59.000000000 +0200 ++++ ./wscript 2011-04-05 04:00:57.000000000 +0200 +@@ -63,7 +63,7 @@ + io.c open.c transaction.c hash.c summary.c''') + + if bld.env.standalone_tdb: +- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' ++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' + bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) + bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) + private_library = False diff --git a/databases/tdb/files/tdbbackup.8 b/databases/tdb/files/tdbbackup.8 index fc554c80de1..c378bb1288d 100644 --- a/databases/tdb/files/tdbbackup.8 +++ b/databases/tdb/files/tdbbackup.8 @@ -2,12 +2,12 @@ .\" Title: tdbbackup .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 10/26/2010 +.\" Date: 03/29/2011 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBBACKUP" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" +.TH "TDBBACKUP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/databases/tdb/files/tdbdump.8 b/databases/tdb/files/tdbdump.8 index 59c11edb530..e62e261b88c 100644 --- a/databases/tdb/files/tdbdump.8 +++ b/databases/tdb/files/tdbdump.8 @@ -2,12 +2,12 @@ .\" Title: tdbdump .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 10/26/2010 +.\" Date: 03/29/2011 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBDUMP" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" +.TH "TDBDUMP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/databases/tdb/files/tdbrestore.8 b/databases/tdb/files/tdbrestore.8 new file mode 100644 index 00000000000..15217248250 --- /dev/null +++ b/databases/tdb/files/tdbrestore.8 @@ -0,0 +1,45 @@ +'\" t +.\" Title: tdbrestore +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 03/29/2011 +.\" Manual: System Administration tools +.\" Source: Samba 3.6 +.\" Language: English +.\" +.TH "TDBRESTORE" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +tdbrestore \- tool for creating a TDB file out of a tdbdump output +.SH "SYNOPSIS" +.HP \w'\fBtdbrestore\fR\ 'u +\fBtdbrestore\fR {tdbfilename} +.SH "DESCRIPTION" +.PP +This tool is part of the +\fBsamba\fR(1) +suite\&. +.PP +\fBtdbrestore\fR +is a very simple utility that \'restores\' the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&. +.PP +This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename parameter\&. +.PP +This tool can be used for unpacking the content of tdb as backup mean\&. +.SH "VERSION" +.PP +This man page is correct for version 3 of the Samba suite\&. +.SH "AUTHOR" +.PP +The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. This tool was initially written by Volker Lendecke based on an idea by Simon McVittie\&. +.PP +The tdbrestore man page was written by Matthieu Patou\&. diff --git a/databases/tdb/files/tdbtool.8 b/databases/tdb/files/tdbtool.8 index 91944321a5c..dcb40fcf52c 100644 --- a/databases/tdb/files/tdbtool.8 +++ b/databases/tdb/files/tdbtool.8 @@ -2,12 +2,12 @@ .\" Title: tdbtool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 10/26/2010 +.\" Date: 03/29/2011 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBTOOL" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" +.TH "TDBTOOL" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- |