[pkgsrc/trunk]: pkgsrc/editors Restructure the following packages:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/editors Restructure the following packages:
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:05:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff6262fd5886
branches:  trunk
changeset: 541706:ff6262fd5886
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 24 21:32:47 2008 +0000

description:
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.

diffstat:

 editors/xemacs-current-nox11/Makefile   |    17 +-
 editors/xemacs-current/DESCR            |     2 -
 editors/xemacs-current/MESSAGE          |     4 +-
 editors/xemacs-current/Makefile         |    92 +-
 editors/xemacs-current/Makefile.common  |    58 -
 editors/xemacs-current/PLIST            |  2883 +++++++++++++++---------------
 editors/xemacs-current/distinfo         |     3 +-
 editors/xemacs-current/options.mk       |    84 +-
 editors/xemacs-current/patches/patch-al |    13 +
 9 files changed, 1625 insertions(+), 1531 deletions(-)

diffs (truncated from 3278 to 300 lines):

diff -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current-nox11/Makefile
--- a/editors/xemacs-current-nox11/Makefile     Thu Apr 24 21:32:11 2008 +0000
+++ b/editors/xemacs-current-nox11/Makefile     Thu Apr 24 21:32:47 2008 +0000
@@ -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 $
+
+PKGNAME=       ${DISTNAME:S/-/-nox11-/}
 
-.include "../../editors/xemacs-current/Makefile.common"
+FILESDIR=      ${.CURDIR}/../../editors/xemacs-current/files
+PATCHDIR=      ${.CURDIR}/../../editors/xemacs-current/patches
+PKGDIR=                ${.CURDIR}/../../editors/xemacs-current
 
-PKGNAME=       ${DISTNAME:S/xemacs/xemacs-nox11/}
+# Mirror PKG_DESTDIR_SUPPORT setting from xemacs-current/Makefile.
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-CONFLICTS=     xemacs-[0-9]*
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../mk/bsd.pkg.mk"
+PKG_OPTIONS.xemacs+=   -x11 -xft -gtk -lucid -motif
+
+.include "../../editors/xemacs-current/Makefile"
diff -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current/DESCR
--- a/editors/xemacs-current/DESCR      Thu Apr 24 21:32:11 2008 +0000
+++ b/editors/xemacs-current/DESCR      Thu Apr 24 21:32:47 2008 +0000
@@ -19,5 +19,3 @@
 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 -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current/MESSAGE
--- a/editors/xemacs-current/MESSAGE    Thu Apr 24 21:32:11 2008 +0000
+++ b/editors/xemacs-current/MESSAGE    Thu Apr 24 21:32:47 2008 +0000
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/07/15 22:57:27 heinz Exp $
+$NetBSD: MESSAGE,v 1.3 2008/04/24 21:32:47 jlam Exp $
 
-Copy ${PREFIX}/lib/${EMACSVER}/etc/sample.init.el to ~/.xemacs/init.el.
+Copy ${PREFIX}/lib/${DISTNAME}/etc/sample.init.el to ~/.xemacs/init.el.
 You need to install xemacs-package for a basic set of
 support packages.
 
diff -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Thu Apr 24 21:32:11 2008 +0000
+++ b/editors/xemacs-current/Makefile   Thu Apr 24 21:32:47 2008 +0000
@@ -1,5 +1,93 @@
-# $NetBSD: Makefile,v 1.63 2007/11/12 01:48:47 uebayasi Exp $
+# $NetBSD: Makefile,v 1.64 2008/04/24 21:32:47 jlam Exp $
+
+PKGNAME?=      ${DISTNAME}
+COMMENT?=      *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
+
+DISTNAME=      xemacs-21.5.27
+EMACSVERSION=  21.5-b27
+EMACS_DISTNAME=        xemacs-${EMACSVERSION}
+PKGREVISION=   1
+CATEGORIES=    editors
+MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.xemacs.org/
+
+CONFLICTS+=    gnuclient-[0-9]*
+CONFLICTS+=    xemacs-[0-9]*
+CONFLICTS+=    xemacs-nox11-[0-9]*
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=             2.95.3
+.endif
+
+PLIST_SUBST+=          DISTNAME=${EMACS_DISTNAME}
+FILES_SUBST+=          DISTNAME=${EMACS_DISTNAME}
+MESSAGE_SUBST+=                DISTNAME=${EMACS_DISTNAME}
+INFO_FILES=            # PLIST
+
+.include "options.mk"
+
+# The XEmacs configure script does something silly to the value of mandir
+# passed to the configure script to point it to where the man1 pages go.
+# Point it there directly.
+#
+GNU_CONFIGURE_MANDIR=  ${PREFIX:Q}/${PKGMANDIR}/man1
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-clash-detection
+CONFIGURE_ARGS+=       --with-mule
+CONFIGURE_ARGS+=       --with-zlib
+CONFIGURE_ARGS+=       --without-msw
+CFLAGS+=               -Dunix
 
-.include "../../editors/xemacs-current/Makefile.common"
+# Newer gcc has big trouble with aliasing.  This should be fixed in the
+# source, but until then, use the big hammer here.
+#
+CFLAGS+=               -fno-strict-aliasing
+
+.if ${X11_TYPE} != "modular"
+INFOPATH=              ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.else
+INFOPATH=              ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.endif
+CONFIGURE_ARGS+=       --with-infopath=${INFOPATH:Q}
+
+# Having the build path in the dumped emacs is not a problem.
+CHECK_WRKREF_SKIP+=    bin/xemacs
+CHECK_WRKREF_SKIP+=    bin/xemacs-${EMACSVERSION}
+
+LIBDIR=                        ${PREFIX}/lib/${EMACS_DISTNAME}
+ARCHLIBDIR=            ${LIBDIR}/${MACHINE_GNU_PLATFORM}
+
+# This list overrides variables used in the source Makefiles at install
+# time to allow for ${DESTDIR}-style installation.  This variables list
+# is pulled from the ``mkdir'' target of Makefile.in.in.
+#
+INSTALL_MAKE_FLAGS+=   archlibdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=   bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+=   datadir=${DESTDIR}${PREFIX}/lib
+INSTALL_MAKE_FLAGS+=   docdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=   etcdir=${DESTDIR}${LIBDIR}/etc
+INSTALL_MAKE_FLAGS+=   exec_prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   infodir=${DESTDIR}${LIBDIR}/info
+INSTALL_MAKE_FLAGS+=   libdir=${DESTDIR}/lib
+INSTALL_MAKE_FLAGS+=   lispdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=   moduledir=${DESTDIR}${ARCHLIBDIR}/modules
+INSTALL_MAKE_FLAGS+=   pkgdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
+INSTALL_MAKE_FLAGS+=   sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
+
+pre-build:
+       rm -f ${WRKSRC}/etc/ctags.1.orig
+
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current/Makefile.common
--- a/editors/xemacs-current/Makefile.common    Thu Apr 24 21:32:11 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2007/11/13 04:07:42 dan Exp $
-
-DISTNAME=      xemacs-21.5.27
-
-CATEGORIES=    editors
-MASTER_SITES=  ${MASTER_SITE_XEMACS:=xemacs-21.5/}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.xemacs.org/
-COMMENT=       *BETA* XEmacs text editor version 21.5.27
-
-CONFLICTS+=    gnuclient-[0-9]*
-
-DESCR_SRC=     ${.CURDIR}/../../editors/xemacs-current/DESCR
-PLIST_SRC=     ${.CURDIR}/../../editors/xemacs-current/PLIST
-DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs-current/distinfo
-FILESDIR=      ${.CURDIR}/../../editors/xemacs-current/files
-PATCHDIR=      ${.CURDIR}/../../editors/xemacs-current/patches
-
-EMACSVERSION=  21.5-b27
-PLIST_SUBST+=  EMACSVER=xemacs-${EMACSVERSION}
-MESSAGE_SUBST+=        EMACSVER=xemacs-${EMACSVERSION}
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=             2.95.3
-.endif
-
-.include "../../editors/xemacs-current/options.mk"
-
-.include "../../databases/gdbm/buildlink3.mk"
-
-INFOPATH=      ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
-
-HAS_CONFIGURE=         YES
-CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=       --with-clash-detection
-CONFIGURE_ARGS+=       --with-mule=yes
-CONFIGURE_ARGS+=       --without-ncurses
-CONFIGURE_ARGS+=       --without-msw
-CONFIGURE_ARGS+=       ${WITH_WIDGETS}
-CONFIGURE_ARGS+=       --with-infopath=${INFOPATH:Q}
-CONFIGURE_ARGS+=       --with-site-includes=${PREFIX}/include:${WRKDIR}
-CONFIGURE_ARGS+=       --with-site-libraries=${PREFIX}/lib
-
-CFLAGS+=               -Dunix
-# newer gcc has big trouble with aliasing otherwise - this should be fixed
-# in the source, but untill then, use the big hammer here:
-CFLAGS+=               -fno-strict-aliasing
-
-INFO_FILES=            # PLIST
-
-# build PATH in the dumped emacs is not a problem
-CHECK_WRKREF_SKIP+=    bin/xemacs
-CHECK_WRKREF_SKIP+=    bin/xemacs-${EMACSVERSION}
-
-post-patch:
-       rm -f ${WRKSRC}/etc/ctags.1.orig
diff -r 0278e7ab0770 -r ff6262fd5886 editors/xemacs-current/PLIST
--- a/editors/xemacs-current/PLIST      Thu Apr 24 21:32:11 2008 +0000
+++ b/editors/xemacs-current/PLIST      Thu Apr 24 21:32:47 2008 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.18 2006/09/30 12:25:39 obache Exp $
-bin/${EMACSVER}
+@comment $NetBSD: PLIST,v 1.19 2008/04/24 21:32:47 jlam Exp $
+bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
 bin/gnuclient
@@ -12,1420 +12,1421 @@
 bin/xemacs-rcs-checkin
 @exec ${MKDIR} %D/lib/xemacs/site-lisp
 @exec ${MKDIR} %D/lib/xemacs/site-modules
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/DOC
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/config.values
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/cvtmail
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/digest-doc
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/fakemail
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/gnuserv
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/gzip-el.sh
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/hexl
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/Emacs.ad.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsFrame.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsFrameP.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsManager.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsManagerP.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsShell.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/EmacsShellP.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/ExternalClient.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/ExternalClientP.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/ExternalShell.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/ExternalShellP.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/backtrace.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/balloon_help.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/bitmaps.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/blocktype.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/broken-sun.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/buffer.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/bufslots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/bytecode.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/casetab.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/charset.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/chartab.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/cm.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/coding-system-slots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/commands.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/compiler.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/config.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/conslots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-gtk-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-gtk.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-msw-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-msw.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-stream-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-stream.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-tty-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-tty.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-x-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console-x.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/console.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/database.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/debug.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/device-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/device.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/devslots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dragdrop.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/elhash.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dump-data.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dumper.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/emodules.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/event-gtk.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/events.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/extents-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/extents.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/extw-Xlib.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/extw-Xt.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/faces.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/file-coding.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/font-mgr.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/frame-impl.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/frame.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/frameslots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/gc.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/gccache-gtk.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/general-slots.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/getpagesize.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/gifrlib.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/glyphs-gtk.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/gtk-doc Add python dependency for gtk-doc-dep...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xtrans Update to 1.1:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/gtk-doc Add python dependency for gtk-doc-dep...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xtrans Update to 1.1:
Indexes:
Home | Main Index | Thread Index | Old Index