CVS commit: pkgsrc/editors

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Thu Apr 24 15:32:16 UTC 2008

Modified Files:
        pkgsrc/editors/xemacs: Makefile PLIST distinfo options.mk
        pkgsrc/editors/xemacs-nox11: Makefile
        pkgsrc/editors/xemacs/patches: patch-ak
Removed Files:
        pkgsrc/editors/xemacs: Makefile.common
        pkgsrc/editors/xemacs-nox11: DESCR

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.84 -r1.85 pkgsrc/editors/xemacs/Makefile
cvs rdiff -r1.20 -r0 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -r1.15 -r1.16 pkgsrc/editors/xemacs/PLIST
cvs rdiff -r1.11 -r1.12 pkgsrc/editors/xemacs/distinfo
cvs rdiff -r1.7 -r1.8 pkgsrc/editors/xemacs/options.mk
cvs rdiff -r1.2 -r0 pkgsrc/editors/xemacs-nox11/DESCR
cvs rdiff -r1.19 -r1.20 pkgsrc/editors/xemacs-nox11/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/editors/xemacs/patches/patch-ak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.