Install documentation. Emacs is not the package that can be used

without it effectively.

5 files changed, 59 insertions, 55 deletions

diff --git a/editors/emacs24-nox11/Makefile b/editors/emacs24-nox11/Makefile
index c7444ceef22..7d0086f7b81 100644
--- a/editors/emacs24-nox11/Makefile
+++ b/editors/emacs24-nox11/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2012/06/16 21:04:16 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/26 17:02:31 asau Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
+PKGREVISION=	1
 
 CONFLICTS+=	emacs-[0-9]*
 
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index cb59f1a582b..99f7a974873 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2012/06/16 21:03:41 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/26 17:02:31 asau Exp $
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
 .include "../../editors/emacs24/Makefile.common"
+PKGREVISON=	1
 
 .include "options.mk"
 
diff --git a/editors/emacs24/PLIST b/editors/emacs24/PLIST
index 88e39919487..46d65cf7aec 100644
--- a/editors/emacs24/PLIST
+++ b/editors/emacs24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/06/16 21:03:41 dholland Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/06/26 17:02:31 asau Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -7,6 +7,59 @@ bin/emacsclient
 bin/etags
 bin/grep-changelog
 bin/rcs-checkin
+info/ada-mode.gz
+info/auth.gz
+info/autotype.gz
+info/calc.gz
+info/ccmode.gz
+info/cl.gz
+info/dbus.gz
+info/dired-x.gz
+info/ebrowse.gz
+info/ede.gz
+info/ediff.gz
+info/edt.gz
+info/efaq.gz
+info/eieio.gz
+info/eintr.gz
+info/elisp.gz
+info/emacs-gnutls.gz
+info/emacs-mime.gz
+info/emacs.gz
+info/epa.gz
+info/erc.gz
+info/ert.gz
+info/eshell.gz
+info/eudc.gz
+info/flymake.gz
+info/forms.gz
+info/gnus.gz
+info/idlwave.gz
+info/info.gz
+info/mairix-el.gz
+info/message.gz
+info/mh-e.gz
+info/newsticker.gz
+info/nxml-mode.gz
+info/org.gz
+info/pcl-cvs.gz
+info/pgg.gz
+info/rcirc.gz
+info/reftex.gz
+info/remember.gz
+info/sasl.gz
+info/sc.gz
+info/semantic.gz
+info/ses.gz
+info/sieve.gz
+info/smtpmail.gz
+info/speedbar.gz
+info/tramp.gz
+info/url.gz
+info/vip.gz
+info/viper.gz
+info/widget.gz
+info/woman.gz
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/profile
diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo
index b2f7e9118b4..448d609acf6 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2012/06/16 21:03:42 dholland Exp $
+$NetBSD: distinfo,v 1.2 2012/06/26 17:02:31 asau Exp $
 
 SHA1 (emacs-24.1.tar.gz) = f064396724a27c83b79b2d890d188abebaa5975e
 RMD160 (emacs-24.1.tar.gz) = 0fed00042339f46b29449bd561d2f881d13d8d38
@@ -6,5 +6,4 @@ Size (emacs-24.1.tar.gz) = 51473111 bytes
 SHA1 (patch-aa) = af6b26c47c3c9f4d444365945fa866001c7c28b7
 SHA1 (patch-ab) = 5b724343be52905f51e15f425295686205776e30
 SHA1 (patch-ad) = adc347ccd6edeb6e7ad96eeb98d6ee64176fb143
-SHA1 (patch-ae) = 8c76d4bf2662ee6519fe8fba6fd1ae740cc42b1d
 SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
diff --git a/editors/emacs24/patches/patch-ae b/editors/emacs24/patches/patch-ae
deleted file mode 100644
index 10c6858f119..00000000000
--- a/editors/emacs24/patches/patch-ae
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2012/06/16 21:03:42 dholland Exp $
-
-Remove info
-
---- Makefile.in.orig	2012-05-14 21:00:02.000000000 +0900
-+++ Makefile.in	2012-06-09 23:27:07.000000000 +0900
-@@ -137,7 +137,7 @@
- infodir=@infodir@
- INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse	\
-            ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc \
--	   ert eshell eudc flymake forms gnus idlwave info mairix-el	\
-+	   ert eshell eudc flymake forms gnus idlwave mairix-el	\
- 	   message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc	\
- 	   reftex remember sasl sc semantic ses sieve smtpmail speedbar \
- 	   tramp url vip viper widget woman
-@@ -461,7 +461,7 @@
- install: all install-arch-indep install-arch-dep install-leim blessmail
- 	@true
- 
--MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
-+MV_DIRS = for i in $$dir; do if test -e $$i ; then rm -fr `basename "$$i"` ; mv "$$i" . ; fi; done
- 
- ### Install the executables that were compiled specifically for this machine.
- ### It would be nice to do something for a parallel make
-@@ -620,7 +620,6 @@
- 	   else	\
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
--	      chmod a+r $(DESTDIR)${infodir}/dir); \
- 	   fi; \
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
-@@ -637,16 +636,7 @@
- 	   done); \
- 	else true; fi
- 	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
--	then \
--	  for elt in $(INFO_FILES); do \
--	    test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
--	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
--	  done; \
--	else true; fi
--	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
-+	chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
- 	thisdir=`/bin/pwd`; \
- 	cd ${mansrcdir}; \
- 	for page in ${MAN_PAGES}; do \