pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/29164: lbdb package
The following reply was made to PR pkg/29164; it has been noted by GNATS.
From: Kimmo Suominen <kim%tac.nyc.ny.us@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: pkg/29164: lbdb package
Date: Fri, 25 Mar 2005 16:54:08 -0500
I've committed a modified version of the package that does not depend
on Emacs. To install the lbdb.el file, I think a separate package is
the best approach.
Diffs against the lbdb-0.29.tgz package included below for reference.
A summary of changes:
- remove COMMENTS file
- reword DESCR (and COMMENT in Makefile) to describe the more general
nature of lbdb than just address lookups with mutt
- use PKG_SYSCONFDIR, not hardcoded PREFIX/etc
- handle configuration files through USE_PKGINSTALL (see CONF_FILES
and patch-aa)
- use PKGNAME_NOREV in defining WRKSRC
- use PREFIX/libexec rather than PREFIX/lib (the installed files are
support binaries, not libraries, so libexec seems more appropriate)
- used pkglint(1) to make sure possible problems don't go unnoted
Note that I instructed diff(1) to ignore whitespace changes to make
the diff shorter. That's why in the output columns don't always line
up so well.
Regards,
+ Kim
--
<A HREF="http://kimmo.suominen.com/";>Kimmo Suominen</A>
diff -Nbru -x CVS old/lbdb/COMMENTS lbdb/COMMENTS
--- old/lbdb/COMMENTS 2005-01-30 17:14:35.000000000 -0500
+++ lbdb/COMMENTS 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-The little brother's database for the mutt mail reader.
diff -Nbru -x CVS old/lbdb/DESCR lbdb/DESCR
--- old/lbdb/DESCR 2005-01-30 17:13:47.000000000 -0500
+++ lbdb/DESCR 2005-03-25 16:39:11.000000000 -0500
@@ -1,4 +1,4 @@
-This package consists of a set of small tools, which collect mail addresses
-from several sources and offer these addresses to the mutt external query
-feature.
-It can use Emacs bbdb, abook, ldap and even mac osx addressbook for query.
+This package collects provides a lookup interface for mail addresses
+for several data sources. It can retrieve data from Emacs bbdb, abook,
+ldap and even MacOS X addressbooks, and provide the results to external
+programs such as the mutt mail reader.
diff -Nbru -x CVS old/lbdb/Makefile lbdb/Makefile
--- old/lbdb/Makefile 2005-02-01 17:45:07.000000000 -0500
+++ lbdb/Makefile 2005-03-25 16:39:11.000000000 -0500
@@ -1,35 +1,28 @@
-# $NetBSD$
-#
+# $NetBSD: Makefile,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
-PKGNAME= lbdb-${PKG_VERSION}
-DISTNAME= lbdb_${PKG_VERSION}
-PKG_VERSION= 0.29
-CATEGORIES= mail
+DISTNAME= ${PKGNAME:S/-/_/}
+PKGNAME= lbdb-0.29
+CATEGORIES= databases
MASTER_SITES= http://www.spinnaker.de/debian/
MAINTAINER= reilles%loria.fr@localhost
HOMEPAGE= http://www.spinnaker.de/lbdb/
-COMMENT= The little brother's database for the mutt mail reader.
+COMMENT= The little brother's database
DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
-USE_PKGLOCALEDIR= yes
-HAS_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
USE_PERL5= yes
+USE_PKGINSTALL= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}\
- --sysconfdir=${PREFIX}/etc\
- --libdir=${PREFIX}/lib/lbdb/
-
+CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-WRKSRC= ${WRKDIR}/${PKGNAME}
-USE_BUILDLINK3= yes
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-.include "../../mk/emacs.mk"
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/lbdb.el ${EMACS_LISPPREFIX}/
+EGDIR= ${PREFIX}/share/examples/lbdb
+CONF_FILES+= ${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc
+CONF_FILES+= ${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc
.include "../../mk/bsd.pkg.mk"
diff -Nbru -x CVS old/lbdb/PLIST lbdb/PLIST
--- old/lbdb/PLIST 2005-02-01 17:44:02.000000000 -0500
+++ lbdb/PLIST 2005-03-25 16:39:11.000000000 -0500
@@ -1,39 +1,39 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
bin/lbdb-fetchaddr
bin/lbdb_dotlock
bin/lbdbq
bin/nodelist2lbdb
-etc/lbdb.rc
-etc/lbdb_ldap.rc
-lib/lbdb/fetchaddr
-lib/lbdb/lbdb-munge
-lib/lbdb/lbdb_bbdb_query.el
-lib/lbdb/lbdb_lib
-lib/lbdb/m_abook
-lib/lbdb/m_bbdb
-lib/lbdb/m_fido
-lib/lbdb/m_finger
-lib/lbdb/m_getent
-lib/lbdb/m_gnomecard
-lib/lbdb/m_gpg
-lib/lbdb/m_inmail
-lib/lbdb/m_ldap
-lib/lbdb/m_muttalias
-lib/lbdb/m_palm
-lib/lbdb/m_passwd
-lib/lbdb/m_pine
-lib/lbdb/m_wanderlust
-lib/lbdb/m_yppasswd
-lib/lbdb/munge
-lib/lbdb/munge-keeporder
-lib/lbdb/mutt_ldap_query
-lib/lbdb/palm_lsaddr
-lib/lbdb/qpto8bit
-lib/lbdb/tac
-${EMACS_LISPPREFIX}/lbdb.el
+libexec/lbdb/fetchaddr
+libexec/lbdb/lbdb-munge
+libexec/lbdb/lbdb_bbdb_query.el
+libexec/lbdb/lbdb_lib
+libexec/lbdb/m_abook
+libexec/lbdb/m_bbdb
+libexec/lbdb/m_fido
+libexec/lbdb/m_finger
+libexec/lbdb/m_getent
+libexec/lbdb/m_gnomecard
+libexec/lbdb/m_gpg
+libexec/lbdb/m_inmail
+libexec/lbdb/m_ldap
+libexec/lbdb/m_muttalias
+libexec/lbdb/m_palm
+libexec/lbdb/m_passwd
+libexec/lbdb/m_pine
+libexec/lbdb/m_wanderlust
+libexec/lbdb/m_yppasswd
+libexec/lbdb/munge
+libexec/lbdb/munge-keeporder
+libexec/lbdb/mutt_ldap_query
+libexec/lbdb/palm_lsaddr
+libexec/lbdb/qpto8bit
+libexec/lbdb/tac
man/man1/lbdb-fetchaddr.1
man/man1/lbdb_dotlock.1
man/man1/lbdbq.1
man/man1/mutt_ldap_query.1
man/man1/nodelist2lbdb.1
-@dirrm lib/lbdb
+share/examples/lbdb/lbdb.rc
+share/examples/lbdb/lbdb_ldap.rc
+@dirrm share/examples/lbdb
+@dirrm libexec/lbdb
diff -Nbru -x CVS old/lbdb/distinfo lbdb/distinfo
--- old/lbdb/distinfo 2005-01-30 17:11:32.000000000 -0500
+++ lbdb/distinfo 2005-03-25 16:39:11.000000000 -0500
@@ -1,4 +1,6 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
SHA1 (lbdb_0.29.tar.gz) = 60f34b7867908450d34a75b5e09f3f7f89b9f8e9
+RMD160 (lbdb_0.29.tar.gz) = b5574ad13ead6b49fc7fe12472707f42046e38e3
Size (lbdb_0.29.tar.gz) = 85590 bytes
+SHA1 (patch-aa) = 00b2f69f30637938e9142c17c334e633878a0526
diff -Nbru -x CVS old/lbdb/patches/patch-aa lbdb/patches/patch-aa
--- old/lbdb/patches/patch-aa 1969-12-31 19:00:00.000000000 -0500
+++ lbdb/patches/patch-aa 2005-03-25 16:39:11.000000000 -0500
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
+
+--- Makefile.in.orig 2004-01-18 07:58:43.000000000 -0500
++++ Makefile.in 2005-03-25 16:25:39.000000000 -0500
+@@ -38,6 +38,7 @@
+ 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 \
+@@ -49,7 +50,7 @@
+ install: all
+ $(srcdir)/mkinstalldirs $(install_prefix)$(bindir)
+ $(srcdir)/mkinstalldirs $(install_prefix)$(libdir)
+- $(srcdir)/mkinstalldirs $(install_prefix)$(sysconfdir)
++ $(srcdir)/mkinstalldirs $(install_prefix)$(egdir)
+ $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)
+ $(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1
+ $(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir)
+@@ -70,7 +71,7 @@
+ $(INSTALL) -m 644 mutt_ldap_query.man \
+ $(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \
+ $(INSTALL) -m 644 lbdb_ldap.rc \
+- $(install_prefix)$(sysconfdir)/lbdb_ldap.rc; \
++ $(install_prefix)$(egdir)/lbdb_ldap.rc; \
+ fi
+ if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \
+ $(INSTALL) -m 755 ABQuery/sym/ABQuery
$(install_prefix)$(libdir); \
+@@ -81,7 +82,7 @@
+ $(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1
+ $(INSTALL) -m 644 lbdb-fetchaddr.man \
+ $(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1
+- $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(sysconfdir)/lbdb.rc
++ $(INSTALL) -m 644 lbdb.rc $(install_prefix)$(egdir)/lbdb.rc
+ if [ "$(DOTLOCK_TARGET)" != "" ]; then \
+ $(INSTALL) -m 755 lbdb_dotlock $(install_prefix)$(bindir); \
+ $(INSTALL) -m 644 dotlock.man \
Home |
Main Index |
Thread Index |
Old Index