On 2015/11/07 12:56, J. Scott Heppler wrote:
> Correct subject line for update. Portcheck had a tailing whitespace
> error in DESCR using the 0.5.6 DESCR. The error was in the line
> to set the mutt query line in muttrc. I added the missing period
> but the case could be made to tolerate the whitespace to avoid copy
> -paste errors.
>
> Builds/Runs on amd64-current, amd64-5.8 and i386-5.8
> Tested colors in rxvt-unicode, importing Vcards and editing phone
> numbers along with routine use for 2 days.
>
> I have had trouble with the formating of inline diffs in the past.
> I used xclip to generate this one and change my default editor from
> gvim -> vi in my muttrc.
some quick comments inline below, somewhere between generating the
diff and it being mailed out there was still some mangling though, so it
can't be applied directly.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/abook/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 Makefile
> --- Makefile 29 Jun 2015 15:39:43 -0000 1.31
> +++ Makefile 6 Nov 2015 19:22:41 -0000
> @@ -1,33 +1,36 @@
> -# $OpenBSD: Makefile,v 1.31 2015/06/29 15:39:43 sthen Exp $
> +# $OpenBSD: Makefile,v 1.31 2015/11/06 15:39:43 jsh Exp $
just leave this line as-is, it's handled by cvs.
> -COMMENT= addressbook program with mutt support
> +COMMENT = addressbook program with mutt support
mixing whitespace changes ("=" to " =") with an update makes it more
difficult to review.
> -DISTNAME= abook-0.5.6
> -REVISION= 2
> -CATEGORIES= mail
> +V = 0.6.1
> +DISTNAME = abook-${V}
no need for indirection here, you're not reusing V
> +CATEGORIES = mail
>
> -HOMEPAGE= http://abook.sourceforge.net/
> +
> +HOMEPAGE = http://abook.sourceforge.net/
no need for 2 blank lines above HOMEPAGE
>
> # GPLv2
> -PERMIT_PACKAGE_CDROM= Yes
> +PERMIT_PACKAGE_CDROM = Yes
> +
> +WANTLIB+= c ncursesw readline
awkward whitespace
>
> -WANTLIB += c ncursesw readline
> +MASTER_SITES = http://abook.sourceforge.net/devel/
>
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abook/}
> +MODULES = devel/gettext \
> + converters/libiconv
looks like some tabs/spaces issue here
>
> -MODULES= devel/gettext
>
> -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
> +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}
> + mkdir ${PREFIX}/share/examples/abook/
use ${INSTALL_DATA_DIR}
> + cp ${WRKSRC}/sample.abookrc $ ${PREFIX}/share/examples/abook/
use ${INSTALL_DATA}, remove stray $
>
> .include <bsd.port.mk>
> +
remove trailing blank line
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/abook/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo 18 Jan 2015 03:14:20 -0000 1.11
> +++ distinfo 6 Nov 2015 19:22:41 -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 -u -p -r1.4 DESCR
> --- pkg/DESCR 22 Sep 2010 08:59:07 -0000 1.4
> +++ pkg/DESCR 6 Nov 2015 19:22:41 -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.
removing the list of supported formats seems like a step backwards
>
> -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 -u -p -r1.10 PLIST
> --- pkg/PLIST 29 Jun 2015 15:39:43 -0000 1.10
> +++ pkg/PLIST 6 Nov 2015 19:22:41 -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
>
