summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2003-04-11 00:34:24 +0000
committeruebayasi <uebayasi@pkgsrc.org>2003-04-11 00:34:24 +0000
commit8fdaebd60a949213bc07c9610e3e1498d7f49a7b (patch)
tree412755ae556bf66c824f5aaec0b783cbfff8de5c /editors
parente3a2a0b56b80b831b9b4c3165d2bad33969d8ba5 (diff)
downloadpkgsrc-8fdaebd60a949213bc07c9610e3e1498d7f49a7b.tar.gz
Re-import of Emacs 21, which has settled down in editors/emacs21.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs/files/site-init.el9
-rw-r--r--editors/emacs/patches/patch-ak27
-rw-r--r--editors/emacs/patches/patch-xx27
3 files changed, 58 insertions, 5 deletions
diff --git a/editors/emacs/files/site-init.el b/editors/emacs/files/site-init.el
new file mode 100644
index 00000000000..c5332bad392
--- /dev/null
+++ b/editors/emacs/files/site-init.el
@@ -0,0 +1,9 @@
+;; $NetBSD: site-init.el,v 1.1.1.1 2003/04/11 00:34:25 uebayasi Exp $
+
+;; NetBSD puts info files in /usr/share.
+(setq Info-default-directory-list
+ (cons "/usr/share/info/"
+ Info-default-directory-list))
+
+(autoload 'send-pr "/usr/share/gnats/send-pr.el"
+ "Command to create and send a problem report." t)
diff --git a/editors/emacs/patches/patch-ak b/editors/emacs/patches/patch-ak
index d4abb5349e7..fe8a9d7f0e4 100644
--- a/editors/emacs/patches/patch-ak
+++ b/editors/emacs/patches/patch-ak
@@ -1,8 +1,25 @@
-$NetBSD: patch-ak,v 1.1 1998/09/04 02:28:54 tron Exp $
+$NetBSD: patch-ak,v 1.1.1.1 2003/04/11 00:34:26 uebayasi Exp $
---- lib-src/Makefile.in.orig Sun Aug 2 02:22:55 1998
-+++ lib-src/Makefile.in Fri Sep 4 01:40:32 1998
-@@ -286,12 +286,14 @@
+--- lib-src/Makefile.in.orig Fri Oct 19 02:31:27 2001
++++ lib-src/Makefile.in Thu May 2 20:53:52 2002
+@@ -85,6 +85,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ # By default, we uphold the dignity of our programs.
+ INSTALL_STRIP =
+
+@@ -288,7 +289,7 @@
+ if [ `(cd ${archlibdir} && /bin/pwd)` \
+ != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ for file in ${SCRIPTS}; do \
+- $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
++ $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
+ done ; \
+ fi
+
+@@ -296,12 +297,14 @@
@echo
@echo "Installing utilities for users to run."
for file in ${INSTALLABLES} ; do \
@@ -17,7 +34,7 @@ $NetBSD: patch-ak,v 1.1 1998/09/04 02:28:54 tron Exp $
for file in ${INSTALLABLE_SCRIPTS} ; do \
- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
- chmod a+rx ${bindir}/$${file}; \
-+ $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
++ $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
done
uninstall:
diff --git a/editors/emacs/patches/patch-xx b/editors/emacs/patches/patch-xx
new file mode 100644
index 00000000000..c0857171d22
--- /dev/null
+++ b/editors/emacs/patches/patch-xx
@@ -0,0 +1,27 @@
+$NetBSD: patch-xx,v 1.1.1.1 2003/04/11 00:34:26 uebayasi Exp $
+
+--- src/s/netbsd.h.orig Fri Apr 26 14:42:37 2002
++++ src/s/netbsd.h Fri Apr 26 14:43:34 2002
+@@ -72,22 +72,6 @@
+
+ #define AMPERSAND_FULL_NAME
+
+-#ifdef __ELF__
+-/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
+- says where to find X windows at run time. We convert it to a -rpath option
+- which is what OSF1 uses. */
+-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -L/usr/pkg/lib -L/usr/local/lib
+-
+-/* The following is needed to make `configure' find Xpm, Xaw3d and
+- image include and library files if using /usr/bin/gcc. That
+- compiler seems to be modified to not find headers in
+- /usr/local/include or libs in /usr/local/lib by default. */
+-
+-#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
+-
+-#endif /* __ELF__ */
+-
+ /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
+ the library search parth, i.e. it won't search /usr/lib
+ for libc and friends. Using -nostartfiles instead avoids