[pkgsrc/trunk]: pkgsrc/editors/xemacs-current/patches Upgrade to XEmacs 21.5.34

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db67d1c766ac
branches:  trunk
changeset: 371580:db67d1c766ac
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Wed Nov 15 14:52:02 2017 +0000

description:
Upgrade to XEmacs 21.5.34

Install internal build scripts as scripts
Prefix {c,e}tags to avoid conflicts

Was patch-ac

diffstat:

 editors/xemacs-current/patches/patch-ac                     |  64 -----------
 editors/xemacs-current/patches/patch-lib-src_Makefile.in.in |  70 +++++++++++++
 2 files changed, 70 insertions(+), 64 deletions(-)

diffs (142 lines):

diff -r bf463f729c28 -r db67d1c766ac editors/xemacs-current/patches/patch-ac
--- a/editors/xemacs-current/patches/patch-ac   Wed Nov 15 14:50:50 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2016/01/29 15:46:48 joerg Exp $
-
---- lib-src/Makefile.in.in.orig        2005-11-22 07:14:42.000000000 +0000
-+++ lib-src/Makefile.in.in
-@@ -67,7 +67,7 @@ sitemoduledir=@sitemoduledir@
- INSTALL = @install_pp@ @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- ## ========================== Lists of Files ===========================
- 
- #define NO_SHORTNAMES
-@@ -242,7 +242,7 @@ do-blessmail: $(blessmail)
- 
- ## Install the internal utilities.  Until they are installed, we can
- ## just run them directly from lib-src.
--${archlibdir}: all
-+install-archlibdir: all
-       @echo; echo "Installing utilities run internally by XEmacs."
-       ./make-path ${archlibdir}
-       if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
-@@ -253,17 +253,27 @@ ${archlibdir}: all
-       if test "`(cd ${archlibdir} && $(pwd))`" \
-            != "`(cd ${srcdir}     && $(pwd))`"; then \
-         for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
--          (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
-+          (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
-         done ; \
-       fi
- 
--install: ${archlibdir}
-+install: install-archlibdir
-       @echo; echo "Installing utilities for users to run."
-       for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
--        (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
--      done
-+                  if [ $${file} = etags ] || [ $${file} = ctags ] || [ $${file} = b2m ] ; \
-+          then \
-+            (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/xemacs-$${file}) ; \
-+          else \
-+          (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
-+          fi \
-+        done
-       for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
--        (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
-+          if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \
-+          then \
-+            (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \
-+          else \
-+            (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \
-+          fi \
-       done
- 
- uninstall:
-@@ -387,7 +397,7 @@ make-po: ${srcdir}/make-po.c
- make-dump-id: ${srcdir}/make-dump-id.c
-       $(CC) $(cflags) ${srcdir}/make-dump-id.c $(ldflags) -o $@
- 
--#ifndef DUMP_IN_EXEC
-+#ifdef DUMP_IN_EXEC
- insert-data-in-exec: ${srcdir}/insert-data-in-exec.c
-       $(CC) $(cflags) ${srcdir}/insert-data-in-exec.c $(ldflags) -o $@
- #endif /* not DUMP_IN_EXEC */
diff -r bf463f729c28 -r db67d1c766ac editors/xemacs-current/patches/patch-lib-src_Makefile.in.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in       Wed Nov 15 14:52:02 2017 +0000
@@ -0,0 +1,70 @@
+$NetBSD: patch-lib-src_Makefile.in.in,v 1.1 2017/11/15 14:52:02 hauke Exp $
+
+Add missing DESTDIR prefixes
+
+Install internal build scripts as scripts
+
+Prefix {c,e}tags to avoid conflicts
+
+Was patch-ac
+
+--- lib-src/Makefile.in.in.orig        2013-08-21 17:43:44.000000000 +0000
++++ lib-src/Makefile.in.in
+@@ -69,6 +69,7 @@ sitemoduledir=@sitemoduledir@
+ INSTALL = @install_pp@ @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ ## ========================== Lists of Files ===========================
+ 
+@@ -245,25 +246,35 @@ do-blessmail: $(blessmail)
+ ${archlibdir}: all
+       @echo; echo "Installing utilities run internally by XEmacs."
+       ./make-path $(DESTDIR)${archlibdir}
+-      if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
++      if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
+         for f in ${PRIVATE_INSTALLABLE_EXES}; do \
+           (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
+         done ; \
+       fi
+-      if test "`(cd ${archlibdir} && $(pwd))`" \
++      if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" \
+            != "`(cd ${srcdir}     && $(pwd))`"; then \
+         for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
+-          (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
++          (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
+         done ; \
+       fi
+ 
+ install: ${archlibdir}
+       @echo; echo "Installing utilities for users to run."
+       for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
+-        (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \
++          if [ $${file} = etags ] || [ $${file} = ctags ] || [ $${file} = b2m ] ; \
++            then \
++              (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/xemacs-$${file}) ; \
++            else \
++              (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \
++          fi \
+       done
+       for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
+-        (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
++          if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \
++            then \
++              (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/xemacs-$${file}) ; \
++            else \
++              (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
++          fi \
+       done
+ 
+ uninstall:
+@@ -379,7 +390,7 @@ make-dump-id: ${srcdir}/make-dump-id.c
+ #ifdef DUMP_IN_EXEC
+ insert-data-in-exec: ${srcdir}/insert-data-in-exec.c
+       $(CC) $(cflags) ${srcdir}/insert-data-in-exec.c $(ldflags) -o $@
+-#endif /* not DUMP_IN_EXEC */
++#endif /* DUMP_IN_EXEC */
+ 
+ cflags_gnuserv  = $(CFLAGS) $(cppflags) $(c_switch_all)
+ ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) @libs_xauth@ $(ld_libs_general)