summaryrefslogtreecommitdiff
path: root/editors/emacs-nox11
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2003-04-15 03:37:19 +0000
committeruebayasi <uebayasi@pkgsrc.org>2003-04-15 03:37:19 +0000
commit073634756ef43a2e2807d7e1c01a9b2275042389 (patch)
tree5ba7a1d1d8edced86b01c7bd0a3451ceb80376ee /editors/emacs-nox11
parent85330b180feb590a3ebd6a90689481ababa5b098 (diff)
downloadpkgsrc-073634756ef43a2e2807d7e1c01a9b2275042389.tar.gz
Update emacs-nox11 to 21.3nb1 too. 21.3 + the new ld problem fix. Share
files/directories common to editors/emacs{,.-nox11}.
Diffstat (limited to 'editors/emacs-nox11')
-rw-r--r--editors/emacs-nox11/Makefile11
-rw-r--r--editors/emacs-nox11/distinfo9
-rw-r--r--editors/emacs-nox11/files/site-init.el9
-rw-r--r--editors/emacs-nox11/patches/patch-aa34
-rw-r--r--editors/emacs-nox11/patches/patch-ad7
-rw-r--r--editors/emacs-nox11/patches/patch-ae51
-rw-r--r--editors/emacs-nox11/patches/patch-ak40
-rw-r--r--editors/emacs-nox11/patches/patch-xx27
8 files changed, 8 insertions, 180 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index b2faf3f7f02..fad3323bd13 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 01:01:49 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/15 03:37:19 uebayasi Exp $
# FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
-DISTNAME= emacs-21.2
-PKGNAME= emacs-nox11-21.2
+DISTNAME= emacs-21.3
+PKGNAME= emacs-nox11-21.3
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
@@ -17,6 +18,10 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BUILDLINK2= yes
+PATCHDIR= ${PKGDIR}/../emacs/patches
+FILESDIR= ${PKGDIR}/../emacs/files
+DISTINFO_FILE= ${PKGDIR}/../emacs/distinfo
+
CONFIGURE_ARGS+=--without-x
INFO_FILES= emacs vip viper forms gnus mh-e cl sc dired-x ediff \
diff --git a/editors/emacs-nox11/distinfo b/editors/emacs-nox11/distinfo
deleted file mode 100644
index e3e6ba455f6..00000000000
--- a/editors/emacs-nox11/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/11 01:01:49 uebayasi Exp $
-
-SHA1 (emacs-21.2.tar.gz) = 3c0fd252adcac7a996c974b4fe9af554bdb04e75
-Size (emacs-21.2.tar.gz) = 20288222 bytes
-SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
-SHA1 (patch-ae) = 1060b18c7133d112b0119b58e3c524d6a84c084d
-SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
-SHA1 (patch-xx) = d226c394a07d25b23a0a31c24935d08e04ebee13
diff --git a/editors/emacs-nox11/files/site-init.el b/editors/emacs-nox11/files/site-init.el
deleted file mode 100644
index 76739ba88e6..00000000000
--- a/editors/emacs-nox11/files/site-init.el
+++ /dev/null
@@ -1,9 +0,0 @@
-;; $NetBSD: site-init.el,v 1.1.1.1 2003/04/11 01:01:49 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-nox11/patches/patch-aa b/editors/emacs-nox11/patches/patch-aa
deleted file mode 100644
index 88b858bd297..00000000000
--- a/editors/emacs-nox11/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/11 01:01:49 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-nox11/patches/patch-ad b/editors/emacs-nox11/patches/patch-ad
deleted file mode 100644
index a210e19e450..00000000000
--- a/editors/emacs-nox11/patches/patch-ad
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/04/11 01:01:49 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-nox11/patches/patch-ae b/editors/emacs-nox11/patches/patch-ae
deleted file mode 100644
index cee93fdbd5d..00000000000
--- a/editors/emacs-nox11/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/04/11 01:01:50 uebayasi Exp $
-
---- Makefile.in.orig Wed Apr 24 14:24:16 2002
-+++ Makefile.in Wed Apr 24 17:04:47 2002
-@@ -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}
- 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-nox11/patches/patch-ak b/editors/emacs-nox11/patches/patch-ak
deleted file mode 100644
index 03740266c8f..00000000000
--- a/editors/emacs-nox11/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2003/04/11 01:01:50 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-nox11/patches/patch-xx b/editors/emacs-nox11/patches/patch-xx
deleted file mode 100644
index 065b88fe8af..00000000000
--- a/editors/emacs-nox11/patches/patch-xx
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-xx,v 1.1.1.1 2003/04/11 01:01:50 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