pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/53953: Update lbdb to 0.48.1
>Number: 53953
>Category: pkg
>Synopsis: Update lbdb to 0.48.1
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Wed Feb 06 21:40:00 +0000 2019
>Originator: David J. Weller-Fahy
>Release: pkgsrc current as of 2019-02-06
>Organization:
n/a
>Environment:
Linux pooh 3.10.0-957.1.3.el7.x86_64 #1 SMP Thu Nov 29 14:49:43 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux
>Description:
Patch to update the lbdb package to 0.48.1.
Note that patches/patch-aa and patches/patch-ab have been modified to work with the new version, whereas patches/patch-mutt__ldap__query.pl.in is no longer necessary with the new version.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 22 Aug 2018 09:43:11 -0000 1.33
+++ Makefile 6 Feb 2019 21:29:40 -0000
@@ -1,30 +1,30 @@
# $NetBSD: Makefile,v 1.33 2018/08/22 09:43:11 wiz 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= https://www.spinnaker.de/lbdb/download/
MAINTAINER= tonio%NetBSD.org@localhost
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
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
-GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-lbdb_dotlock
-CONFIGURE_ARGS+= --without-getent
-CONFIGURE_ARGS+= --without-evolution-addressbook-export
-CONFIGURE_ARGS+= --without-pgp
-CONFIGURE_ARGS+= --without-pgpk
+GNU_CONFIGURE_LIBSUBDIR= ../libexec/lbdb
+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
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- PLIST 1 Jan 2018 22:29:22 -0000 1.7
+++ PLIST 6 Feb 2019 21:31:19 -0000
@@ -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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 3 Nov 2015 01:56:13 -0000 1.13
+++ distinfo 6 Feb 2019 21:31:19 -0000
@@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.13 2015/11/03 01:56:13 agc Exp $
-SHA1 (lbdb_0.35.1.tar.gz) = 33c7767b248cc4289894e0a4b07ed55142484ecc
-RMD160 (lbdb_0.35.1.tar.gz) = 1c202c532db93f3dec066b762f75a28e37d01d1a
-SHA512 (lbdb_0.35.1.tar.gz) = 36788000977004fde45b9193c06a53eac88593de3a0817eb00b635ee9a980eebd29d5f2a23e083fda9c9e2e9db6ccc00d0abb8977f4e51a5955cda53c744c
-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) = 47d35caa88634f0f98e08e58d9920a44012ee51203dd765a716147b717e76b95cc1a07cd149b569800d5f97e78a7367f35a4e6298fc2bf33fa2f2988db877
+Size (lbdb_0.48.1.tar.gz) = 183538 bytes
+SHA1 (patch-aa) = 4b6beeee406770fe7853721b6ba40db91f2c3b53
+SHA1 (patch-ab) = b63c622ce4b34f493ab88d9e13baf2ac8585dc53
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/options.mk,v
retrieving revision 1.3
diff -u -p -r1.3 options.mk
--- options.mk 12 Apr 2008 22:42:59 -0000 1.3
+++ options.mk 6 Feb 2019 21:31:19 -0000
@@ -2,7 +2,7 @@
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"
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/patches/patch-aa,v
retrieving revision 1.4
diff -u -p -r1.4 patch-aa
--- patches/patch-aa 12 Nov 2005 17:43:42 -0000 1.4
+++ patches/patch-aa 6 Feb 2019 21:31:19 -0000
@@ -1,16 +1,18 @@
-$NetBSD: patch-aa,v 1.4 2005/11/12 17:43:42 tonio Exp $
+$NetBSD$
---- Makefile.in.orig 2005-10-29 16:48:08.000000000 +0200
+Adjust the Makefile to use the example directory.
+
+--- Makefile.in.orig 2018-04-02 16:35:21.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 +21,7 @@ $NetBSD: patch-aa,v 1.4 2005/11/12 17:43
$(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 +29,8 @@ $NetBSD: patch-aa,v 1.4 2005/11/12 17:43
+ $(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
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lbdb/patches/patch-ab,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ab
--- patches/patch-ab 12 Nov 2005 18:06:43 -0000 1.4
+++ patches/patch-ab 6 Feb 2019 21:31:19 -0000
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2005/11/12 18:06:43 tonio Exp $
+$NetBSD$
---- configure.orig 2005-10-29 14:49:48.000000000 +0200
+Adjust configure script to use provided awk, set options properly for
+with_osx_addressbook, and eliminate vcard format.
+
+--- configure.orig 2018-04-02 16:35:21.000000000 +0000
+++ configure
-@@ -3294,18 +3294,7 @@ if test "x$AWK" != "xNONE" ; then
+@@ -4863,18 +4863,7 @@ if test "x$AWK" != "xNONE" ; then
AWK="$AWK"
fi
@@ -22,34 +25,32 @@ $NetBSD: patch-ab,v 1.4 2005/11/12 18:06
# 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 +6490,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 +6587,10 @@ fi
fi
fi
-+else
-+ PBXBUILD="no"
-+ XCODEBUILD="no"
-+fi
-+withval=""
++ else
++ PBXBUILD="no"
++ XCODEBUILD="no"
++ fi
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 +6634,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"
Home |
Main Index |
Thread Index |
Old Index