some cleanup, based on a package submission by Masao Uebayashi

<uebayasi@soum.co.jp>:
-select a reasonable set of options instead of using a ton of
 /etc/mk.conf variables
-dtrt with dependencies
-USE_BUILDLINK_ONLY
-use INSTALL_SCRIPT instead of creating a mess

3 files changed, 49 insertions, 17 deletions

diff --git a/editors/emacs21/patches/patch-ak b/editors/emacs21/patches/patch-ak
index 9d3ad3fc203..2c2553c21f1 100644
--- a/editors/emacs21/patches/patch-ak
+++ b/editors/emacs21/patches/patch-ak
@@ -1,8 +1,25 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/04/24 17:27:41 drochner Exp $
+$NetBSD: patch-ak,v 1.2 2002/05/02 20:21:32 drochner Exp $
 
---- lib-src/Makefile.in.orig	Wed Apr 24 14:24:16 2002
-+++ lib-src/Makefile.in	Wed Apr 24 17:10:31 2002
-@@ -296,12 +296,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.1.1 2002/04/24 17:27:41 drochner 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/emacs21/patches/patch-bc b/editors/emacs21/patches/patch-bc
deleted file mode 100644
index 5c60537e62a..00000000000
--- a/editors/emacs21/patches/patch-bc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/04/24 17:27:41 drochner Exp $
-
---- /dev/null	Fri Mar 26 07:52:59 1999
-+++ lisp/site-init.el	Wed Mar 24 09:37:17 1999
-@@ -0,0 +1,7 @@
-+;; 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/emacs21/patches/patch-xx b/editors/emacs21/patches/patch-xx
new file mode 100644
index 00000000000..26c7576c8cc
--- /dev/null
+++ b/editors/emacs21/patches/patch-xx
@@ -0,0 +1,27 @@
+$NetBSD: patch-xx,v 1.1 2002/05/02 20:21:32 drochner 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