Restructure the following packages:

	editors/xemacs
	editors/xemacs-nox11

The latter is now just editors/xemacs built with a specific set of
options.  Changes include:

+ Add support for the following new options in options.mk:

	x11		Support X11 displays
	lucid		Use Lucid widget set

  Also add commented out support for the following options for
  alternative widget sets:

	gtk		GTK widgets
	motif		Motif widgets
	xaw		Athena widgets

  Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for
  the corresponding options.

+ Remove Makefile.common and move all logic into xemacs/Makefile and
  xemacs/options.mk.

+ Rename the "mule" PLIST variable to "canna", which more accurately
  reflects what is conditionally installed.

+ Include termcap.buildlink3.mk to properly deal with termcap/curses
  issues (xemacs needs termcap).  Drop the --with-ncurses=no setting
  as the issue is handled by termcap.buildlink3.mk.

+ In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES
  if we're actually going to extract all of those files all of the time.
  Just list them all in DISTFILES.

+ Be slightly more aware of ${X11_TYPE} == "modular" by not referring to
  ${X11BASE} in that case.

+ In patch-ak, directly substitute the local value of etcdir (``../etc/'')
  into src/Makefile.in.in.  This allows for overriding etcdir via
  INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
  will work.

+ Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override
  where files are installed during the install phase.

+ Honor PKGMANDIR.

+ Bump the PKGREVISION for xemacs and xemacs-nox11 to 4.  Both packages
  now track and use the same PKGREVISION number.

1 files changed, 22 insertions, 4 deletions

diff --git a/editors/xemacs/patches/patch-ak b/editors/xemacs/patches/patch-ak
index 142321933d4..bb8458cbb38 100644
--- a/editors/xemacs/patches/patch-ak
+++ b/editors/xemacs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
+$NetBSD: patch-ak,v 1.5 2008/04/24 15:32:15 jlam Exp $
 
---- src/Makefile.in.in.orig	Wed Jan 15 21:18:00 2003
+--- src/Makefile.in.in.orig	2005-01-30 21:55:02.000000000 -0500
 +++ src/Makefile.in.in
-@@ -72,8 +72,8 @@
+@@ -72,8 +72,8 @@ CPPFLAGS=@CPPFLAGS@
  LDFLAGS=@LDFLAGS@
  
  c_switch_all=@c_switch_all@
@@ -13,7 +13,7 @@ $NetBSD: patch-ak,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
  ld_dynamic_link_flags=@ld_dynamic_link_flags@
  
  extra_objs=@extra_objs@
-@@ -162,9 +162,9 @@
+@@ -163,9 +163,9 @@ ldflags += -Wl,--script=s/cygwin.sc
  
  #ifdef SOLARIS2
  %.o : %.c
@@ -25,3 +25,21 @@ $NetBSD: patch-ak,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
  	$(CC) -c $(cflags) $<
  
  ## Create preprocessor output (debugging purposes only)
+@@ -329,7 +329,7 @@ othersrcs = $(otherobjs:.o=.c)
+ LIBES = $(lwlib_libs) $(malloclib) $(ld_libs_all) $(lib_gcc)
+ 
+ #ifdef I18N3
+-mo_dir = ${etcdir}
++mo_dir = ../etc/
+ mo_file = ${mo_dir}emacs.mo
+ #endif
+ 
+@@ -658,7 +658,7 @@ libextcli_Xlib.so.1: ${external_client_x
+ #endif /* EXTERNAL_WIDGET */
+ 
+ config.h: ${srcdir}/config.h.in
+-Emacs.ad.h: ${srcdir}/${etcdir}Emacs.ad
++Emacs.ad.h: ${srcdir}/../etc/Emacs.ad
+ 
+ config.h sheap-adjust.h paths.h Emacs.ad.h :
+ 	@echo "The file $@ needs to be re-generated."