summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2003-04-11 00:56:32 +0000
committeruebayasi <uebayasi@pkgsrc.org>2003-04-11 00:56:32 +0000
commit64934caef454c3632a97a8753312ed78025ea10f (patch)
treef1498ddd1e6a076ab744db201584a57f3b85cc08 /editors
parent524987489044a8e68c6561b69197dff2ccffb3c3 (diff)
downloadpkgsrc-64934caef454c3632a97a8753312ed78025ea10f.tar.gz
Make sure the new ones are there...
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs/patches/patch-aa34
-rw-r--r--editors/emacs/patches/patch-ad7
-rw-r--r--editors/emacs/patches/patch-ae52
-rw-r--r--editors/emacs/patches/patch-ak40
-rw-r--r--editors/emacs/patches/patch-xx27
5 files changed, 160 insertions, 0 deletions
diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa
new file mode 100644
index 00000000000..1f8bff090c8
--- /dev/null
+++ b/editors/emacs/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.11 2003/04/11 00:56:32 uebayasi Exp $
+
+--- man/Makefile.in.orig Wed Apr 24 16:54:15 2002
++++ man/Makefile.in Wed Apr 24 16:55:45 2002
+@@ -34,7 +34,7 @@
+ MAKEINFO = makeinfo
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+ ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+- ../info/info ../info/message ../info/mh-e ../info/reftex \
++ ../info/message ../info/mh-e ../info/reftex \
+ ../info/sc ../info/vip ../info/viper ../info/widget \
+ ../info/efaq ../info/ada-mode ../info/autotype \
+ ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
+@@ -100,6 +100,7 @@
+ ${srcdir}/glossary.texi \
+ ${srcdir}/ack.texi
+
++all: info
+ info: $(INFO_TARGETS)
+
+ dvi: $(DVI_TARGETS)
+@@ -112,12 +113,6 @@
+ # The following target uses an explicit -o switch to work around
+ # the @setfilename directive in info.texi, which is required for
+ # the Texinfo distribution.
+-
+-../info/info: ${INFOSOURCES}
+- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
+-
+-info.dvi: ${INFOSOURCES}
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+
+ ../info/emacs: ${EMACSSOURCES}
+ cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs/patches/patch-ad b/editors/emacs/patches/patch-ad
new file mode 100644
index 00000000000..667833ceea7
--- /dev/null
+++ b/editors/emacs/patches/patch-ad
@@ -0,0 +1,7 @@
+$NetBSD: patch-ad,v 1.5 2003/04/11 00:56:32 uebayasi Exp $
+
+--- etc/ctags.1.orig Sun Oct 3 14:14:21 1999
++++ etc/ctags.1 Wed Apr 24 16:57:49 2002
+@@ -1 +1 @@
+-.so man1/etags.1
++.so man1/emacs-etags.1
diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae
new file mode 100644
index 00000000000..26dc8332c0f
--- /dev/null
+++ b/editors/emacs/patches/patch-ae
@@ -0,0 +1,52 @@
+$NetBSD: patch-ae,v 1.9 2003/04/11 00:56:32 uebayasi Exp $
+
+--- Makefile.in.orig Mon Jan 13 21:24:28 2003
++++ Makefile.in
+@@ -429,28 +429,24 @@
+ chmod a+r ${infodir}/dir); \
+ fi; \
+ cd ${srcdir}/info ; \
+- for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
++ for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
+ (cd $${thisdir}; \
+- ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
+- chmod a+r ${infodir}/$$f); \
++ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
+ done); \
+ else true; fi
+ -unset CDPATH; \
+- thisdir=`/bin/pwd`; \
+- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+- then \
+- for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
+- (cd $${thisdir}; \
+- ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
+- done; \
+- else true; fi
+- -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
++ chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
+ thisdir=`/bin/pwd`; \
+ cd ${srcdir}/etc; \
+ for page in emacs etags ctags gfdl ; do \
+ (cd $${thisdir}; \
+- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
+- chmod a+r ${man1dir}/$${page}${manext}); \
++ if [ $${page} = emacs ]; then \
++ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
++ chmod a+r ${man1dir}/$${page}${manext}; \
++ else \
++ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/emacs-$${page}${manext}; \
++ chmod a+r ${man1dir}/emacs-$${page}${manext}; \
++ fi) \
+ done
+
+ ### Install LEIM files. Although they are machine-independent, we
+@@ -505,7 +501,7 @@
+ done
+ (cd ${archlibdir} && rm -f fns-*)
+ -rm -rf ${libexecdir}/emacs/${version}
+- (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
++ (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
+ (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1)
+ (cd ${bindir} && rm -f emacs-${version} $(EMACS))
+
diff --git a/editors/emacs/patches/patch-ak b/editors/emacs/patches/patch-ak
new file mode 100644
index 00000000000..36f75a2d490
--- /dev/null
+++ b/editors/emacs/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.4 2003/04/11 00:56:32 uebayasi Exp $
+
+--- 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 \
+- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+- chmod a+rx ${bindir}/$${file}; \
++ if [ $${file} = emacsclient ] ; then \
++ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
++ else \
++ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/emacs-$${file} ; \
++ fi ; \
+ done
+ for file in ${INSTALLABLE_SCRIPTS} ; do \
+- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+- chmod a+rx ${bindir}/$${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..205e96ae2b3
--- /dev/null
+++ b/editors/emacs/patches/patch-xx
@@ -0,0 +1,27 @@
+$NetBSD: patch-xx,v 1.3 2003/04/11 00:56:32 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