(pkgsrc)

  Convert patches (for DESTDIR) to SUBST framework
(upstream)
  update 5.10.8 to 5.10.10
2008-04-10  Reiner Steib  <Reiner.Steib@gmx.de>

	* README: Gnus v5.10.10 is released.

2008-03-31  Katsumi Yamaoka  <yamaoka@jpl.org>

	* GNUS-NEWS (Installation changes): Mention that spaces and tabs are
	allowed in the installation directory name.

	* Makefile.in (datarootdir): Define.

	* aclocal.m4 (AC_PATH_LISPDIR): Quote directory name that might contain
	whitespace.

	* configure: Regenerate.

	* mkinstalldirs: Replace it with the 2006-05-11.19 version.

2008-03-22  Reiner Steib  <Reiner.Steib@gmx.de>

	* GNUS-NEWS (incoming mail files): Add version.

2008-03-08  Reiner Steib  <Reiner.Steib@gmx.de>

	* GNUS-NEWS: Update for change of `mail-source-delete-incoming'.

2008-03-01  Reiner Steib  <Reiner.Steib@gmx.de>

	* Update copyright years.

2007-11-04  Reiner Steib  <Reiner.Steib@gmx.de>

	* README: Bump version to 5.10.9.

2007-11-04  Reiner Steib  <Reiner.Steib@gmx.de>

	* Makefile.in (RELEASE_COMMIT_FILES): Add etc/ChangeLog.
	(release-check-settings): Add release-add-changelog
	(release-bump-version): Add check for CODENAME_TO_STABLE.  Split off
	release-add-changelog.
	(release-add-changelog): New target.  Separate some commands from
	release-bump-version.  Add etc/ChangeLog.
	(release-diff-commit-files): New target.
	(RELEASE_COMMIT_FILES): Reorder files.

2007-11-03  Reiner Steib  <Reiner.Steib@gmx.de>

	* COPYING: GPLv3 from Emacs repository.

2007-10-28  Reiner Steib  <Reiner.Steib@gmx.de>

	* Makefile.in (SED_I, CODENAME_PATTERN): New.
	(OLD_PATTERN): Adjust.
	(release-bump-version): Use new variables.  Allow going from
	development version to release.

2007-10-27  Alexander Solovyov  <piranha@piranha.org.ua>  (tiny change)

	* make.bat: Initial check didn't work if path contained spaces.

2007-10-27  Reiner Steib  <Reiner.Steib@gmx.de>

	* Makefile.in (release-bump-version): Adjust version
	in (gnus)Troubleshooting.

2007-10-04  Reiner Steib  <Reiner.Steib@gmx.de>

        * Relicense "GPLv2 or later" files to "GPLv3 or later".

2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>

	* Makefile.in (COMMIT_STRING): New variable.
	(release-bump-version): Use it.
	(bump-version, bump-version-commit): New targets.

2006-07-28  Reiner Steib  <Reiner.Steib@gmx.de>

	* GNUS-NEWS: Regenerate from Oort Gnus node in texi/gnus.texi using
	texi/gnus-news.el of the trunk.

2006-04-19  Reiner Steib  <Reiner.Steib@gmx.de>

	* make.bat (:etc): Simplify.

2006-04-18  Reiner Steib  <Reiner.Steib@gmx.de>

	* make.bat: Use "echo *" to clarify the output.
	(:lisp, :infotest): Avoid "not found" errors
	(:etc): Remove etc\gnus.  Be more verbose.

6 files changed, 23 insertions, 149 deletions

diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index 8fc5c003f5f..95006149422 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2013/04/06 20:27:23 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2014/11/23 05:59:45 mef Exp $
 
-DISTNAME=	gnus-5.10.8
+DISTNAME=	gnus-5.10.10
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	mail news
 MASTER_SITES=	http://gnus.org/dist/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gnus.org/
 COMMENT=	Gnus is a flexible message reader running under GNU Emacs
+LICENSE=	gnu-gpl-v3
 
 #EMACS_VERSIONS_ACCEPTED=	emacs21 emacs20 xemacs211 xemacs215
 
@@ -26,5 +26,13 @@ GNU_CONFIGURE_INFODIR=	${PREFIX}/share/doc/gnus/info
 USE_TOOLS+=		makeinfo
 INFO_FILES=		yes
 
+SUBST_CLASSES+=		destdir
+SUBST_FILES.destdir=	etc/Makefile.in lisp/Makefile.in texi/Makefile.in
+SUBST_STAGE.destdir=	post-patch
+SUBST_MESSAGE.destdir=	Convert install to ${DESTDIR}
+SUBST_SED.destdir=	-e  '/(etcdir)/s,\$$(etcdir),\$$(DESTDIR)/\$$(etcdir)/,'
+SUBST_SED.destdir+=	-e '/(lispdir)/s,\$$(lispdir),\$$(DESTDIR)/\$$(lispdir)/,'
+SUBST_SED.destdir+=	-e '/(infodir)/s,\$$(infodir),\$$(DESTDIR)/\$$(infodir)/,'
+
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/gnus/PLIST b/mail/gnus/PLIST
index 94abddca249..65695fe9e31 100644
--- a/mail/gnus/PLIST
+++ b/mail/gnus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/07/12 01:27:45 dholland Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/11/23 05:59:45 mef Exp $
 share/doc/gnus/info/emacs-mime
 share/doc/gnus/info/gnus
 share/doc/gnus/info/gnus-1
@@ -10,13 +10,10 @@ share/doc/gnus/info/message
 share/doc/gnus/info/pgg
 share/doc/gnus/info/sieve
 share/gnus/gnus-tut.txt
-share/gnus/images/gnus/bar.xbm
-share/gnus/images/gnus/bar.xpm
 share/gnus/images/gnus/catchup.pbm
 share/gnus/images/gnus/catchup.xpm
 share/gnus/images/gnus/cu-exit.pbm
 share/gnus/images/gnus/cu-exit.xpm
-share/gnus/images/gnus/dead.xpm
 share/gnus/images/gnus/describe-group.pbm
 share/gnus/images/gnus/describe-group.xpm
 share/gnus/images/gnus/exit-gnus.pbm
@@ -104,6 +101,7 @@ share/gnus/images/gnus/kill-group.pbm
 share/gnus/images/gnus/kill-group.xpm
 share/gnus/images/gnus/mail-reply.pbm
 share/gnus/images/gnus/mail-reply.xpm
+share/gnus/images/gnus/mail-send.xpm
 share/gnus/images/gnus/next-ur.pbm
 share/gnus/images/gnus/next-ur.xpm
 share/gnus/images/gnus/post.pbm
@@ -117,7 +115,6 @@ share/gnus/images/gnus/reply-wo.pbm
 share/gnus/images/gnus/reply-wo.xpm
 share/gnus/images/gnus/reply.pbm
 share/gnus/images/gnus/reply.xpm
-share/gnus/images/gnus/reverse-smile.xpm
 share/gnus/images/gnus/rot13.pbm
 share/gnus/images/gnus/rot13.xpm
 share/gnus/images/gnus/save-aif.pbm
@@ -139,6 +136,7 @@ share/gnus/images/smilies/blink.pbm
 share/gnus/images/smilies/blink.xpm
 share/gnus/images/smilies/braindamaged.xpm
 share/gnus/images/smilies/cry.xpm
+share/gnus/images/smilies/dead.xpm
 share/gnus/images/smilies/evil.xpm
 share/gnus/images/smilies/forced.xpm
 share/gnus/images/smilies/frown.pbm
@@ -173,6 +171,8 @@ ${EMACS_LISPPREFIX}/gnus/flow-fill.el
 ${EMACS_LISPPREFIX}/gnus/flow-fill.elc
 ${EMACS_LISPPREFIX}/gnus/format-spec.el
 ${EMACS_LISPPREFIX}/gnus/format-spec.elc
+${EMACS_LISPPREFIX}/gnus/gmm-utils.el
+${EMACS_LISPPREFIX}/gnus/gmm-utils.elc
 ${EMACS_LISPPREFIX}/gnus/gnus-agent.el
 ${EMACS_LISPPREFIX}/gnus/gnus-agent.elc
 ${EMACS_LISPPREFIX}/gnus/gnus-art.el
@@ -216,6 +216,7 @@ ${EMACS_LISPPREFIX}/gnus/gnus-int.elc
 ${EMACS_LISPPREFIX}/gnus/gnus-kill.el
 ${EMACS_LISPPREFIX}/gnus/gnus-kill.elc
 ${EMACS_LISPPREFIX}/gnus/gnus-load.el
+${FOR_emacs21}${EMACS_LISPPREFIX}/gnus/gnus-load.elc
 ${EMACS_LISPPREFIX}/gnus/gnus-logic.el
 ${EMACS_LISPPREFIX}/gnus/gnus-logic.elc
 ${FOR_emacs}${EMACS_LISPPREFIX}/gnus/gnus-mh.el
@@ -434,8 +435,8 @@ ${EMACS_LISPPREFIX}/gnus/spam-report.el
 ${EMACS_LISPPREFIX}/gnus/spam-report.elc
 ${EMACS_LISPPREFIX}/gnus/spam-stat.el
 ${EMACS_LISPPREFIX}/gnus/spam-stat.elc
-${EMACS_LISPPREFIX}/gnus/spam.el
-${EMACS_LISPPREFIX}/gnus/spam.elc
+${FOR_emacs22}${FOR_emacs23}${FOR_emacs24}${FOR_emacs25}${EMACS_LISPPREFIX}/gnus/spam.el
+${FOR_emacs22}${FOR_emacs23}${FOR_emacs24}${FOR_emacs25}${EMACS_LISPPREFIX}/gnus/spam.elc
 ${EMACS_LISPPREFIX}/gnus/starttls.el
 ${EMACS_LISPPREFIX}/gnus/starttls.elc
 ${EMACS_LISPPREFIX}/gnus/time-date.el
diff --git a/mail/gnus/distinfo b/mail/gnus/distinfo
index b7fca86f40f..a82126e6a0c 100644
--- a/mail/gnus/distinfo
+++ b/mail/gnus/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/04/01 09:12:04 obache Exp $
+$NetBSD: distinfo,v 1.8 2014/11/23 05:59:45 mef Exp $
 
-SHA1 (gnus-5.10.8.tar.gz) = 58ca5ca174140bc824b5e9533a869ae1d3596dc1
-RMD160 (gnus-5.10.8.tar.gz) = 4a2fdea20961d7a714670b59f4d34864ebcaa930
-Size (gnus-5.10.8.tar.gz) = 2496529 bytes
+SHA1 (gnus-5.10.10.tar.gz) = b03c7bba0b67c6fbc30bc1ef4c92e7a583481818
+RMD160 (gnus-5.10.10.tar.gz) = 8289bb37f067c59c50f647ae516f535a2f50bee7
+Size (gnus-5.10.10.tar.gz) = 2569569 bytes
 SHA1 (patch-aa) = f8e6a69610745e16c2fdf319294cf6931e31fe70
-SHA1 (patch-etc_Makefile.in) = 883261477be7bf5214e1e97d08a3238d26f38f77
-SHA1 (patch-lisp_Makefile.in) = a12f6c3b01e2ed64a44cc5634ee0b2cb3c902e98
-SHA1 (patch-texi_Makefile.in) = e2f916f91f98c65f1cd38fe4de1abb42fcde749b
diff --git a/mail/gnus/patches/patch-etc_Makefile.in b/mail/gnus/patches/patch-etc_Makefile.in
deleted file mode 100644
index d86b5a40ea4..00000000000
--- a/mail/gnus/patches/patch-etc_Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-etc_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
-
-* staged installation support
-
---- etc/Makefile.in.orig	2006-01-26 09:17:55.000000000 +0000
-+++ etc/Makefile.in
-@@ -14,23 +14,23 @@ INSTALL_DATA = @INSTALL_DATA@
- SHELL = /bin/sh
- 
- install:
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
- 	cd $(srcdir) \
- 	&& for p in gnus-tut.txt; do \
--	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
--	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
- 	done
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)/images/gnus
- 	cd $(srcdir) \
- 	&& for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
--	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
--	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
- 	done
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)/images/smilies
- 	cd $(srcdir) \
- 	&& for p in images/smilies/*.pbm images/smilies/*.xpm; do \
--	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
--	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
- 	done
- 
- uninstall:
diff --git a/mail/gnus/patches/patch-lisp_Makefile.in b/mail/gnus/patches/patch-lisp_Makefile.in
deleted file mode 100644
index bbaf1b22792..00000000000
--- a/mail/gnus/patches/patch-lisp_Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-lisp_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
-
-* staged installation support
-
---- lisp/Makefile.in.orig	2006-01-26 09:01:18.000000000 +0000
-+++ lisp/Makefile.in
-@@ -33,38 +33,38 @@ install: install-el-elc list-installed-s
- 
- # This entry will never install .el files if there are no .elc files.
- install-el: gnus-load.el
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
--	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
--	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
-+	echo " $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el"
-+	$(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el
- 	for p in *.elc; do \
- 	  p=`basename $$p c`; \
- 	  if [ -f "$(srcdir)/$$p" ]; then \
--	    echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(lispdir)/$$p; \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(lispdir)/$$p; \
- 	  fi; \
- 	done
- 
- install-elc: clever
- 	rm -f dgnushack.elc
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
- 	for p in *.elc; do \
--	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
--	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p; \
- 	done
- 
- install-el-elc: clever
- 	rm -f dgnushack.elc
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
--	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
--	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
-+	echo " $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el"
-+	$(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el
- 	for p in *.elc; do \
- 	  q=`basename $$p c`; \
- 	  if [ -f "$(srcdir)/$$q" ]; then \
--	    echo " $(INSTALL_DATA) $$q $(lispdir)/$$q"; \
--	    $(INSTALL_DATA) $(srcdir)/$$q $(lispdir)/$$q; \
-+	    echo " $(INSTALL_DATA) $$q $(DESTDIR)$(lispdir)/$$q"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$q $(DESTDIR)$(lispdir)/$$q; \
- 	  fi; \
--	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
--	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p; \
- 	done
- 
- list-installed-shadows:
diff --git a/mail/gnus/patches/patch-texi_Makefile.in b/mail/gnus/patches/patch-texi_Makefile.in
deleted file mode 100644
index fa040afe126..00000000000
--- a/mail/gnus/patches/patch-texi_Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-texi_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
-
-* staged installation support
-
---- texi/Makefile.in.orig	2006-01-26 09:01:12.000000000 +0000
-+++ texi/Makefile.in
-@@ -206,21 +206,21 @@ distclean: clean
- 	rm -f gnus-faq.xml gnus-faq.*.tmp
- 
- install: $(INFO_DEPS)
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
- 	@list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
- 	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
- 	    if test -f $$ifile; then \
--	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
--	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
-+	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-+	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile; \
- 	    else : ; fi; \
- 	  done; \
- 	done
- 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
--	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
--	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
-+	    echo " install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file";\
-+	    install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
- 	  done; \
- 	else : ; fi
-