From 9cde12002876cf428f4a56824365c91d585aa3c6 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 24 Apr 2008 15:32:15 +0000 Subject: 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. --- editors/xemacs-nox11/DESCR | 21 --------------------- editors/xemacs-nox11/Makefile | 31 +++++++++++-------------------- 2 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 editors/xemacs-nox11/DESCR (limited to 'editors/xemacs-nox11') diff --git a/editors/xemacs-nox11/DESCR b/editors/xemacs-nox11/DESCR deleted file mode 100644 index 2f15164b440..00000000000 --- a/editors/xemacs-nox11/DESCR +++ /dev/null @@ -1,21 +0,0 @@ -XEmacs is a self-documenting, customizable, extensible real-time -display editor. - -Users new to XEmacs will be able to use basic features fairly rapidly -by studying the tutorial and using the self-documentation features. -XEmacs also has an extensive interactive manual browser. It is easily -extensible since its editing commands are written in Lisp. - -XEmacs's many special packages handle mail reading (RMail) and sending -(Mail), outline editing (Outline), compiling (Compile), running -subshells within Emacs windows (Shell), running a Lisp read-eval-print -loop (Lisp-Interaction-Mode), automated psychotherapy (Doctor :-) and -many more. There is a WWW browsing mode written fully in elisp -that looks and behaves much like the netscape WWW browser. - -XEmacs has similar functionality to GNU Emacs. It uses a different -display model, including support for Motif menu and scroll bars and the -ability to run as a widget inside other applications. Many people say -it looks nicer than GNU Emacs. - -Web site: http://www.xemacs.org diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index f771dc4909b..b3ce8642686 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,26 +1,17 @@ -# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:00 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2008/04/24 15:32:16 jlam Exp $ -.include "../../editors/xemacs/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGNAME= ${DISTNAME:S/xemacs/xemacs-nox11/} -PKGREVISION= 2 +FILESDIR= ${.CURDIR}/../../editors/xemacs/files +PATCHDIR= ${.CURDIR}/../../editors/xemacs/patches +PKGDIR= ${.CURDIR}/../../editors/xemacs -MAINTAINER= pkgsrc-users@NetBSD.org +# Mirror PKG_DESTDIR_SUPPORT setting from xemacs/Makefile. +PKG_DESTDIR_SUPPORT= user-destdir -CONFLICTS= xemacs-[0-9]* +.include "../../mk/bsd.prefs.mk" -PLIST_SRC= ${.CURDIR}/../xemacs/PLIST -DISTINFO_FILE= ${.CURDIR}/../xemacs/distinfo -FILESDIR= ${.CURDIR}/../xemacs/files -PATCHDIR= ${.CURDIR}/../xemacs/patches +PKG_OPTIONS.xemacs+= -x11 -lucid +#PKG_OPTIONS.xemacs+= -gtk -motif -xaw -CONFIGURE_ARGS+= --without-x11 # XXX -nox -CONFIGURE_ARGS+= --without-jpeg # XXX -nox -CONFIGURE_ARGS+= --without-png # XXX -nox -CONFIGURE_ARGS+= --without-tiff # XXX -nox -CONFIGURE_ARGS+= --without-xpm # XXX -nox -CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib -CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib - -.include "../../mk/bsd.pkg.mk" +.include "../../editors/xemacs/Makefile" -- cgit v1.2.3