Fri Feb 8 22:25:32 2019 UTC ()
databases/lbdb: update to 0.48.1

Fix PR pkg/53953


(tonio)
diff -r1.33 -r1.34 pkgsrc/databases/lbdb/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/lbdb/PLIST
diff -r1.13 -r1.14 pkgsrc/databases/lbdb/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/lbdb/options.mk
diff -r1.4 -r1.5 pkgsrc/databases/lbdb/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/databases/lbdb/patches/patch-ab
diff -r1.1 -r0 pkgsrc/databases/lbdb/patches/patch-mutt__ldap__query.pl.in
cvs diff -r1.33 -r1.34 pkgsrc/databases/lbdb/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/Makefile 2018/08/22 09:43:11 1.33
+++ pkgsrc/databases/lbdb/Makefile 2019/02/08 22:25:32 1.34
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile,v 1.33 2018/08/22 09:43:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2019/02/08 22:25:32 tonio Exp $
2 2
3DISTNAME= lbdb_0.35.1 3DISTNAME= lbdb_0.48.1
4PKGNAME= ${DISTNAME:S/_/-/} 4PKGNAME= ${DISTNAME:S/_/-/}
5PKGREVISION= 6 
6CATEGORIES= databases 5CATEGORIES= databases
7MASTER_SITES= http://www.spinnaker.de/debian/ 6MASTER_SITES= http://www.spinnaker.de/lbdb/download/
8 7
9MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://www.spinnaker.de/lbdb/ 9HOMEPAGE= http://www.spinnaker.de/lbdb/
11COMMENT= The little brother's database 10COMMENT= The little brother's database
 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap 13DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= gmake perl:run 16USE_TOOLS+= gmake perl:run
17 17
18GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb 18GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --enable-lbdb_dotlock 20CONFIGURE_ARGS+= --enable-lbdb_dotlock
21CONFIGURE_ARGS+= --without-getent 21CONFIGURE_ARGS+= --without-getent
22CONFIGURE_ARGS+= --without-evolution-addressbook-export 22CONFIGURE_ARGS+= --without-evolution-addressbook-export
23CONFIGURE_ARGS+= --without-pgp 23CONFIGURE_ARGS+= --without-pgp
24CONFIGURE_ARGS+= --without-pgpk 24CONFIGURE_ARGS+= --without-pgpk
25 25
26CONFIGURE_ENV+= SH=${TOOLS_SH:Q} 26CONFIGURE_ENV+= SH=${TOOLS_SH}
27CONFIGURE_ENV+= AWK=${TOOLS_AWK:Q} 27CONFIGURE_ENV+= AWK=${TOOLS_AWK}
28CONFIGURE_ENV+= ac_cv_path_TAC=NONE 28CONFIGURE_ENV+= ac_cv_path_TAC=NONE
29 29
30.include "options.mk" 30.include "options.mk"
31 31
32WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 32WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
33 33
34EGDIR= ${PREFIX}/share/examples/lbdb 34EGDIR= ${PREFIX}/share/examples/lbdb
35CONF_FILES+= ${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc 35CONF_FILES+= ${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc
36CONF_FILES+= ${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc 36CONF_FILES+= ${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc
37 37
38PLIST_VARS+= finger 38PLIST_VARS+= finger
39.if ${OPSYS} != "SunOS" || exists(/usr/bin/finger) 39.if ${OPSYS} != "SunOS" || exists(/usr/bin/finger)
40PLIST.finger= yes 40PLIST.finger= yes
41.endif 41.endif
42 42
43PLIST_VARS+= yp 43PLIST_VARS+= yp
44.if ${OPSYS} != "Interix" 44.if ${OPSYS} != "Interix" && exists(/usr/bin/yppasswd)
45PLIST.yp= yes 45PLIST.yp= yes
46.endif 46.endif
47 47
48INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR} 48INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR}
49 49
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/databases/lbdb/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/PLIST 2018/01/01 22:29:22 1.7
+++ pkgsrc/databases/lbdb/PLIST 2019/02/08 22:25:32 1.8
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1@comment $NetBSD: PLIST,v 1.7 2018/01/01 22:29:22 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/02/08 22:25:32 tonio Exp $
2bin/lbdb-fetchaddr 2bin/lbdb-fetchaddr
3bin/lbdb_dotlock 3bin/lbdb_dotlock
4bin/lbdbq 4bin/lbdbq
5bin/nodelist2lbdb 5bin/nodelist2lbdb
6${PLIST.osx-addressbook}libexec/lbdb/ABQuery 6${PLIST.osx-addressbook}libexec/lbdb/ABQuery
7libexec/lbdb/fetchaddr 7libexec/lbdb/fetchaddr
8libexec/lbdb/lbdb-munge 8libexec/lbdb/lbdb-munge
9libexec/lbdb/lbdb_bbdb_query.el 9libexec/lbdb/lbdb_bbdb_query.el
10libexec/lbdb/lbdb_lib 10libexec/lbdb/lbdb_lib
11${PLIST.abook}libexec/lbdb/m_abook 11${PLIST.abook}libexec/lbdb/m_abook
12libexec/lbdb/m_bbdb 12libexec/lbdb/m_bbdb
13libexec/lbdb/m_fido 13libexec/lbdb/m_fido
14${PLIST.finger}libexec/lbdb/m_finger 14${PLIST.finger}libexec/lbdb/m_finger
15libexec/lbdb/m_gnomecard 15libexec/lbdb/m_gnomecard
16${PLIST.gnupg}libexec/lbdb/m_gpg 16${PLIST.gnupg}libexec/lbdb/m_gpg
17libexec/lbdb/m_inmail 17libexec/lbdb/m_inmail
18libexec/lbdb/m_ldap 18libexec/lbdb/m_ldap
19libexec/lbdb/m_muttalias 19libexec/lbdb/m_muttalias
20${PLIST.osx-addressbook}libexec/lbdb/m_osx_addressbook 20${PLIST.osx-addressbook}libexec/lbdb/m_osx_addressbook
21libexec/lbdb/m_palm 21libexec/lbdb/m_palm
22libexec/lbdb/m_passwd 22libexec/lbdb/m_passwd
23libexec/lbdb/m_pine 23libexec/lbdb/m_pine
24libexec/lbdb/m_wanderlust 24libexec/lbdb/m_wanderlust
25${PLIST.yp}libexec/lbdb/m_yppasswd 25${PLIST.yp}libexec/lbdb/m_yppasswd
26libexec/lbdb/munge 26libexec/lbdb/munge
27libexec/lbdb/munge-keeporder 
28libexec/lbdb/mutt_ldap_query 27libexec/lbdb/mutt_ldap_query
29libexec/lbdb/palm_lsaddr 28libexec/lbdb/palm_lsaddr
30libexec/lbdb/qpto8bit 29libexec/lbdb/qpto8bit
31libexec/lbdb/tac 30libexec/lbdb/tac
32man/man1/lbdb-fetchaddr.1 31man/man1/lbdb-fetchaddr.1
33man/man1/lbdb_dotlock.1 32man/man1/lbdb_dotlock.1
34man/man1/lbdbq.1 33man/man1/lbdbq.1
35man/man1/mutt_ldap_query.1 34man/man1/mutt_ldap_query.1
36man/man1/nodelist2lbdb.1 35man/man1/nodelist2lbdb.1
37share/examples/lbdb/lbdb.rc 36share/examples/lbdb/lbdb.rc
38share/examples/lbdb/lbdb_ldap.rc 37share/examples/lbdb/lbdb_ldap.rc
cvs diff -r1.13 -r1.14 pkgsrc/databases/lbdb/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/distinfo 2015/11/03 01:56:13 1.13
+++ pkgsrc/databases/lbdb/distinfo 2019/02/08 22:25:32 1.14
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 01:56:13 agc Exp $ 1$NetBSD: distinfo,v 1.14 2019/02/08 22:25:32 tonio Exp $
2 2
3SHA1 (lbdb_0.35.1.tar.gz) = 33c7767b248cc4289894e0a4b07ed55142484ecc 3SHA1 (lbdb_0.48.1.tar.gz) = ae81fee4c46d3680aa6ad5434efcc4db371c3165
4RMD160 (lbdb_0.35.1.tar.gz) = 1c202c532db93f3dec066b762f75a28e37d01d1a 4RMD160 (lbdb_0.48.1.tar.gz) = 4e458585c22826b962089412d55ddf0005eb9160
5SHA512 (lbdb_0.35.1.tar.gz) = 36788000977004fde45b9193c06a53eac88593de3a0817eb00b635ee9a980eebd29d5f2a23e083fda9c9e2e9db6ccc00d0abb8977f4e51a5955cda53c744c539 5SHA512 (lbdb_0.48.1.tar.gz) = 47d35caa88634f0f98e08e58d9920a44012ee51203dd765a716147b717e76b95cc1a07cd149b569800d5f97e78a7367f35a4e6298fc2bf33fa2f2988db87771e
6Size (lbdb_0.35.1.tar.gz) = 108502 bytes 6Size (lbdb_0.48.1.tar.gz) = 183538 bytes
7SHA1 (patch-aa) = c74a4d95037e9d5e5cc0742e5f05ef80a35db5e6 7SHA1 (patch-aa) = f8adad394d424f99558de35e83f5c2b216799ebb
8SHA1 (patch-ab) = 7120edcd8588f2195b5c1afbb127245b182eb533 8SHA1 (patch-ab) = 6bb9767cab2c4291e64da8a7ab9b07048b50ce99
9SHA1 (patch-mutt__ldap__query.pl.in) = f7e4fd16edac8dab9971af453caf14414d39493c 
cvs diff -r1.3 -r1.4 pkgsrc/databases/lbdb/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/options.mk 2008/04/12 22:42:59 1.3
+++ pkgsrc/databases/lbdb/options.mk 2019/02/08 22:25:32 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $ 1# $NetBSD: options.mk,v 1.4 2019/02/08 22:25:32 tonio Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.lbdb 3PKG_OPTIONS_VAR= PKG_OPTIONS.lbdb
4PKG_SUPPORTED_OPTIONS= osx-addressbook gnupg abook 4PKG_SUPPORTED_OPTIONS= osx-addressbook gnupg abook
5PKG_SUGGESTED_OPTIONS= gnupg abook 5PKG_SUGGESTED_OPTIONS= gnupg abook
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= osx-addressbook gnupg abook 9PLIST_VARS+= osx-addressbook gnupg abook
10 10
11.if !empty(PKG_OPTIONS:Mosx-addressbook) 11.if !empty(PKG_OPTIONS:Mosx-addressbook)
12CONFIGURE_ARGS+= --with-osx-addressbook 12CONFIGURE_ARGS+= --with-osx-addressbook
13PLIST.osx-addressbook= yes 13PLIST.osx-addressbook= yes
14.else 14.else
15CONFIGURE_ARGS+= --without-osx-addressbook 15CONFIGURE_ARGS+= --without-osx-addressbook
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mgnupg) 18.if !empty(PKG_OPTIONS:Mgnupg)
cvs diff -r1.4 -r1.5 pkgsrc/databases/lbdb/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/patches/patch-aa 2005/11/12 17:43:42 1.4
+++ pkgsrc/databases/lbdb/patches/patch-aa 2019/02/08 22:25:32 1.5
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1$NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $ 1$NetBSD: patch-aa,v 1.5 2019/02/08 22:25:32 tonio Exp $
 2Adjust the Makefile to use the example directory.
2 3
3--- Makefile.in.orig 2005-10-29 16:48:08.000000000 +0200 4--- Makefile.in.orig 2019-01-07 18:30:29.000000000 +0000
4+++ Makefile.in 5+++ Makefile.in
5@@ -39,6 +39,7 @@ srcdir=@srcdir@ 6@@ -38,6 +38,7 @@ srcdir=@srcdir@
6 libdir=@libdir@ 7 libdir=@libdir@
7 mandir=@mandir@ 8 mandir=@mandir@
8 sysconfdir=@sysconfdir@ 9 sysconfdir=@sysconfdir@
9+egdir=@prefix@/share/examples/lbdb 10+egdir=@prefix@/share/examples/lbdb
10  11
11 ALL=lbdbq lbdb_lib lbdb-fetchaddr lbdb-munge fetchaddr qpto8bit munge \ 12 SUBDIRS=tests
12 munge-keeporder nodelist2lbdb palm_lsaddr mutt_ldap_query lbdbq.man \ 13
13@@ -50,7 +51,7 @@ all: Makefile $(ALL) 14@@ -62,7 +63,7 @@ test_perl:
14 install: all 15 install: all
15 $(srcdir)/mkinstalldirs $(install_prefix)$(bindir) 16 $(srcdir)/mkinstalldirs $(install_prefix)$(bindir)
16 $(srcdir)/mkinstalldirs $(install_prefix)$(libdir) 17 $(srcdir)/mkinstalldirs $(install_prefix)$(libdir)
17- $(srcdir)/mkinstalldirs $(install_prefix)$(sysconfdir) 18- $(srcdir)/mkinstalldirs $(install_prefix)$(sysconfdir)
18+ $(srcdir)/mkinstalldirs $(install_prefix)$(egdir) 19+ $(srcdir)/mkinstalldirs $(install_prefix)$(egdir)
19 $(srcdir)/mkinstalldirs $(install_prefix)$(mandir) 20 $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)
20 $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1 21 $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1
21 $(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir) 22 $(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir)
22@@ -71,7 +72,7 @@ install: all 23@@ -82,7 +83,7 @@ install: all
23 $(INSTALL) -m 644 mutt_ldap_query.man \ 24 $(INSTALL) -m 644 mutt_ldap_query.man \
24 $(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \ 25 $(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \
25 $(INSTALL) -m 644 lbdb_ldap.rc \ 26 $(INSTALL) -m 644 lbdb_ldap.rc \
26- $(install_prefix)$(sysconfdir)/lbdb_ldap.rc; \ 27- $(install_prefix)$(sysconfdir)/lbdb_ldap.rc; \
27+ $(install_prefix)$(egdir)/lbdb_ldap.rc; \ 28+ $(install_prefix)$(egdir)/lbdb_ldap.rc; \
28 fi 29 fi
29 if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \ 30 if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \
30 $(INSTALL) -m 755 ABQuery/sym/ABQuery $(install_prefix)$(libdir); \ 31 $(INSTALL) -m 755 ABQuery $(install_prefix)$(libdir); \
31@@ -85,7 +86,7 @@ install: all 32@@ -96,7 +97,7 @@ install: all
32 $(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1 33 $(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1
33 $(INSTALL) -m 644 lbdb-fetchaddr.man \ 34 $(INSTALL) -m 644 lbdb-fetchaddr.man \
34 $(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1 35 $(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1
35- $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(sysconfdir)/lbdb.rc 36- $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(sysconfdir)/lbdb.rc
36+ $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(egdir)/lbdb.rc 37+ $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(egdir)/lbdb.rc
37 if [ "$(DOTLOCK_TARGET)" != "" ]; then \ 38 if [ "$(DOTLOCK_TARGET)" != "" ]; then \
38 $(INSTALL) -m 755 lbdb_dotlock $(install_prefix)$(bindir); \ 39 $(INSTALL) -m 755 lbdb_dotlock $(install_prefix)$(bindir); \
39 $(INSTALL) -m 644 dotlock.man \ 40 $(INSTALL) -m 644 dotlock.man \
cvs diff -r1.4 -r1.5 pkgsrc/databases/lbdb/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/lbdb/patches/patch-ab 2005/11/12 18:06:43 1.4
+++ pkgsrc/databases/lbdb/patches/patch-ab 2019/02/08 22:25:32 1.5
@@ -1,60 +1,65 @@ @@ -1,60 +1,65 @@
1$NetBSD: patch-ab,v 1.4 2005/11/12 18:06:43 tonio Exp $ 1$NetBSD: patch-ab,v 1.5 2019/02/08 22:25:32 tonio Exp $
 2Adjust configure script to use provided awk, set options properly for
 3with_osx_addressbook, and eliminate vcard format.
2 4
3--- configure.orig 2005-10-29 14:49:48.000000000 +0200 5--- configure.orig 2019-01-07 18:30:29.000000000 +0000
4+++ configure 6+++ configure
5@@ -3294,18 +3294,7 @@ if test "x$AWK" != "xNONE" ; then 7@@ -4858,22 +4858,7 @@ $as_echo "no" >&6; }
6 AWK="$AWK" 
7 fi 8 fi
8  9
 10
 11-
 12-if test "x$AWK" != "xNONE" ; then
 13- AWK="$AWK"
 14-fi
 15-
9-if test "x$NAWK" != "xNONE" ; then 16-if test "x$NAWK" != "xNONE" ; then
10- AWK="$NAWK" 17- AWK="$NAWK"
11-fi 18-fi
12- 19-
13-if test "x$GAWK" != "xNONE" ; then 20-if test "x$GAWK" != "xNONE" ; then
14- AWK="$GAWK" 21- AWK="$GAWK"
15-fi 22-fi
16- 23-
17-if test "x$MAWK" != "xNONE" ; then 24-if test "x$MAWK" != "xNONE" ; then
18- AWK="$MAWK" 25- AWK="$MAWK"
19-fi 26-fi
20- 
21+#use the supplied awk 27+#use the supplied awk
22  28
23  29
24 # Extract the first word of "tac", so it can be a program name with args. 30
25@@ -4604,6 +4593,12 @@ if test "x$PERL" != xno ; then 31@@ -6501,6 +6486,11 @@ if test "x$PERL" != xno ; then
26  32
27 fi 33 fi
28  34
29+# Check whether --with-osx-addressbook or --without-osx-addressbook was given. 35+# Check whether --with-osx-addressbook or --without-osx-addressbook was given.
30+if test "${with_osx_addressbook+set}" = set; then 36+if test "${with_osx_addressbook+set}" = set; then
31+ withval="$with_osx_addressbook" 37+ withval="$with_osx_addressbook"
32+ 
33+fi; 38+fi;
34+ if test x$withval = xyes; then 39+if test x$withval = xyes; then
35 # m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3) 40 # m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3)
36 # Extract the first word of "xcodebuild", so it can be a program name with args. 41 # Extract the first word of "xcodebuild", so it can be a program name with args.
37 set dummy xcodebuild; ac_word=$2 42 set dummy xcodebuild; ac_word=$2
38@@ -4694,6 +4689,11 @@ fi 43@@ -6593,6 +6583,11 @@ fi
39  44
40 fi 45 fi
41 fi 46 fi
42+else 47+else
43+ PBXBUILD="no" 48+ PBXBUILD="no"
44+ XCODEBUILD="no" 49+ XCODEBUILD="no"
45+fi 50+fi
46+withval="" 51+withval=""
47  52
48 VFORMAT="no" 53 VFORMAT="no"
49 if test "${ac_cv_header_vf_iface_h+set}" = set; then 54 ac_fn_c_check_header_mongrel "$LINENO" "vf_iface.h" "ac_cv_header_vf_iface_h" "$ac_includes_default"
50@@ -4899,8 +4899,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib 55@@ -6636,8 +6631,8 @@ fi
51 echo "${ECHO_T}$ac_cv_lib_vformat_vf_read_file" >&6 56 $as_echo "$ac_cv_lib_vformat_vf_read_file" >&6; }
52 if test $ac_cv_lib_vformat_vf_read_file = yes; then 57 if test "x$ac_cv_lib_vformat_vf_read_file" = xyes; then :
53  58
54- MODULES="$MODULES m_vcf" 59- MODULES="$MODULES m_vcf"
55- VFORMAT="yes" 60- VFORMAT="yes"
56+ MODULES="$MODULES" 61+ MODULES="$MODULES"
57+# VFORMAT="yes" 62+# VFORMAT="yes"
58  63
59 fi 64 fi
60  65
File Deleted: pkgsrc/databases/lbdb/patches/Attic/patch-mutt__ldap__query.pl.in