On Nov 17, 2015: 20:40, Stuart Henderson wrote:
On 2015/11/17 08:41, J. Scott Heppler wrote:
Modified post-install to use EXAMPLEDIR
Further testing:
1) Exports addressbook in vcard 2.0 format
2) Can pass email address to Sylpheed/Claws-Mail
using sylpheed --compose/claws-mail --compose
I don't know what's going on between your editor, MTA and MUA, but as
mentioned with the previous mails, your diffs are getting mangled.
Please send as an attachment instead.
abook61.diff attached
I'd love to know what I'm doing wrong. When I paste inline diffs from
other submitters and compare to mine (marc.info), I can't see anything
thing different. This makes it a little hard to know where to look and
what to adjust.
I'm using vim/gvim mainly for colors - my vision is not great and the
contrast helps
I'm suspicious of my vim settings or my ISP. I saw fetchmailrc examples
that addressed linefeed/ carriage return issues with Earthlink.
My ~/.vimrc
set guifont=Liberation\ Mono\ 11
au BufRead /tmp/mutt-* set tw=72
set nomodeline
syntax enable
colorscheme ron
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/abook/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 29 Jun 2015 15:39:43 -0000 1.31
+++ Makefile 17 Nov 2015 16:31:27 -0000
@@ -1,33 +1,36 @@
# $OpenBSD: Makefile,v 1.31 2015/06/29 15:39:43 sthen Exp $
-COMMENT= addressbook program with mutt support
+COMMENT= addressbook program with mutt support
-DISTNAME= abook-0.5.6
-REVISION= 2
-CATEGORIES= mail
+V= 0.6.1
+DISTNAME= abook-$V
+CATEGORIES= mail
-HOMEPAGE= http://abook.sourceforge.net/
+HOMEPAGE= http://abook.sourceforge.net/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c ncursesw readline
+WANTLIB+= c ncursesw readline
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abook/}
+MASTER_SITES= http://abook.sourceforge.net/devel/
-MODULES= devel/gettext
+MODULES= devel/gettext \
+ converters/libiconv
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
-EXAMPLESDIR= ${PREFIX}/share/examples/abook
-WHITELIST=README abook2whitelist.sh mutt.whitelist whitelist.rc
+EXAMPLEDIR= ${PREFIX}/share/examples/abook/
+
+pre-configure:
+ @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -i
post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}/whitelist
- ${INSTALL_DATA} ${WRKSRC}/contrib/mail2abook.py ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/vcard2abook.pl ${EXAMPLESDIR}
- cd ${WRKSRC}/contrib/whitelist && \
- ${INSTALL_DATA} ${WHITELIST} ${EXAMPLESDIR}/whitelist
- ${INSTALL_DATA} ${WRKSRC}/sample.abookrc ${EXAMPLESDIR}
+ ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sample.abookrc \
+ ${EXAMPLEDIR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/abook/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 18 Jan 2015 03:14:20 -0000 1.11
+++ distinfo 17 Nov 2015 16:31:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (abook-0.5.6.tar.gz) = Bkb2MRqUrTNBgSpN4SpalAp6RNXLbp2lsJMKrp9EdW4=
-SIZE (abook-0.5.6.tar.gz) = 393097
+SHA256 (abook-0.6.1.tar.gz) = 8KkN+GlPs0aF7N1F2X2yi4gEbBXJXnsHAFlgKL2LwPk=
+SIZE (abook-0.6.1.tar.gz) = 319558
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/abook/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR 22 Sep 2010 08:59:07 -0000 1.4
+++ pkg/DESCR 17 Nov 2015 16:31:27 -0000
@@ -1,10 +1,7 @@
Addressbook program with mutt mail client support.
-abook uses curses libs and is able to import addressbooks from
-pine and netscape (ldif).
-Exports to mutt alias, html, pine, gcrd (GnomeCard), csv, elm -alias, and
plain text.
+abook uses curses libs and is able to import and export from other addressbook
+formats.
-It is nice for querying from within mutt; to use it as such, add
-the following to your muttrc:
-set query_command="${PREFIX}/bin/abook --mutt-query '%s'"
+It is nice for querying from within mutt; to use it as such, add the following
+to your muttrc: set query_command="${PREFIX}/bin/abook --mutt-query '%s'".
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/abook/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 29 Jun 2015 15:39:43 -0000 1.10
+++ pkg/PLIST 17 Nov 2015 16:31:27 -0000
@@ -1,17 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.10 2015/06/29 15:39:43 sthen Exp $
+@comment $OpenBSD$
@bin bin/abook
@man man/man1/abook.1
@man man/man5/abookrc.5
share/examples/abook/
-share/examples/abook/mail2abook.py
share/examples/abook/sample.abookrc
-share/examples/abook/vcard2abook.pl
-share/examples/abook/whitelist/
-share/examples/abook/whitelist/README
-share/examples/abook/whitelist/abook2whitelist.sh
-share/examples/abook/whitelist/mutt.whitelist
-share/examples/abook/whitelist/whitelist.rc
share/locale/de/LC_MESSAGES/abook.mo
+share/locale/de/LC_TIME/
+share/locale/de/LC_TIME/abook.mo
share/locale/fr/LC_MESSAGES/abook.mo
+share/locale/fr/LC_TIME/
+share/locale/fr/LC_TIME/abook.mo
+share/locale/it/LC_MESSAGES/abook.mo
+share/locale/it/LC_TIME/
+share/locale/it/LC_TIME/abook.mo
share/locale/ja/LC_MESSAGES/abook.mo
+share/locale/ja/LC_TIME/
+share/locale/ja/LC_TIME/abook.mo
share/locale/sv/LC_MESSAGES/abook.mo
+share/locale/sv/LC_TIME/
+share/locale/sv/LC_TIME/abook.mo
--
J. Scott Heppler
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/abook/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 29 Jun 2015 15:39:43 -0000 1.31
+++ Makefile 17 Nov 2015 16:31:27 -0000
@@ -1,33 +1,36 @@
# $OpenBSD: Makefile,v 1.31 2015/06/29 15:39:43 sthen Exp $
-COMMENT= addressbook program with mutt support
+COMMENT= addressbook program with mutt support
-DISTNAME= abook-0.5.6
-REVISION= 2
-CATEGORIES= mail
+V= 0.6.1
+DISTNAME= abook-$V
+CATEGORIES= mail
-HOMEPAGE= http://abook.sourceforge.net/
+HOMEPAGE= http://abook.sourceforge.net/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c ncursesw readline
+WANTLIB+= c ncursesw readline
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abook/}
+MASTER_SITES= http://abook.sourceforge.net/devel/
-MODULES= devel/gettext
+MODULES= devel/gettext \
+ converters/libiconv
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
-EXAMPLESDIR= ${PREFIX}/share/examples/abook
-WHITELIST=README abook2whitelist.sh mutt.whitelist whitelist.rc
+EXAMPLEDIR= ${PREFIX}/share/examples/abook/
+
+pre-configure:
+ @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -i
post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}/whitelist
- ${INSTALL_DATA} ${WRKSRC}/contrib/mail2abook.py ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/vcard2abook.pl ${EXAMPLESDIR}
- cd ${WRKSRC}/contrib/whitelist && \
- ${INSTALL_DATA} ${WHITELIST} ${EXAMPLESDIR}/whitelist
- ${INSTALL_DATA} ${WRKSRC}/sample.abookrc ${EXAMPLESDIR}
+ ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sample.abookrc \
+ ${EXAMPLEDIR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/abook/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 18 Jan 2015 03:14:20 -0000 1.11
+++ distinfo 17 Nov 2015 16:31:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (abook-0.5.6.tar.gz) = Bkb2MRqUrTNBgSpN4SpalAp6RNXLbp2lsJMKrp9EdW4=
-SIZE (abook-0.5.6.tar.gz) = 393097
+SHA256 (abook-0.6.1.tar.gz) = 8KkN+GlPs0aF7N1F2X2yi4gEbBXJXnsHAFlgKL2LwPk=
+SIZE (abook-0.6.1.tar.gz) = 319558
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/abook/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR 22 Sep 2010 08:59:07 -0000 1.4
+++ pkg/DESCR 17 Nov 2015 16:31:27 -0000
@@ -1,10 +1,7 @@
Addressbook program with mutt mail client support.
-abook uses curses libs and is able to import addressbooks from
-pine and netscape (ldif).
-Exports to mutt alias, html, pine, gcrd (GnomeCard), csv, elm
-alias, and plain text.
+abook uses curses libs and is able to import and export from other addressbook
+formats.
-It is nice for querying from within mutt; to use it as such, add
-the following to your muttrc:
-set query_command="${PREFIX}/bin/abook --mutt-query '%s'"
+It is nice for querying from within mutt; to use it as such, add the following
+to your muttrc: set query_command="${PREFIX}/bin/abook --mutt-query '%s'".
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/abook/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 29 Jun 2015 15:39:43 -0000 1.10
+++ pkg/PLIST 17 Nov 2015 16:31:27 -0000
@@ -1,17 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.10 2015/06/29 15:39:43 sthen Exp $
+@comment $OpenBSD$
@bin bin/abook
@man man/man1/abook.1
@man man/man5/abookrc.5
share/examples/abook/
-share/examples/abook/mail2abook.py
share/examples/abook/sample.abookrc
-share/examples/abook/vcard2abook.pl
-share/examples/abook/whitelist/
-share/examples/abook/whitelist/README
-share/examples/abook/whitelist/abook2whitelist.sh
-share/examples/abook/whitelist/mutt.whitelist
-share/examples/abook/whitelist/whitelist.rc
share/locale/de/LC_MESSAGES/abook.mo
+share/locale/de/LC_TIME/
+share/locale/de/LC_TIME/abook.mo
share/locale/fr/LC_MESSAGES/abook.mo
+share/locale/fr/LC_TIME/
+share/locale/fr/LC_TIME/abook.mo
+share/locale/it/LC_MESSAGES/abook.mo
+share/locale/it/LC_TIME/
+share/locale/it/LC_TIME/abook.mo
share/locale/ja/LC_MESSAGES/abook.mo
+share/locale/ja/LC_TIME/
+share/locale/ja/LC_TIME/abook.mo
share/locale/sv/LC_MESSAGES/abook.mo
+share/locale/sv/LC_TIME/
+share/locale/sv/LC_TIME/abook.mo
