pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/xemacs-current Upgrade xemacs-current to 21.5.34
details: https://anonhg.NetBSD.org/pkgsrc/rev/6d49f843ce82
branches: trunk
changeset: 371577:6d49f843ce82
user: hauke <hauke%pkgsrc.org@localhost>
date: Wed Nov 15 14:46:31 2017 +0000
description:
Upgrade xemacs-current to 21.5.34
Since the non-{X11,lucid} toolkits have bitrotted, remove those
options, and rework options.mk like the editors/xemacs one.
Switching to the portable dumper and using system malloc obsoletes the
hacks.
Like XEmacs 21.4 and the emacsen, we need to build with -DTERMINFO for
proper console display.
Since Makefile content is minimal for xemacs-current{,-nox11}, keep
the pkgsrc nb revision centrally in Makefile.common.
Take maintainership.
diffstat:
editors/xemacs-current/Makefile | 11 +-
editors/xemacs-current/Makefile.common | 84 +-
editors/xemacs-current/PLIST | 2309 ++++++++++++++-----------------
editors/xemacs-current/distinfo | 36 +-
editors/xemacs-current/hacks.mk | 17 -
editors/xemacs-current/options.mk | 136 +-
6 files changed, 1165 insertions(+), 1428 deletions(-)
diffs (truncated from 2847 to 300 lines):
diff -r 86046765d9c3 -r 6d49f843ce82 editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Wed Nov 15 14:19:43 2017 +0000
+++ b/editors/xemacs-current/Makefile Wed Nov 15 14:46:31 2017 +0000
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.91 2016/12/30 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2017/11/15 14:46:31 hauke Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 23
COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
# extra options for x11 support, not for sharing with xemacs-current-nox11
-PKG_SUPPORTED_OPTIONS+= x11 xft
-PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
-PKG_OPTIONS_GROUP.toolkit= gtk lucid motif
-PKG_SUGGESTED_OPTIONS+= x11
+PKG_SUPPORTED_OPTIONS+= x11 xft xface
+PKG_SUGGESTED_OPTIONS+= x11 xft
.include "options.mk"
-
.include "Makefile.common"
-
.include "../../mk/bsd.pkg.mk"
diff -r 86046765d9c3 -r 6d49f843ce82 editors/xemacs-current/Makefile.common
--- a/editors/xemacs-current/Makefile.common Wed Nov 15 14:19:43 2017 +0000
+++ b/editors/xemacs-current/Makefile.common Wed Nov 15 14:46:31 2017 +0000
@@ -1,85 +1,63 @@
-# $NetBSD: Makefile.common,v 1.4 2016/12/30 23:09:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2017/11/15 14:46:31 hauke Exp $
#
# used by editors/xemacs-current/Makefile
# used by editors/xemacs-current-nox11/Makefile
-DISTNAME= xemacs-21.5.27
-EMACSVERSION= 21.5-b27
+DISTNAME= xemacs-21.5.34
+EMACSVERSION= 21.5-b34
EMACS_DISTNAME= xemacs-${EMACSVERSION}
+#PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= hauke%NetBSD.org@localhost
HOMEPAGE= http://www.xemacs.org/
+LICENSE= gnu-gpl-v3
+
+.include "../../mk/bsd.prefs.mk"
PATCHDIR= ${.CURDIR}/../../editors/xemacs-current/patches
DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs-current/distinfo
PLIST_SRC= ${.CURDIR}/../../editors/xemacs-current/PLIST
+USE_TOOLS+= makeinfo
+
+# The portable dumper --with-newgc creates a dump file with a build ID in its name
+GENERATE_PLIST+= ${ECHO} bin/${EMACS_DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
+
+# Having the build path in the dumped emacs is not a problem.
+CHECK_WRKREF_SKIP+= bin/xemacs*
+
+PRINT_PLIST_AWK+= { gsub(/${EMACS_DISTNAME}/, "$${DISTNAME}"); }
+PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); }
+
PLIST_SUBST+= DISTNAME=${EMACS_DISTNAME}
FILES_SUBST+= DISTNAME=${EMACS_DISTNAME}
MESSAGE_SUBST+= DISTNAME=${EMACS_DISTNAME}
-INFO_FILES= yes
-
-# 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
+INFO_FILES= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-infopath=${PREFIX}/${PKGINFODIR}
CONFIGURE_ARGS+= --with-clash-detection
CONFIGURE_ARGS+= --with-mule
CONFIGURE_ARGS+= --with-zlib
+CONFIGURE_ARGS+= --with-bignum=gmp
CONFIGURE_ARGS+= --without-msw
CONFIGURE_ARGS+= --with-pdump
+CONFIGURE_ARGS+= --with-system-malloc
+CONFIGURE_ARGS+= --with-newgc
CFLAGS+= -Dunix
-# 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
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "modular"
-INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
-.else
-INFOPATH= ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+# Use terminfo on NetBSD-6 and newer.
+# We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
+# but this is fine for us.
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/term.h)
+CPPFLAGS+= -DTERMINFO
.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/gmp/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
diff -r 86046765d9c3 -r 6d49f843ce82 editors/xemacs-current/PLIST
--- a/editors/xemacs-current/PLIST Wed Nov 15 14:19:43 2017 +0000
+++ b/editors/xemacs-current/PLIST Wed Nov 15 14:46:31 2017 +0000
@@ -1,15 +1,29 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:53:01 joerg Exp $
-bin/${DISTNAME}
+@comment $NetBSD: PLIST,v 1.22 2017/11/15 14:46:31 hauke Exp $
bin/ellcc
bin/gnuattach
bin/gnuclient
bin/gnudoit
bin/ootags
bin/xemacs
+bin/${DISTNAME}
bin/xemacs-b2m
bin/xemacs-ctags
bin/xemacs-etags
-bin/xemacs-rcs-checkin
+bin/xemacs-script
+info/beta.info
+info/cl.info
+info/emodules.info
+info/external-widget.info
+info/info.info
+info/internals.info
+info/lispref.info
+info/new-users-guide.info
+info/standards.info
+info/termcap.info
+info/texinfo.info
+info/widget.info
+info/xemacs-faq.info
+info/xemacs.info
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/config.values
@@ -30,13 +44,14 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/ExternalClientP.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/ExternalShell.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/ExternalShellP.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/array.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/backtrace.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/balloon_help.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bitmaps.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/blocktype.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/broken-sun.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/buffer.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bufslots.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bytecode-ops.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bytecode.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/casetab.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/charset.h
@@ -58,6 +73,7 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/console-tty.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/console-x-impl.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/console-x.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/console-xlike-inc.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/console.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/database.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/debug.h
@@ -65,11 +81,10 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/device.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/devslots.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/dragdrop.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/elhash.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/dump-data.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/dumper.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/elhash.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/emodules.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/event-gtk.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/events.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/extents-impl.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/extents.h
@@ -78,14 +93,24 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/faces.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/file-coding.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/font-mgr.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-gtk-impl.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-gtk.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-impl.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-msw-impl.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-msw.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-tty-impl.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-tty.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-x-impl.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor-x.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/fontcolor.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/frame-impl.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/frame.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/frameslots.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gc.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gccache-gtk.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gccache-x.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/general-slots.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/getpagesize.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gifrlib.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/glyphs-gtk.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/glyphs-msw.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/glyphs-x.h
@@ -98,6 +123,8 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/imgproc.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/insdel.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/intl-auto-encap-win32.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/keymap-buttons.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/keymap-slots.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/keymap.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/libinterface.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/libsst.h
@@ -108,108 +135,18 @@
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/lisp.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/lrecord.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/lstream.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/7300.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/README
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/acorn.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/alliant-2800.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/alliant.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/alliant1.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/alliant4.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/alpha.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/altos.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/amdahl.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/apollo.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/arm.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/att3b.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/aviion.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/celerity.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/clipper.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/cnvrgnt.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/convex.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/cydra5.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/delta.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/delta88k.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/dpx2.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/dual.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/elxsi.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ews4800r.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/gould-np1.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/gould.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/hp300bsd.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/hp800.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/hp9000s300.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/i860.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ibm370aix.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ibmps2-aix.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ibmrs6000.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ibmrt-aix.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/ibmrt.h
lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/intel386.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/iris4d.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/iris5d.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/iris6d.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/irist.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/is386.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m/isi-ov.h
Home |
Main Index |
Thread Index |
Old Index