pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/xemacs-current/patches Upgrade to XEmacs 21.5.34
details: https://anonhg.NetBSD.org/pkgsrc/rev/649331096c40
branches: trunk
changeset: 371591:649331096c40
user: hauke <hauke%pkgsrc.org@localhost>
date: Wed Nov 15 15:01:36 2017 +0000
description:
Upgrade to XEmacs 21.5.34
Deal with bulk build namespace intrusion.
Was patch-an
diffstat:
editors/xemacs-current/patches/patch-an | 36 ---------------
editors/xemacs-current/patches/patch-src_Makefile.in.in | 40 +++++++++++++++++
2 files changed, 40 insertions(+), 36 deletions(-)
diffs (84 lines):
diff -r 19e1ad55f7b8 -r 649331096c40 editors/xemacs-current/patches/patch-an
--- a/editors/xemacs-current/patches/patch-an Wed Nov 15 15:00:38 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-an,v 1.1 2009/12/29 21:51:00 joerg Exp $
-
---- src/Makefile.in.in.orig 2009-12-29 21:28:28.000000000 +0000
-+++ src/Makefile.in.in
-@@ -451,10 +451,10 @@ RAW_EXE = temacs
- DO_TEMACS = $(DUMPENV) ./$(RAW_EXE)
- DO_XEMACS = ./$(PROGNAME)
-
--BATCH = -no-packages -batch
-+MY_BATCH = -no-packages -batch
- BATCH_PACKAGES = -vanilla -batch
--TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
--XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
-+TEMACS_BATCH = $(DO_TEMACS) -nd $(MY_BATCH)
-+XEMACS_BATCH = $(DO_XEMACS) $(MY_BATCH)
- XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES)
- temacs_loadup_args = -l $(LISP)/loadup.el
- dump_temacs_args = $(temacs_loadup_args) dump
-@@ -663,7 +663,7 @@ load-shadows: update-elc-2
-
- release: all
- -if [ -w $(LISP) ]; then \
-- w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \
-+ w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(MY_BATCH) -l $(LISP)/inc-vers; \
- else true; fi
- -$(dump_temacs)
- touch release
-@@ -974,7 +974,7 @@ run-rtcmacs: rtcmacs
- ignore POLL; \
- check -access; \
- suppress rui; \
-- runargs -nd $(BATCH) $(run_temacs_args) -vanilla; \
-+ runargs -nd $(MY_BATCH) $(run_temacs_args) -vanilla; \
- run' rtcmacs
-
- debug-temacs: $(RAW_EXE)
diff -r 19e1ad55f7b8 -r 649331096c40 editors/xemacs-current/patches/patch-src_Makefile.in.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/patches/patch-src_Makefile.in.in Wed Nov 15 15:01:36 2017 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_Makefile.in.in,v 1.1 2017/11/15 15:01:36 hauke Exp $
+
+Deal with bulk build namespace intrusion.
+
+Was patch-an
+
+--- src/Makefile.in.in.orig 2013-08-21 17:43:45.000000000 +0000
++++ src/Makefile.in.in
+@@ -437,10 +437,10 @@ RAW_EXE = temacs
+ DO_TEMACS = $(DUMPENV) ./$(RAW_EXE)
+ DO_XEMACS = ./$(PROGNAME)
+
+-BATCH = -no-packages -batch
++MY_BATCH = -no-packages -batch
+ BATCH_PACKAGES = -vanilla -batch
+-TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
+-XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
++TEMACS_BATCH = $(DO_TEMACS) -nd $(MY_BATCH)
++XEMACS_BATCH = $(DO_XEMACS) $(MY_BATCH)
+ XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES)
+ temacs_loadup_args = -l $(LISP)/loadup.el
+ dump_temacs_args = $(temacs_loadup_args) dump
+@@ -644,7 +644,7 @@ load-shadows: update-elc-2
+
+ release: all
+ -if [ -w $(LISP) ]; then \
+- w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(BATCH) -l $(LISP)/inc-vers; \
++ w=`pwd`; cd $(SRC) && $$w/$(RAW_EXE) -nd $(MY_BATCH) -l $(LISP)/inc-vers; \
+ else true; fi
+ -$(dump_temacs)
+ touch release
+@@ -931,7 +931,7 @@ run-rtcmacs: rtcmacs
+ ignore POLL; \
+ check -access; \
+ suppress rui; \
+- runargs -nd $(BATCH) $(run_temacs_args) -vanilla; \
++ runargs -nd $(MY_BATCH) $(run_temacs_args) -vanilla; \
+ run' rtcmacs
+
+ debug-temacs: $(RAW_EXE)
Home |
Main Index |
Thread Index |
Old Index