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

6 files changed, 82 insertions, 43 deletions

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 05248e821c8..7871a174c9e 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/24 17:27:41 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/05/02 20:21:31 drochner Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.2
@@ -13,32 +13,29 @@ CONFLICTS=	mule-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_BUILDLINK_ONLY=	yes
+
+CONFIGURE_ARGS+=--with-x
+CONFIGURE_ARGS+=--with-x-toolkit=athena
+
+.include "../../graphics/xpm/buildlink.mk"
+CONFIGURE_ARGS+=--with-xpm
+.include "../../graphics/jpeg/buildlink.mk"
+CONFIGURE_ARGS+=--with-jpeg
+.include "../../graphics/tiff/buildlink.mk"
+CONFIGURE_ARGS+=--with-tiff
+# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
+BUILDLINK_DEPENDS.libungif=	libungif>=4.1.0.1
+.include "../../graphics/libungif/buildlink.mk"
+CONFIGURE_ARGS+=--with-gif
+.include "../../graphics/png/buildlink.mk"
+CONFIGURE_ARGS+=--with-png
 
-BUILD_DEFS+=	USE_INET6 EMACS_USE_POP EMACS_USE_X EMACS_USE_X_TOOLKIT
-
-.include "../../mk/bsd.prefs.mk"
-
-EMACS_USE_POP?=	yes
-.if (defined(EMACS_USE_POP) && \
-    (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
-CONFIGURE_ARGS+=--with-pop
-.endif
-.if defined(EMACS_USE_X)
-CONFIGURE_ARGS+=--with-x=${EMACS_USE_X}
-.endif
-.if defined(EMACS_USE_X_TOOLKIT)
-CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
-.endif
-.if (defined(USE_INET6) && ${USE_INET6} == NO)
-CONFIGURE_ARGS+=--without-ipv6
-.else
-CONFIGURE_ARGS+=--with-ipv6
-.endif
-MAKE_ENV+=	INSTALL_STRIP=${STRIPFLAG}
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 		    ccmode message widget reftex forms
 
-INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+post-extract:
+	${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM} -f
@@ -46,5 +43,6 @@ pre-install:
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index 509eda130b1..1002cc1c1c3 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/04/24 17:27:41 drochner Exp $
+$NetBSD: distinfo,v 1.2 2002/05/02 20:21:31 drochner 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) = 197bfef68089aa5e50cd618c10fb8b4f32e55b94
-SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
+SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
+SHA1 (patch-xx) = d226c394a07d25b23a0a31c24935d08e04ebee13
diff --git a/editors/emacs21/files/site-init.el b/editors/emacs21/files/site-init.el
new file mode 100644
index 00000000000..b3810d137ec
--- /dev/null
+++ b/editors/emacs21/files/site-init.el
@@ -0,0 +1,9 @@
+;; $NetBSD: site-init.el,v 1.1 2002/05/02 20:21:31 drochner 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/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