pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc resolve the CONFLICT between tdb and samba - make samb...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a5714f3e96e4
branches: trunk
changeset: 610576:a5714f3e96e4
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Oct 30 13:24:31 2012 +0000
description:
resolve the CONFLICT between tdb and samba - make sambe use
an external libtdb instead of the internal duplicate
diffstat:
databases/tdb/Makefile | 17 ++++--
databases/tdb/PLIST | 24 ++++-----
databases/tdb/distinfo | 11 +--
databases/tdb/patches/patch-aa | 100 -----------------------------------------
databases/tdb/patches/patch-ab | 32 -------------
databases/tdb/patches/patch-ac | 45 ------------------
net/samba/Makefile | 15 ++++-
net/samba/PLIST | 16 +------
net/samba/buildlink3.mk | 3 +-
9 files changed, 40 insertions(+), 223 deletions(-)
diffs (truncated from 406 to 300 lines):
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/Makefile
--- a/databases/tdb/Makefile Tue Oct 30 12:54:15 2012 +0000
+++ b/databases/tdb/Makefile Tue Oct 30 13:24:31 2012 +0000
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.15 2012/10/02 21:25:54 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/30 13:24:31 drochner Exp $
#
-DISTNAME= tdb-1.0.6
-PKGREVISION= 2
+DISTNAME= tdb-1.2.10
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tdb/}
+MASTER_SITES= http://www.samba.org/ftp/tdb/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://sourceforge.net/projects/tdb/
COMMENT= Small database system which uses files to store data
# both install tdbtool and tdbdump
-CONFLICTS+= samba-[0-9]*
+CONFLICTS+= samba<3.6.6nb3
GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --disable-python
USE_TOOLS+= gmake
-USE_LIBTOOL= YES
+
+PKGCONFIG_OVERRIDE= tdb.pc.in
+PYTHON_FOR_BUILD_ONLY= yes
+REPLACE_PYTHON+= buildtools/bin/waf
+
+.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/PLIST
--- a/databases/tdb/PLIST Tue Oct 30 12:54:15 2012 +0000
+++ b/databases/tdb/PLIST Tue Oct 30 13:24:31 2012 +0000
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/30 13:24:31 drochner Exp $
+bin/tdbbackup
bin/tdbdump
+bin/tdbrestore
bin/tdbtool
include/tdb.h
-lib/libtdb.la
-man/man3/tdb.3
-man/man3/tdb_chainlock.3
-man/man3/tdb_close.3
-man/man3/tdb_delete.3
-man/man3/tdb_error.3
-man/man3/tdb_exists.3
-man/man3/tdb_fetch.3
-man/man3/tdb_firstkey.3
-man/man3/tdb_open.3
-man/man3/tdb_store.3
-man/man3/tdb_traverse.3
+lib/libtdb.so
+lib/libtdb.so.1
+lib/libtdb.so.${PKGVERSION}
+lib/pkgconfig/tdb.pc
+man/man8/tdbbackup.8
+man/man8/tdbdump.8
+man/man8/tdbrestore.8
+man/man8/tdbtool.8
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/distinfo
--- a/databases/tdb/distinfo Tue Oct 30 12:54:15 2012 +0000
+++ b/databases/tdb/distinfo Tue Oct 30 13:24:31 2012 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:33:10 agc Exp $
+$NetBSD: distinfo,v 1.4 2012/10/30 13:24:31 drochner Exp $
-SHA1 (tdb-1.0.6.tar.gz) = d1876522f1b8ffa8cf844a1f6605e0c32d387a7a
-RMD160 (tdb-1.0.6.tar.gz) = 5163caf1cc76c9f3a69e88f7438ecd98ec5e52cf
-Size (tdb-1.0.6.tar.gz) = 139948 bytes
-SHA1 (patch-aa) = 7af794ccbaeab55f4d44f41212ca881dd169506e
-SHA1 (patch-ab) = dbe92ea1facfb3d601a7ce1a9b7f9a25e0c879cc
-SHA1 (patch-ac) = 3a8da4fd18724ba54f593a27adbe9cdfd012f255
+SHA1 (tdb-1.2.10.tar.gz) = 0f2bb5f9a633ca1a8e172152a031e1dacc26a118
+RMD160 (tdb-1.2.10.tar.gz) = 651ec3b898d6e115bc9ca284eeede0b93b269e68
+Size (tdb-1.2.10.tar.gz) = 497924 bytes
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/patches/patch-aa
--- a/databases/tdb/patches/patch-aa Tue Oct 30 12:54:15 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/29 19:19:12 jmmv Exp $
-
---- configure.orig Tue Dec 11 05:06:33 2001
-+++ configure
-@@ -1592,95 +1592,8 @@ else
- fi
-
-
--echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
--echo "configure:1597: checking for gdbm_open in -lgdbm" >&5
--ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lgdbm $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1605 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gdbm_open();
--
--int main() {
--gdbm_open()
--; return 0; }
--EOF
--if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- have_gdbm=true
--else
-- echo "$ac_t""no" 1>&6
- have_gdbm=false
--fi
--
--if test "x$have_gdbm" = "xfalse";then
-- echo "configure: warning: WARNING: tdbtest is disabled. It needs gdbm." 1>&2
--fi
--echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:1641: checking for dlopen in -ldl" >&5
--ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-ldl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1649 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- have_dllib=true
--else
-- echo "$ac_t""no" 1>&6
- have_dllib=false
--fi
--
--if test "x$have_dllib" = "xfalse";then
-- echo "configure: warning: WARNING: tdbtorture is disabled. It needs libdl." 1>&2
--fi
--
-
-
- if $have_gdbm; then
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/patches/patch-ab
--- a/databases/tdb/patches/patch-ab Tue Oct 30 12:54:15 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/11/29 19:19:12 jmmv Exp $
-
---- Makefile.in.orig Tue Dec 11 05:08:49 2001
-+++ Makefile.in
-@@ -80,7 +80,6 @@ LDADD = libtdb.la
- @BUILD_TDBTORTURE_TRUE@TDBTORTURE = tdbtorture
- @BUILD_TDBTORTURE_FALSE@TDBTORTURE =
-
--noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
- bin_PROGRAMS = tdbtool tdbdump
-
- lib_LTLIBRARIES = libtdb.la
-@@ -115,7 +114,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- libtdb_la_LIBADD =
- libtdb_la_OBJECTS = tdb.lo spinlock.lo
--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS = $(bin_PROGRAMS)
-
- tdbtool_OBJECTS = tdbtool.o
- tdbtool_LDADD = $(LDADD)
-@@ -159,8 +158,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES) $(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES) $(tdbtorture_SOURCES)
--OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS) $(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS) $(tdbtorture_OBJECTS)
-+SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES)
-+OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS)
-
- all: all-redirect
- .SUFFIXES:
diff -r b58b06716396 -r a5714f3e96e4 databases/tdb/patches/patch-ac
--- a/databases/tdb/patches/patch-ac Tue Oct 30 12:54:15 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/07/17 20:37:51 jmmv Exp $
-
---- tdbtool.c.orig 2001-12-11 04:45:47.000000000 +0100
-+++ tdbtool.c
-@@ -169,23 +169,23 @@ static void print_data(unsigned char *bu
-
- static void help(void)
- {
-- printf("
--tdbtool:
-- create dbname : create a database
-- open dbname : open an existing database
-- erase : erase the database
-- dump dumpname : dump the database as strings
-- insert key data : insert a record
-- store key data : store a record (replace)
-- show key : show a record by key
-- delete key : delete a record by key
-- list : print the database hash table and freelist
-- free : print the database freelist
-- 1 | first : print the first record
-- n | next : print the next record
-- q | quit : terminate
-- \\n : repeat 'next' command
--");
-+ printf("\n" \
-+"tdbtool:\n" \
-+" create dbname : create a database\n" \
-+" open dbname : open an existing database\n" \
-+" erase : erase the database\n" \
-+" dump dumpname : dump the database as strings\n" \
-+" insert key data : insert a record\n" \
-+" store key data : store a record (replace)\n" \
-+" show key : show a record by key\n" \
-+" delete key : delete a record by key\n" \
-+" list : print the database hash table and freelist\n" \
-+" free : print the database freelist\n" \
-+" 1 | first : print the first record\n" \
-+" n | next : print the next record\n" \
-+" q | quit : terminate\n" \
-+" \\n : repeat 'next' command\n" \
-+);
- }
-
- static void terror(char *why)
diff -r b58b06716396 -r a5714f3e96e4 net/samba/Makefile
--- a/net/samba/Makefile Tue Oct 30 12:54:15 2012 +0000
+++ b/net/samba/Makefile Tue Oct 30 13:24:31 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.223 2012/10/23 17:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.224 2012/10/30 13:24:32 drochner Exp $
.include "../../net/samba/Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
@@ -13,7 +13,7 @@
LICENSE= gnu-gpl-v3
VERSION= 3.6.6
-CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
+CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
FILESDIR= ${PKGDIR}/../../net/samba/files
DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR
@@ -46,7 +46,7 @@
# mktemp is useful for the replacement adduser script, but don't require
# a full dependency since it's not actually needed by samba.
-USE_TOOLS+= gmake mktemp perl:run
Home |
Main Index |
Thread Index |
Old Index