Rather overdue update, is there anyone around using this who can give
it a spin? Rather than trying to patch the sed/grep expressions (which
conflicts with upstream changes) I've changed them back to use GNU
tools instead, patches like that are a real pain to maintain through
upstream changes.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/lbdb/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 11 Mar 2022 18:31:20 -0000 1.24
+++ Makefile 27 Jan 2023 13:43:50 -0000
@@ -1,14 +1,11 @@
COMMENT-main = "little brother's database", email address query tools
COMMENT-ldap = LDAP support for lbdb
-VERSION = 0.40
-REVISION = 0
-
-DISTNAME = lbdb_${VERSION}
-PKGNAME = lbdb-${VERSION}
+DISTNAME = lbdb-0.51.1
CATEGORIES = databases mail
+# https://github.com/RolandRosenfeld/lbdb
HOMEPAGE = https://www.spinnaker.de/lbdb/
MULTI_PACKAGES = -main -ldap
@@ -22,7 +19,9 @@ MASTER_SITES = https://www.spinnaker.de
BUILD_DEPENDS = ${RUN_DEPENDS-main}
LIB_DEPENDS-main = converters/libiconv
-RUN_DEPENDS-main = mail/abook
+RUN_DEPENDS-main = mail/abook \
+ sysutils/ggrep \
+ textproc/gsed
RUN_DEPENDS-ldap = databases/p5-ldap \
databases/lbdb
@@ -50,6 +49,9 @@ CONFIGURE_ENV = ac_cv_path_BASH=NONE \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
WRKDIST = ${WRKDIR}/${DISTNAME:S/_/-/}
+
+post-extract:
+ sed -i -e 's,grep,ggrep,g' -e 's,sed,gsed,g' ${WRKSRC}/*.sh.in
post-install:
${INSTALL_DATA_DIR} ${WRKINST}/${TRUEPREFIX}/share/examples/lbdb
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/lbdb/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 1 Feb 2016 06:49:52 -0000 1.4
+++ distinfo 27 Jan 2023 13:43:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (lbdb_0.40.tar.gz) = 62xF3KCiNXIGcxwAmex4A6BNoU2UALEHhYgjTGhR7uc=
-SIZE (lbdb_0.40.tar.gz) = 162297
+SHA256 (lbdb-0.51.1.tar.gz) = l+afplNeWYafxCQxq+cPXMpBZIkNDfJzYIGpThs2Je8=
+SIZE (lbdb-0.51.1.tar.gz) = 183903
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/lbdb/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 18:31:20 -0000 1.3
+++ patches/patch-Makefile_in 27 Jan 2023 13:43:50 -0000
@@ -1,8 +1,11 @@
---- Makefile.in.orig Sat May 10 16:34:04 2014
-+++ Makefile.in Tue Sep 16 13:04:48 2014
-@@ -181,4 +181,4 @@ Makefile: Makefile.in
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -197,6 +197,6 @@ Makefile: Makefile.in
-e 's!@''dotlock@!$(DOTLOCKBASE)!' [email protected] > $@
%.o: %.c
- $(CC) $(CFLAGS) $(DEFS) -c $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
+
+ .PHONY: test test_perl update-version
Index: patches/patch-lbdb_lib_sh_in
===================================================================
RCS file: /cvs/ports/databases/lbdb/patches/patch-lbdb_lib_sh_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lbdb_lib_sh_in
--- patches/patch-lbdb_lib_sh_in 11 Mar 2022 18:31:20 -0000 1.3
+++ patches/patch-lbdb_lib_sh_in 27 Jan 2023 13:43:50 -0000
@@ -1,28 +1,12 @@
---- lbdb_lib.sh.in.orig Sun Aug 13 10:53:21 2006
-+++ lbdb_lib.sh.in Sat Oct 10 03:10:21 2009
-@@ -57,24 +57,7 @@ lbdb_hostname()
+Index: lbdb_lib.sh.in
+--- lbdb_lib.sh.in.orig
++++ lbdb_lib.sh.in
+@@ -53,6 +53,8 @@ lbdb_hostname()
+ hn=$MAIL_DOMAIN_NAME
elif test -f /etc/mailname; then
- hn=`cat /etc/mailname`
+ hn=$(cat /etc/mailname)
++ elif true; then
++ hn=$(hostname)
else
-- hn=""
-- if test -r /etc/resolv.conf ; then
-- hn="`sed -n -e 's/^[ ]*domain[ ]\{1,\}\([^
]*\)/\1/p' /etc/resolv.conf`"
-- if test "x$hn" = "x" ; then
-- hn="`sed -n -e 's/^[ ]*search[
]\{1,\}\([^ ]*\)/\1/p' /etc/resolv.conf`"
-- fi
-- fi
-- if test "x$hn" = "x" ; then
-- hn=`lbdb_hn_sendmail`
-- if test "x$hn" = "xNONE" ; then
-- for i in /etc/HOSTNAME /etc/hostname ; do
-- if test -f $i ; then
-- hn="`cat $i`"
-- break;
-- fi
-- done
-- fi
-- fi
-+ hn=`hostname`
- fi
- echo "$hn"
- }
+ hn=""
+ if test -r /etc/resolv.conf ; then
Index: patches/patch-lbdb_rc_in
===================================================================
RCS file: /cvs/ports/databases/lbdb/patches/patch-lbdb_rc_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lbdb_rc_in
--- patches/patch-lbdb_rc_in 11 Mar 2022 18:31:20 -0000 1.2
+++ patches/patch-lbdb_rc_in 27 Jan 2023 13:43:50 -0000
@@ -1,6 +1,7 @@
---- lbdb.rc.in.orig Tue Mar 11 22:51:52 2008
-+++ lbdb.rc.in Tue Mar 11 22:52:05 2008
-@@ -51,8 +51,8 @@ METHODS="m_inmail m_passwd m_finger"
+Index: lbdb.rc.in
+--- lbdb.rc.in.orig
++++ lbdb.rc.in
+@@ -57,8 +57,8 @@ METHODS="m_inmail m_passwd m_finger"
#
# If it isn't possible to find out the correct mail domain name of
Index: patches/patch-m_abook_sh_in
===================================================================
RCS file: patches/patch-m_abook_sh_in
diff -N patches/patch-m_abook_sh_in
--- patches/patch-m_abook_sh_in 11 Mar 2022 18:31:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: m_abook.sh.in
---- m_abook.sh.in.orig
-+++ m_abook.sh.in
-@@ -33,7 +33,7 @@ m_abook_query()
- if [ -f "$book" ]
- then
- $ABOOK --datafile $book --mutt-query "$@" \
-- | sed -e '1d;s/\([^\t]*\t[^\t]*\).*/\1\tabook/'
-+ | sed -e '1d;s/\([^ ]* [^ ]*\).*/\1 abook/'
- fi
- done
- fi
Index: patches/patch-m_muttalias_sh_in
===================================================================
RCS file: patches/patch-m_muttalias_sh_in
diff -N patches/patch-m_muttalias_sh_in
--- patches/patch-m_muttalias_sh_in 11 Mar 2022 18:31:20 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- m_muttalias.sh.in.orig Thu Jun 11 11:56:22 2009
-+++ m_muttalias.sh.in Tue Sep 16 13:04:48 2014
-@@ -34,10 +34,10 @@ m_muttalias_query()
- if [ -f "$file" ]
- then
- grep -ia "$@" $file \
-- | grep -a '^alias[ ][ ]*[^,][^,]*[ ][
]*\([^,]\|\\\".*\\\"\)*$' \
-- | sed -e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][
]*<\([^ >][^ >]*\)>[ ][ ]*(\([^<>()]*\))[^()<>]*$/\2
\3 alias \1/' \
-- -e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][
]*\(\\\".*\\\"[^<>()]*\|[^<>()]*\)<\([^<>()]*\)>[^<>]*$/\3 \2 alias
\1/' \
-- -e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][
]*\([^<>()]*\)(\(\\\".*\\\"[^<>()]*\|[^<>()]*\))[^()<>]*$/\2 \3 alias
\1/' \
-+ | grep -Ea '^alias[ ][ ]*[^,][^,]*[ ][
]*([^,]|\\\".*\\\")*$' \
-+ | sed -E -e 's/^alias[ ][ ]*([^ ][^ ]*)[ ][
]*<([^ >][^ >]*)>[ ][ ]*\(([^<>()]*)\)[^()<>]*$/\2 \3 alias
\1/' \
-+ -e 's/^alias[ ][ ]*([^ ][^ ]*)[ ][
]*(\\\".*\\\"[^<>()]*|[^<>()]*)<([^<>()]*)>[^<>]*$/\3 \2 alias \1/' \
-+ -e 's/^alias[ ][ ]*([^ ][^ ]*)[ ][
]*([^<>()]*)\((\\\".*\\\"[^<>()]*|[^<>()]*)\)[^()<>]*$/\2 \3 alias
\1/' \
- -e 's/\\\"//g' \
- | grep -va '^alias[ ][ ]*[^,][^,]*[ ][
]*[^,]*$' || :
- fi
Index: pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/databases/lbdb/pkg/PLIST-ldap,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-ldap
--- pkg/PLIST-ldap 11 Mar 2022 18:31:20 -0000 1.3
+++ pkg/PLIST-ldap 27 Jan 2023 13:43:50 -0000
@@ -1,6 +1,6 @@
@conflict lbdb-0.35.1-ldap
+bin/mutt_ldap_query
lib/lbdb/m_ldap
-lib/lbdb/mutt_ldap_query
@man man/man1/mutt_ldap_query.1
share/examples/lbdb/lbdb_ldap.rc
@sample ${SYSCONFDIR}/lbdb_ldap.rc
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/lbdb/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 11 Mar 2022 18:31:20 -0000 1.3
+++ pkg/PLIST-main 27 Jan 2023 13:43:50 -0000
@@ -21,7 +21,6 @@ lib/lbdb/m_pine
lib/lbdb/m_wanderlust
lib/lbdb/m_yppasswd
lib/lbdb/munge
-lib/lbdb/munge-keeporder
lib/lbdb/palm_lsaddr
@bin lib/lbdb/qpto8bit
lib/lbdb/tac
