pkg/41291: Update for news/leafnode broken under NetBSD-5

[cheusov%tut.by@localhost]

>Number:         41291
>Category:       pkg
>Synopsis:       Update for news/leafnode broken under NetBSD-5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 27 16:50:00 +0000 2009
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 5.0_RC4
>Organization:
>Environment:
System: NetBSD chen.chizhovka.net 5.0_RC4 NetBSD 5.0_RC4 (GENERIC) #4: Mon Apr 
20 21:38:46 EEST 2009 
cheusov%chen.chizhovka.net@localhost:/srv/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
Because of changes in ioctl(SIOCGIFADDR) in NetBSD-5 news/leafnode
package shipped with pkgsrc becomes broken.

Details about the problem are available here
http://mail-index.netbsd.org/tech-userlevel/2009/03/21/msg001898.html

Upstream was notified about the problem, fixed the problem and
released new leafnode-1.11.7

Notes about the patch.
patches/patch-aa was regenerated because old one is not applied cleanly.
patches/patch-ab was removed because it is not needed anymore
(upstream is correct).

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/news/leafnode/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile    25 Oct 2008 13:19:10 -0000      1.40
+++ Makefile    27 Apr 2009 16:40:32 -0000
@@ -1,8 +1,6 @@
 # $NetBSD: Makefile,v 1.40 2008/10/25 13:19:10 obache Exp $
 
-DISTNAME=              leafnode-1.11.3.rel
-PKGNAME=               ${DISTNAME:S/.rel//}
-PKGREVISION=           1
+DISTNAME=              leafnode-1.11.7
 CATEGORIES=            news
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=leafnode/}
 EXTRACT_SUFX=          .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/news/leafnode/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo    15 Oct 2006 20:06:59 -0000      1.16
+++ distinfo    27 Apr 2009 16:40:32 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.16 2006/10/15 20:06:59 schwarz Exp $
 
-SHA1 (leafnode-1.11.3.rel.tar.bz2) = 6910f05c0fa4b1bb5a4baaa6e6fd529fef5ece22
-RMD160 (leafnode-1.11.3.rel.tar.bz2) = 786fc42b58660d8d47eccd5d610718202eb50a3c
-Size (leafnode-1.11.3.rel.tar.bz2) = 506217 bytes
-SHA1 (patch-aa) = 6820ab420cb656e61848f9eb29d4674bccb856a6
-SHA1 (patch-ab) = 02f0911d41bf7934d44306054edb77b1d1751045
+SHA1 (leafnode-1.11.7.tar.bz2) = 81b85be012f1c3d2613e9f9c078336bdd238a052
+RMD160 (leafnode-1.11.7.tar.bz2) = 666623ef121aa625337e83512ca7569cc745a5d9
+Size (leafnode-1.11.7.tar.bz2) = 494740 bytes
+SHA1 (patch-aa) = bfcc59e28a8c60058f9f5289c02a0dbc8269bbfd
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/news/leafnode/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa    13 May 2005 15:08:04 -0000      1.6
+++ patches/patch-aa    27 Apr 2009 16:40:32 -0000
@@ -1,13 +1,13 @@
 $NetBSD: patch-aa,v 1.6 2005/05/13 15:08:04 kim Exp $
 
---- Makefile.in.orig   2005-05-04 10:36:22.000000000 -0400
-+++ Makefile.in        2005-05-13 10:53:41.000000000 -0400
-@@ -801,14 +801,14 @@
+--- Makefile.in.orig   2009-04-20 17:37:40.000000000 +0300
++++ Makefile.in
+@@ -846,14 +846,14 @@ uninstall-man8:
          rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
        done
  install-sysconfDATA: $(sysconf_DATA)
 -      @$(NORMAL_INSTALL)
--      test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+-      test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 -      @list='$(sysconf_DATA)'; for p in $$list; do \
 -        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -        f=$(am__strip_dir) \
@@ -15,7 +15,7 @@
 -        $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 -      done
 +#     @$(NORMAL_INSTALL)
-+#     test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++#     test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 +#     @list='$(sysconf_DATA)'; for p in $$list; do \
 +#       if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +#       f=$(am__strip_dir) \
@@ -25,13 +25,13 @@
  
  uninstall-sysconfDATA:
        @$(NORMAL_UNINSTALL)
-@@ -1349,17 +1349,17 @@
+@@ -1417,17 +1417,17 @@ rpm:   leafnode.spec
        rpmbuild -ba leafnode.spec || rpm -ba leafnode.spec
  
  install-data-hook: amiroot
--      set -e ; for i in . leaf.node failed.postings interesting.groups \
--              out.going message.id temp.files ; do \
--        mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
+-      set -e ; for i in "" /leaf.node /failed.postings /interesting.groups \
+-              /out.going /message.id /temp.files ; do \
+-        mkdir -p $(DESTDIR)$(SPOOLDIR)$$i ; \
 -      if ./amiroot ; then \
 -       chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
 -       chmod 2775      $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
@@ -40,9 +40,9 @@
 -      if ./amiroot ; then \
 -          chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
 -        chmod 2775 "$${d}" ; fi
-+#     set -e ; for i in . leaf.node failed.postings interesting.groups \
-+#             out.going message.id temp.files ; do \
-+#        mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
++#     set -e ; for i in "" /leaf.node /failed.postings /interesting.groups \
++#             /out.going /message.id /temp.files ; do \
++#        mkdir -p $(DESTDIR)$(SPOOLDIR)$$i ; \
 +#     if ./amiroot ; then \
 +#      chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
 +#      chmod 2775      $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab    15 Oct 2006 20:06:59 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/15 20:06:59 schwarz Exp $
-
---- mastring.h.orig    2006-10-15 21:51:05.000000000 +0200
-+++ mastring.h 2006-10-15 21:51:19.000000000 +0200
-@@ -38,7 +38,7 @@
- /*@only@*/ mastr *mastr_new(size_t);
- /*@only@*/ mastr *mastr_newstr(const char *);
- int mastr_cpy(mastr *, const char *);
--int mastr_cat(mastr *, /*@unique@*/ /*@observer@*/ const char *);
-+int mastr_cat(mastr *, /*@unique@*/ /*@observer@*/ const char *const);
- int mastr_vcat(mastr *, ...);
- int mastr_resizekeep(mastr *, size_t);
- int mastr_resizekill(mastr *, size_t);