* Unify info files for t-gnus

Submitted by: sf

* Add xemacs-package into {RUN,BUILD}-DEPENDS

Pointed out by: sf and bento

11 files changed, 28 insertions, 195 deletions

diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile
index 2e095918e345..583239c46dd1 100644
--- a/news/t-gnus-emacs20/Makefile
+++ b/news/t-gnus-emacs20/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MI
 RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 TGNUSVERSION=	6_14_6-04
 MIMEUI_PRODUCT?=semi
@@ -36,6 +37,10 @@ WITHOUT_MULE=yes
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
+		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
+		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
 .else
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
diff --git a/news/t-gnus-emacs20/files/patch-info b/news/t-gnus-emacs20/files/patch-info
new file mode 100644
index 000000000000..a792d88166c9
--- /dev/null
+++ b/news/t-gnus-emacs20/files/patch-info
@@ -0,0 +1,9 @@
+--- lisp/dgnushack.el.orig	Thu Mar  1 15:35:02 2001
++++ lisp/dgnushack.el	Sat Apr 14 09:21:25 2001
+@@ -445,5 +445,5 @@
+ 	      (set-buffer-modified-p nil)
+ 	      (message "texinfo formatting %s..." file)
+-	      (texinfo-format-buffer nil)
++	      (texinfo-format-buffer t)
+ 	      (if (buffer-modified-p)
+ 		  (progn (message "Saving modified %s" (buffer-file-name))
diff --git a/news/t-gnus-emacs20/pkg-plist.emacs20 b/news/t-gnus-emacs20/pkg-plist.emacs20
index f4e5cb7bcdbf..8d06ebc60aaf 100644
--- a/news/t-gnus-emacs20/pkg-plist.emacs20
+++ b/news/t-gnus-emacs20/pkg-plist.emacs20
@@ -231,37 +231,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime
 %%INFODIR%%/gnus
-%%INFODIR%%/gnus-1
-%%INFODIR%%/gnus-10
-%%INFODIR%%/gnus-11
-%%INFODIR%%/gnus-12
-%%INFODIR%%/gnus-13
-%%INFODIR%%/gnus-14
-%%INFODIR%%/gnus-15
-%%INFODIR%%/gnus-16
-%%INFODIR%%/gnus-17
-%%INFODIR%%/gnus-18
-%%INFODIR%%/gnus-2
-%%INFODIR%%/gnus-3
-%%INFODIR%%/gnus-4
-%%INFODIR%%/gnus-5
-%%INFODIR%%/gnus-6
-%%INFODIR%%/gnus-7
-%%INFODIR%%/gnus-8
-%%INFODIR%%/gnus-9
 %%INFODIR%%/gnus-ja
-%%INFODIR%%/gnus-ja-1
-%%INFODIR%%/gnus-ja-10
-%%INFODIR%%/gnus-ja-11
-%%INFODIR%%/gnus-ja-12
-%%INFODIR%%/gnus-ja-2
-%%INFODIR%%/gnus-ja-3
-%%INFODIR%%/gnus-ja-4
-%%INFODIR%%/gnus-ja-5
-%%INFODIR%%/gnus-ja-6
-%%INFODIR%%/gnus-ja-7
-%%INFODIR%%/gnus-ja-8
-%%INFODIR%%/gnus-ja-9
 %%INFODIR%%/message
 %%INFODIR%%/message-ja
 @exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
diff --git a/news/t-gnus-emacs20/pkg-plist.mule b/news/t-gnus-emacs20/pkg-plist.mule
index 8ebab2d828a6..1d763a38fcbe 100644
--- a/news/t-gnus-emacs20/pkg-plist.mule
+++ b/news/t-gnus-emacs20/pkg-plist.mule
@@ -233,44 +233,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime
 %%INFODIR%%/gnus
-%%INFODIR%%/gnus-1
-%%INFODIR%%/gnus-10
-%%INFODIR%%/gnus-11
-%%INFODIR%%/gnus-12
-%%INFODIR%%/gnus-13
-%%INFODIR%%/gnus-14
-%%INFODIR%%/gnus-15
-%%INFODIR%%/gnus-16
-%%INFODIR%%/gnus-17
-%%INFODIR%%/gnus-18
-%%INFODIR%%/gnus-2
-%%INFODIR%%/gnus-3
-%%INFODIR%%/gnus-4
-%%INFODIR%%/gnus-5
-%%INFODIR%%/gnus-6
-%%INFODIR%%/gnus-7
-%%INFODIR%%/gnus-8
-%%INFODIR%%/gnus-9
 %%INFODIR%%/gnus-ja
-%%INFODIR%%/gnus-ja-1
-%%INFODIR%%/gnus-ja-10
-%%INFODIR%%/gnus-ja-11
-%%INFODIR%%/gnus-ja-12
-%%INFODIR%%/gnus-ja-13
-%%INFODIR%%/gnus-ja-14
-%%INFODIR%%/gnus-ja-15
-%%INFODIR%%/gnus-ja-16
-%%INFODIR%%/gnus-ja-17
-%%INFODIR%%/gnus-ja-18
-%%INFODIR%%/gnus-ja-19
-%%INFODIR%%/gnus-ja-2
-%%INFODIR%%/gnus-ja-3
-%%INFODIR%%/gnus-ja-4
-%%INFODIR%%/gnus-ja-5
-%%INFODIR%%/gnus-ja-6
-%%INFODIR%%/gnus-ja-7
-%%INFODIR%%/gnus-ja-8
-%%INFODIR%%/gnus-ja-9
 %%INFODIR%%/message
 %%INFODIR%%/message-ja
 @exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
diff --git a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule b/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
index d0c73fb88a89..871a80287dd7 100644
--- a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
+++ b/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
@@ -257,37 +257,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 %%INFODIR%%/emacs-mime.info
 %%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
 %%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-12
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
 %%INFODIR%%/message.info
 %%INFODIR%%/message-ja.info
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/t-gnus
diff --git a/news/t-gnus-mule/Makefile b/news/t-gnus-mule/Makefile
index d795f357d411..998d8a63997c 100644
--- a/news/t-gnus-mule/Makefile
+++ b/news/t-gnus-mule/Makefile
@@ -8,6 +8,5 @@
 MASTERDIR=	${.CURDIR}/../t-gnus-emacs20
 
 EMACS_PORT_NAME=	mule
-PATCHDIR=		${.CURDIR}/files
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index 2e095918e345..583239c46dd1 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MI
 RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 TGNUSVERSION=	6_14_6-04
 MIMEUI_PRODUCT?=semi
@@ -36,6 +37,10 @@ WITHOUT_MULE=yes
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
+		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
+		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
 .else
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
diff --git a/news/t-gnus/files/patch-info b/news/t-gnus/files/patch-info
new file mode 100644
index 000000000000..a792d88166c9
--- /dev/null
+++ b/news/t-gnus/files/patch-info
@@ -0,0 +1,9 @@
+--- lisp/dgnushack.el.orig	Thu Mar  1 15:35:02 2001
++++ lisp/dgnushack.el	Sat Apr 14 09:21:25 2001
+@@ -445,5 +445,5 @@
+ 	      (set-buffer-modified-p nil)
+ 	      (message "texinfo formatting %s..." file)
+-	      (texinfo-format-buffer nil)
++	      (texinfo-format-buffer t)
+ 	      (if (buffer-modified-p)
+ 		  (progn (message "Saving modified %s" (buffer-file-name))
diff --git a/news/t-gnus/pkg-plist.emacs20 b/news/t-gnus/pkg-plist.emacs20
index f4e5cb7bcdbf..8d06ebc60aaf 100644
--- a/news/t-gnus/pkg-plist.emacs20
+++ b/news/t-gnus/pkg-plist.emacs20
@@ -231,37 +231,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime
 %%INFODIR%%/gnus
-%%INFODIR%%/gnus-1
-%%INFODIR%%/gnus-10
-%%INFODIR%%/gnus-11
-%%INFODIR%%/gnus-12
-%%INFODIR%%/gnus-13
-%%INFODIR%%/gnus-14
-%%INFODIR%%/gnus-15
-%%INFODIR%%/gnus-16
-%%INFODIR%%/gnus-17
-%%INFODIR%%/gnus-18
-%%INFODIR%%/gnus-2
-%%INFODIR%%/gnus-3
-%%INFODIR%%/gnus-4
-%%INFODIR%%/gnus-5
-%%INFODIR%%/gnus-6
-%%INFODIR%%/gnus-7
-%%INFODIR%%/gnus-8
-%%INFODIR%%/gnus-9
 %%INFODIR%%/gnus-ja
-%%INFODIR%%/gnus-ja-1
-%%INFODIR%%/gnus-ja-10
-%%INFODIR%%/gnus-ja-11
-%%INFODIR%%/gnus-ja-12
-%%INFODIR%%/gnus-ja-2
-%%INFODIR%%/gnus-ja-3
-%%INFODIR%%/gnus-ja-4
-%%INFODIR%%/gnus-ja-5
-%%INFODIR%%/gnus-ja-6
-%%INFODIR%%/gnus-ja-7
-%%INFODIR%%/gnus-ja-8
-%%INFODIR%%/gnus-ja-9
 %%INFODIR%%/message
 %%INFODIR%%/message-ja
 @exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
diff --git a/news/t-gnus/pkg-plist.mule b/news/t-gnus/pkg-plist.mule
index 8ebab2d828a6..1d763a38fcbe 100644
--- a/news/t-gnus/pkg-plist.mule
+++ b/news/t-gnus/pkg-plist.mule
@@ -233,44 +233,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime
 %%INFODIR%%/gnus
-%%INFODIR%%/gnus-1
-%%INFODIR%%/gnus-10
-%%INFODIR%%/gnus-11
-%%INFODIR%%/gnus-12
-%%INFODIR%%/gnus-13
-%%INFODIR%%/gnus-14
-%%INFODIR%%/gnus-15
-%%INFODIR%%/gnus-16
-%%INFODIR%%/gnus-17
-%%INFODIR%%/gnus-18
-%%INFODIR%%/gnus-2
-%%INFODIR%%/gnus-3
-%%INFODIR%%/gnus-4
-%%INFODIR%%/gnus-5
-%%INFODIR%%/gnus-6
-%%INFODIR%%/gnus-7
-%%INFODIR%%/gnus-8
-%%INFODIR%%/gnus-9
 %%INFODIR%%/gnus-ja
-%%INFODIR%%/gnus-ja-1
-%%INFODIR%%/gnus-ja-10
-%%INFODIR%%/gnus-ja-11
-%%INFODIR%%/gnus-ja-12
-%%INFODIR%%/gnus-ja-13
-%%INFODIR%%/gnus-ja-14
-%%INFODIR%%/gnus-ja-15
-%%INFODIR%%/gnus-ja-16
-%%INFODIR%%/gnus-ja-17
-%%INFODIR%%/gnus-ja-18
-%%INFODIR%%/gnus-ja-19
-%%INFODIR%%/gnus-ja-2
-%%INFODIR%%/gnus-ja-3
-%%INFODIR%%/gnus-ja-4
-%%INFODIR%%/gnus-ja-5
-%%INFODIR%%/gnus-ja-6
-%%INFODIR%%/gnus-ja-7
-%%INFODIR%%/gnus-ja-8
-%%INFODIR%%/gnus-ja-9
 %%INFODIR%%/message
 %%INFODIR%%/message-ja
 @exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
diff --git a/news/t-gnus/pkg-plist.xemacs21-mule b/news/t-gnus/pkg-plist.xemacs21-mule
index d0c73fb88a89..871a80287dd7 100644
--- a/news/t-gnus/pkg-plist.xemacs21-mule
+++ b/news/t-gnus/pkg-plist.xemacs21-mule
@@ -257,37 +257,7 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 %%INFODIR%%/emacs-mime.info
 %%INFODIR%%/gnus.info
-%%INFODIR%%/gnus.info-1
-%%INFODIR%%/gnus.info-10
-%%INFODIR%%/gnus.info-11
-%%INFODIR%%/gnus.info-12
-%%INFODIR%%/gnus.info-13
-%%INFODIR%%/gnus.info-14
-%%INFODIR%%/gnus.info-15
-%%INFODIR%%/gnus.info-16
-%%INFODIR%%/gnus.info-17
-%%INFODIR%%/gnus.info-18
-%%INFODIR%%/gnus.info-2
-%%INFODIR%%/gnus.info-3
-%%INFODIR%%/gnus.info-4
-%%INFODIR%%/gnus.info-5
-%%INFODIR%%/gnus.info-6
-%%INFODIR%%/gnus.info-7
-%%INFODIR%%/gnus.info-8
-%%INFODIR%%/gnus.info-9
 %%INFODIR%%/gnus-ja.info
-%%INFODIR%%/gnus-ja.info-1
-%%INFODIR%%/gnus-ja.info-10
-%%INFODIR%%/gnus-ja.info-11
-%%INFODIR%%/gnus-ja.info-12
-%%INFODIR%%/gnus-ja.info-2
-%%INFODIR%%/gnus-ja.info-3
-%%INFODIR%%/gnus-ja.info-4
-%%INFODIR%%/gnus-ja.info-5
-%%INFODIR%%/gnus-ja.info-6
-%%INFODIR%%/gnus-ja.info-7
-%%INFODIR%%/gnus-ja.info-8
-%%INFODIR%%/gnus-ja.info-9
 %%INFODIR%%/message.info
 %%INFODIR%%/message-ja.info
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/t-gnus