CVS commit: pkgsrc

["Matthias Drochner" <drochner%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   drochner
Date:           Tue Oct 30 13:24:32 UTC 2012

Modified Files:
        pkgsrc/databases/tdb: Makefile PLIST distinfo
        pkgsrc/net/samba: Makefile PLIST buildlink3.mk
Removed Files:
        pkgsrc/databases/tdb/patches: patch-aa patch-ab patch-ac

Log Message:
resolve the CONFLICT between tdb and samba - make sambe use
an external libtdb instead of the internal duplicate


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/tdb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/tdb/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/tdb/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/databases/tdb/patches/patch-aa \
    pkgsrc/databases/tdb/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/tdb/patches/patch-ac
cvs rdiff -u -r1.223 -r1.224 pkgsrc/net/samba/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/samba/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/samba/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.