diff options
author | tonio <tonio@pkgsrc.org> | 2019-02-08 22:25:32 +0000 |
---|---|---|
committer | tonio <tonio@pkgsrc.org> | 2019-02-08 22:25:32 +0000 |
commit | 471a388bdb2605f3428e46f9ee234cd34a2dbf30 (patch) | |
tree | e8ad64725dd379b567240a31a311acf6634375d6 /databases/lbdb | |
parent | f8a7e1d71a4fcae3db5a8f37436938391680ac5c (diff) | |
download | pkgsrc-471a388bdb2605f3428e46f9ee234cd34a2dbf30.tar.gz |
databases/lbdb: update to 0.48.1
Fix PR pkg/53953
Diffstat (limited to 'databases/lbdb')
-rw-r--r-- | databases/lbdb/Makefile | 16 | ||||
-rw-r--r-- | databases/lbdb/PLIST | 3 | ||||
-rw-r--r-- | databases/lbdb/distinfo | 15 | ||||
-rw-r--r-- | databases/lbdb/options.mk | 4 | ||||
-rw-r--r-- | databases/lbdb/patches/patch-aa | 19 | ||||
-rw-r--r-- | databases/lbdb/patches/patch-ab | 37 | ||||
-rw-r--r-- | databases/lbdb/patches/patch-mutt__ldap__query.pl.in | 15 |
7 files changed, 49 insertions, 60 deletions
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 70fab3e81e6..e40802c24c0 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.33 2018/08/22 09:43:11 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2019/02/08 22:25:32 tonio Exp $ -DISTNAME= lbdb_0.35.1 +DISTNAME= lbdb_0.48.1 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 6 CATEGORIES= databases -MASTER_SITES= http://www.spinnaker.de/debian/ +MASTER_SITES= http://www.spinnaker.de/lbdb/download/ MAINTAINER= tonio@NetBSD.org HOMEPAGE= http://www.spinnaker.de/lbdb/ COMMENT= The little brother's database +LICENSE= gnu-gpl-v2 DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap @@ -16,15 +16,15 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake perl:run GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-lbdb_dotlock CONFIGURE_ARGS+= --without-getent CONFIGURE_ARGS+= --without-evolution-addressbook-export CONFIGURE_ARGS+= --without-pgp CONFIGURE_ARGS+= --without-pgpk -CONFIGURE_ENV+= SH=${TOOLS_SH:Q} -CONFIGURE_ENV+= AWK=${TOOLS_AWK:Q} +CONFIGURE_ENV+= SH=${TOOLS_SH} +CONFIGURE_ENV+= AWK=${TOOLS_AWK} CONFIGURE_ENV+= ac_cv_path_TAC=NONE .include "options.mk" @@ -41,7 +41,7 @@ PLIST.finger= yes .endif PLIST_VARS+= yp -.if ${OPSYS} != "Interix" +.if ${OPSYS} != "Interix" && exists(/usr/bin/yppasswd) PLIST.yp= yes .endif diff --git a/databases/lbdb/PLIST b/databases/lbdb/PLIST index 369f0e048cc..0b18e18e57e 100644 --- a/databases/lbdb/PLIST +++ b/databases/lbdb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2018/01/01 22:29:22 rillig Exp $ +@comment $NetBSD: PLIST,v 1.8 2019/02/08 22:25:32 tonio Exp $ bin/lbdb-fetchaddr bin/lbdb_dotlock bin/lbdbq @@ -24,7 +24,6 @@ libexec/lbdb/m_pine libexec/lbdb/m_wanderlust ${PLIST.yp}libexec/lbdb/m_yppasswd libexec/lbdb/munge -libexec/lbdb/munge-keeporder libexec/lbdb/mutt_ldap_query libexec/lbdb/palm_lsaddr libexec/lbdb/qpto8bit diff --git a/databases/lbdb/distinfo b/databases/lbdb/distinfo index 59e9fb679db..643d1ae020e 100644 --- a/databases/lbdb/distinfo +++ b/databases/lbdb/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 01:56:13 agc Exp $ +$NetBSD: distinfo,v 1.14 2019/02/08 22:25:32 tonio Exp $ -SHA1 (lbdb_0.35.1.tar.gz) = 33c7767b248cc4289894e0a4b07ed55142484ecc -RMD160 (lbdb_0.35.1.tar.gz) = 1c202c532db93f3dec066b762f75a28e37d01d1a -SHA512 (lbdb_0.35.1.tar.gz) = 36788000977004fde45b9193c06a53eac88593de3a0817eb00b635ee9a980eebd29d5f2a23e083fda9c9e2e9db6ccc00d0abb8977f4e51a5955cda53c744c539 -Size (lbdb_0.35.1.tar.gz) = 108502 bytes -SHA1 (patch-aa) = c74a4d95037e9d5e5cc0742e5f05ef80a35db5e6 -SHA1 (patch-ab) = 7120edcd8588f2195b5c1afbb127245b182eb533 -SHA1 (patch-mutt__ldap__query.pl.in) = f7e4fd16edac8dab9971af453caf14414d39493c +SHA1 (lbdb_0.48.1.tar.gz) = ae81fee4c46d3680aa6ad5434efcc4db371c3165 +RMD160 (lbdb_0.48.1.tar.gz) = 4e458585c22826b962089412d55ddf0005eb9160 +SHA512 (lbdb_0.48.1.tar.gz) = 47d35caa88634f0f98e08e58d9920a44012ee51203dd765a716147b717e76b95cc1a07cd149b569800d5f97e78a7367f35a4e6298fc2bf33fa2f2988db87771e +Size (lbdb_0.48.1.tar.gz) = 183538 bytes +SHA1 (patch-aa) = f8adad394d424f99558de35e83f5c2b216799ebb +SHA1 (patch-ab) = 6bb9767cab2c4291e64da8a7ab9b07048b50ce99 diff --git a/databases/lbdb/options.mk b/databases/lbdb/options.mk index 0b406d00518..add27111465 100644 --- a/databases/lbdb/options.mk +++ b/databases/lbdb/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2019/02/08 22:25:32 tonio Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lbdb PKG_SUPPORTED_OPTIONS= osx-addressbook gnupg abook -PKG_SUGGESTED_OPTIONS= gnupg abook +PKG_SUGGESTED_OPTIONS= gnupg abook .include "../../mk/bsd.options.mk" diff --git a/databases/lbdb/patches/patch-aa b/databases/lbdb/patches/patch-aa index b25677f0e57..ca28e6214b0 100644 --- a/databases/lbdb/patches/patch-aa +++ b/databases/lbdb/patches/patch-aa @@ -1,16 +1,17 @@ -$NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $ +$NetBSD: patch-aa,v 1.5 2019/02/08 22:25:32 tonio Exp $ +Adjust the Makefile to use the example directory. ---- Makefile.in.orig 2005-10-29 16:48:08.000000000 +0200 +--- Makefile.in.orig 2019-01-07 18:30:29.000000000 +0000 +++ Makefile.in -@@ -39,6 +39,7 @@ srcdir=@srcdir@ +@@ -38,6 +38,7 @@ srcdir=@srcdir@ libdir=@libdir@ mandir=@mandir@ sysconfdir=@sysconfdir@ +egdir=@prefix@/share/examples/lbdb - ALL=lbdbq lbdb_lib lbdb-fetchaddr lbdb-munge fetchaddr qpto8bit munge \ - munge-keeporder nodelist2lbdb palm_lsaddr mutt_ldap_query lbdbq.man \ -@@ -50,7 +51,7 @@ all: Makefile $(ALL) + SUBDIRS=tests + +@@ -62,7 +63,7 @@ test_perl: install: all $(srcdir)/mkinstalldirs $(install_prefix)$(bindir) $(srcdir)/mkinstalldirs $(install_prefix)$(libdir) @@ -19,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $ $(srcdir)/mkinstalldirs $(install_prefix)$(mandir) $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1 $(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir) -@@ -71,7 +72,7 @@ install: all +@@ -82,7 +83,7 @@ install: all $(INSTALL) -m 644 mutt_ldap_query.man \ $(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \ $(INSTALL) -m 644 lbdb_ldap.rc \ @@ -27,8 +28,8 @@ $NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $ + $(install_prefix)$(egdir)/lbdb_ldap.rc; \ fi if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \ - $(INSTALL) -m 755 ABQuery/sym/ABQuery $(install_prefix)$(libdir); \ -@@ -85,7 +86,7 @@ install: all + $(INSTALL) -m 755 ABQuery $(install_prefix)$(libdir); \ +@@ -96,7 +97,7 @@ install: all $(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1 $(INSTALL) -m 644 lbdb-fetchaddr.man \ $(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1 diff --git a/databases/lbdb/patches/patch-ab b/databases/lbdb/patches/patch-ab index 596483748a5..4953da5188d 100644 --- a/databases/lbdb/patches/patch-ab +++ b/databases/lbdb/patches/patch-ab @@ -1,11 +1,18 @@ -$NetBSD: patch-ab,v 1.4 2005/11/12 18:06:43 tonio Exp $ +$NetBSD: patch-ab,v 1.5 2019/02/08 22:25:32 tonio Exp $ +Adjust configure script to use provided awk, set options properly for +with_osx_addressbook, and eliminate vcard format. ---- configure.orig 2005-10-29 14:49:48.000000000 +0200 +--- configure.orig 2019-01-07 18:30:29.000000000 +0000 +++ configure -@@ -3294,18 +3294,7 @@ if test "x$AWK" != "xNONE" ; then - AWK="$AWK" +@@ -4858,22 +4858,7 @@ $as_echo "no" >&6; } fi + +- +-if test "x$AWK" != "xNONE" ; then +- AWK="$AWK" +-fi +- -if test "x$NAWK" != "xNONE" ; then - AWK="$NAWK" -fi @@ -17,39 +24,37 @@ $NetBSD: patch-ab,v 1.4 2005/11/12 18:06:43 tonio Exp $ -if test "x$MAWK" != "xNONE" ; then - AWK="$MAWK" -fi -- +#use the supplied awk - # Extract the first word of "tac", so it can be a program name with args. -@@ -4604,6 +4593,12 @@ if test "x$PERL" != xno ; then + +@@ -6501,6 +6486,11 @@ if test "x$PERL" != xno ; then fi +# Check whether --with-osx-addressbook or --without-osx-addressbook was given. +if test "${with_osx_addressbook+set}" = set; then + withval="$with_osx_addressbook" -+ +fi; -+ if test x$withval = xyes; then ++if test x$withval = xyes; then # m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3) # Extract the first word of "xcodebuild", so it can be a program name with args. set dummy xcodebuild; ac_word=$2 -@@ -4694,6 +4689,11 @@ fi +@@ -6593,6 +6583,11 @@ fi fi fi +else -+ PBXBUILD="no" -+ XCODEBUILD="no" ++ PBXBUILD="no" ++ XCODEBUILD="no" +fi +withval="" VFORMAT="no" - if test "${ac_cv_header_vf_iface_h+set}" = set; then -@@ -4899,8 +4899,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib - echo "${ECHO_T}$ac_cv_lib_vformat_vf_read_file" >&6 - if test $ac_cv_lib_vformat_vf_read_file = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "vf_iface.h" "ac_cv_header_vf_iface_h" "$ac_includes_default" +@@ -6636,8 +6631,8 @@ fi + $as_echo "$ac_cv_lib_vformat_vf_read_file" >&6; } + if test "x$ac_cv_lib_vformat_vf_read_file" = xyes; then : - MODULES="$MODULES m_vcf" - VFORMAT="yes" diff --git a/databases/lbdb/patches/patch-mutt__ldap__query.pl.in b/databases/lbdb/patches/patch-mutt__ldap__query.pl.in deleted file mode 100644 index ae542c5fb8f..00000000000 --- a/databases/lbdb/patches/patch-mutt__ldap__query.pl.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mutt__ldap__query.pl.in,v 1.1 2013/06/14 18:30:43 dholland Exp $ - -Fix bug in man page noted by perl-5.18's pod2man. - ---- mutt_ldap_query.pl.in.orig 2013-06-12 12:13:03.000000000 +0000 -+++ mutt_ldap_query.pl.in -@@ -539,6 +539,8 @@ multiple searches for email addresses ba - just like this one 8-) - http://www.spinnaker.de/lbdb/ - -+=back -+ - =head1 AUTHORS - - Marc de Courville <marc@courville.org> and the various other contributors... that kindly sent their patches. |