Upgrade to XEmacs 21.5.34

Prefix {c,e}tags to avoid conflicts.

Was patch-aa

2 files changed, 42 insertions, 20 deletions

diff --git a/editors/xemacs-current/patches/patch-Makefile.in.in b/editors/xemacs-current/patches/patch-Makefile.in.in
new file mode 100644
index 00000000000..a49b2007cac
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-Makefile.in.in
@@ -0,0 +1,42 @@
+$NetBSD: patch-Makefile.in.in,v 1.1 2017/11/15 14:49:32 hauke Exp $
+
+Prefix {c,e}tags to avoid conflicts.
+
+was patch-aa
+
+--- Makefile.in.in.orig	2013-08-21 17:45:17.000000000 +0000
++++ Makefile.in.in
+@@ -407,7 +407,7 @@ install-arch-dep: mkdir
+ 	   fi; \
+ 	   ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
+ 	   ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \
+-	   for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
++	   for subdir in `find $(DESTDIR)${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
+ 	     do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
+ 	else true; fi
+ #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE))
+@@ -430,7 +430,8 @@ install-arch-dep: mkdir
+ # endif /* CYGWIN */
+ #endif /* WIN32_NATIVE */
+ #ifdef HAVE_SHLIB
+-	$(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir)
++	$(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.el $(DESTDIR)$(moduledir)
++	$(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.elc $(DESTDIR)$(moduledir)
+ #endif
+ 
+ install-arch-indep: mkdir info
+@@ -471,8 +472,12 @@ install-arch-indep: mkdir info
+ 	fi
+ 	cd ${srcdir}/etc && \
+ 	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
+-	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
+-	    chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \
++            if [ $${page} = etags ] || [ $${page} = ctags ] ; \
++            then \
++              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/xemacs-$${page}${manext} ; \
++            else \
++              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
++            fi \
+ 	  done
+ 	@echo "If you would like to save approximately 4M of disk space, do"
+ 	@echo "make gzip-el"
diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa
deleted file mode 100644
index 2c8878b89d0..00000000000
--- a/editors/xemacs-current/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/09/04 09:20:51 martin Exp $
-
---- Makefile.in.in.orig	2005-12-31 13:41:23.000000000 +0100
-+++ Makefile.in.in	2006-08-30 17:24:05.000000000 +0200
-@@ -462,8 +462,13 @@
- 	fi
- 	cd ${srcdir}/etc && \
- 	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
--	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
--	    chmod 0644 ${mandir}/$${page}${manext} ; \
-+           if [ $${page} = etags ] || [ $${page} = ctags ] ; \
-+           then \
-+             ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
-+           else \
-+             ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
-+           fi \
-+
- 	  done
- 	@echo "If you would like to save approximately 4M of disk space, do"
- 	@echo "make gzip-el"