Restructure the following packages:

	editors/xemacs-current
	editors/xemacs-current-nox11

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

+ Rename the "xaw" option to "lucid" to match the option name used in
  xemacs/options.mk.  Also comment out the "esound" option which isn't
  fully supported yet.  Add some comments to the options.mk file to
  make it a little easier to understand.

  XXX Should probably add a pgsql option as this version of XEmacs has
  XXX some sort of PostgreSQL support.  Also need to sort out native
  XXX sound support.

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

+ As of version 21.5, xemacs switched to using GNU autoconf, so set
  GNU_CONFIGURE=yes.

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

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

+ Include buildlink3.mk files for zlib and gettext, which are detected
  automatically if they're in the base system.  Gettext is needed for
  MULE support.

+ In the Makefile and the PLIST, don't substitute for ${EMACSVER}.
  Instead substitute for ${DISTNAME} so the PLIST looks closer to
  xemacs/PLIST.

+ Add patch-al which handles a difference between bmake and gmake in
  using $< in a makefile target.

+ 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-current and xemacs-current-nox11 to 1.
  Both packages now track and use the same PKGREVISION number.

1 files changed, 12 insertions, 5 deletions

diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile
index 92abe92c45e..d46bd4c9c33 100644
--- a/editors/xemacs-current-nox11/Makefile
+++ b/editors/xemacs-current-nox11/Makefile
@@ -1,9 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2007/11/12 01:48:48 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/24 21:32:47 jlam Exp $
 
-.include "../../editors/xemacs-current/Makefile.common"
+PKGNAME=	${DISTNAME:S/-/-nox11-/}
 
-PKGNAME=	${DISTNAME:S/xemacs/xemacs-nox11/}
+FILESDIR=	${.CURDIR}/../../editors/xemacs-current/files
+PATCHDIR=	${.CURDIR}/../../editors/xemacs-current/patches
+PKGDIR=		${.CURDIR}/../../editors/xemacs-current
 
-CONFLICTS=	xemacs-[0-9]*
+# Mirror PKG_DESTDIR_SUPPORT setting from xemacs-current/Makefile.
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS.xemacs+=	-x11 -xft -gtk -lucid -motif
+
+.include "../../editors/xemacs-current/Makefile"