[pkgsrc/trunk]: pkgsrc Upgrade to leafnode 1.10.7:

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a8111e1d554
branches:  trunk
changeset: 487198:8a8111e1d554
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue Jan 11 04:34:08 2005 +0000

description:
Upgrade to leafnode 1.10.7:
- numerous bug fixes
- restores Xref: to XOVER (overview) data

diffstat:

 doc/CHANGES                    |   3 ++-
 doc/TODO                       |   3 +--
 news/leafnode/Makefile         |   8 +++++---
 news/leafnode/distinfo         |   8 ++++----
 news/leafnode/patches/patch-aa |  18 ++++++++----------
 5 files changed, 20 insertions(+), 20 deletions(-)

diffs (127 lines):

diff -r a22f8bb33b11 -r 8a8111e1d554 doc/CHANGES
--- a/doc/CHANGES       Tue Jan 11 03:58:22 2005 +0000
+++ b/doc/CHANGES       Tue Jan 11 04:34:08 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8689 2005/01/11 03:30:08 dmcmahill Exp $
+$NetBSD: CHANGES,v 1.8690 2005/01/11 04:35:19 kim Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -226,3 +226,4 @@
        Updated gschem to 20041228 [dmcmahill 2005-01-10]
        Updated gsymcheck to 20041228 [dmcmahill 2005-01-10]
        Updated libgeda to 20041228 [dmcmahill 2005-01-10]
+       Updated leafnode to 1.10.7 [kim 2005-01-11]
diff -r a22f8bb33b11 -r 8a8111e1d554 doc/TODO
--- a/doc/TODO  Tue Jan 11 03:58:22 2005 +0000
+++ b/doc/TODO  Tue Jan 11 04:34:08 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2874 2005/01/10 16:28:26 dillo Exp $
+$NetBSD: TODO,v 1.2875 2005/01/11 04:35:19 kim Exp $
 
 Suggested new packages
 ======================
@@ -634,7 +634,6 @@
        o lavaps-2.7
        o lcab-1.0b11
        o lcc-4.2
-       o leafnode-1.10.7
        o leafpad-0.7.9
        o libast-0.6
        o libcdio-0.71
diff -r a22f8bb33b11 -r 8a8111e1d554 news/leafnode/Makefile
--- a/news/leafnode/Makefile    Tue Jan 11 03:58:22 2005 +0000
+++ b/news/leafnode/Makefile    Tue Jan 11 04:34:08 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/11/19 16:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/11 04:34:08 kim Exp $
 
-DISTNAME=              leafnode-1.9.52.rel
+DISTNAME=              leafnode-1.10.7.rel
 PKGNAME=               ${DISTNAME:S/.rel//}
-PKGREVISION=   1
+PKGREVISION=           # empty
 CATEGORIES=            news
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=leafnode/}
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://leafnode.sourceforge.net/
 COMMENT=               NNTP server for small (dialup) sites
 
+CONFLICTS+=            cyrus-imapd<2.2.10nb2
+
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
diff -r a22f8bb33b11 -r 8a8111e1d554 news/leafnode/distinfo
--- a/news/leafnode/distinfo    Tue Jan 11 03:58:22 2005 +0000
+++ b/news/leafnode/distinfo    Tue Jan 11 04:34:08 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2004/05/05 15:25:40 cjep Exp $
+$NetBSD: distinfo,v 1.12 2005/01/11 04:34:08 kim Exp $
 
-SHA1 (leafnode-1.9.52.rel.tar.bz2) = 49f22bd3685ab7d3d103a9ba6364d930d535eafb
-Size (leafnode-1.9.52.rel.tar.bz2) = 690430 bytes
-SHA1 (patch-aa) = c01591d1d8d4d820ffc5984828a3ced808d9b437
+SHA1 (leafnode-1.10.7.rel.tar.bz2) = 5bfd2a363961ffa8535e9761feba9825a0c2cb6e
+Size (leafnode-1.10.7.rel.tar.bz2) = 384931 bytes
+SHA1 (patch-aa) = 4d3e37a36cd63428fb3c392128eef933b3499d8c
diff -r a22f8bb33b11 -r 8a8111e1d554 news/leafnode/patches/patch-aa
--- a/news/leafnode/patches/patch-aa    Tue Jan 11 03:58:22 2005 +0000
+++ b/news/leafnode/patches/patch-aa    Tue Jan 11 04:34:08 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/05/05 15:25:40 cjep Exp $
+$NetBSD: patch-aa,v 1.5 2005/01/11 04:34:08 kim Exp $
 
---- Makefile.in.orig   2004-04-03 17:57:05.000000000 +0100
-+++ Makefile.in
-@@ -822,14 +822,14 @@ uninstall-man8:
+--- Makefile.in.orig   2004-11-20 08:52:32.000000000 -0500
++++ Makefile.in        2005-01-10 22:41:49.000000000 -0500
+@@ -791,14 +791,14 @@
          rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
        done
  install-sysconfDATA: $(sysconf_DATA)
@@ -10,7 +10,7 @@
 -      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="`echo $$p | sed -e 's|^.*/||'`"; \
+-        f=$(am__strip_dir) \
 -        echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
 -        $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 -      done
@@ -18,14 +18,14 @@
 +#     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="`echo $$p | sed -e 's|^.*/||'`"; \
++#       f=$(am__strip_dir) \
 +#       echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
 +#       $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 +#     done
  
  uninstall-sysconfDATA:
        @$(NORMAL_UNINSTALL)
-@@ -1355,18 +1355,18 @@ rpm:
+@@ -1327,17 +1327,17 @@
        rpm -ba leafnode.spec
  
  install-data-hook: amiroot
@@ -40,7 +40,6 @@
 -      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 ; \
@@ -52,7 +51,6 @@
 +#     if ./amiroot ; then \
 +#          chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
 +#       chmod 2775 "$${d}" ; fi
-+#
+ 
  uninstall-local:
        rm -rf $(DESTDIR)$(SPOOLDIR) $(DESTDIR)@LOCKFILE@
-