pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors Fix options framework abuse by xemacs-current*.
details: https://anonhg.NetBSD.org/pkgsrc/rev/048f2a74e85e
branches: trunk
changeset: 356424:048f2a74e85e
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Dec 30 23:09:41 2016 +0000
description:
Fix options framework abuse by xemacs-current*.
Partially tested, xemacs-current-nox11 build hangs because of temacs
eating 99% CPU.
diffstat:
editors/xemacs-current-nox11/Makefile | 22 ++-
editors/xemacs-current/Makefile | 160 +++++++++++++++++---------------
editors/xemacs-current/Makefile.common | 85 +++++++++++++++++
editors/xemacs-current/options.mk | 88 +-----------------
4 files changed, 183 insertions(+), 172 deletions(-)
diffs (truncated from 403 to 300 lines):
diff -r 6688e6c8212b -r 048f2a74e85e editors/xemacs-current-nox11/Makefile
--- a/editors/xemacs-current-nox11/Makefile Fri Dec 30 23:02:57 2016 +0000
+++ b/editors/xemacs-current-nox11/Makefile Fri Dec 30 23:09:41 2016 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 11:43:47 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/12/30 23:09:41 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-nox11-/}
-
-FILESDIR= ${.CURDIR}/../../editors/xemacs-current/files
-PATCHDIR= ${.CURDIR}/../../editors/xemacs-current/patches
-PKGDIR= ${.CURDIR}/../../editors/xemacs-current
+COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
+PKGREVISION= 23
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-jpeg
+CONFIGURE_ARGS+= --without-png
+CONFIGURE_ARGS+= --without-tiff
+CONFIGURE_ARGS+= --without-xpm
+CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib
-PKG_OPTIONS.xemacs+= -x11 -xft -gtk -lucid -motif
-
-.include "../../editors/xemacs-current/Makefile"
+.include "../../editors/xemacs-current/options.mk"
+.include "../../editors/xemacs-current/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r 6688e6c8212b -r 048f2a74e85e editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Fri Dec 30 23:02:57 2016 +0000
+++ b/editors/xemacs-current/Makefile Fri Dec 30 23:09:41 2016 +0000
@@ -1,92 +1,98 @@
-# $NetBSD: Makefile,v 1.89 2016/03/05 11:28:28 jperkin Exp $
-
-PKGNAME?= ${DISTNAME}
-COMMENT?= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
+# $NetBSD: Makefile,v 1.90 2016/12/30 23:09:41 wiz Exp $
-DISTNAME= xemacs-21.5.27
-EMACSVERSION= 21.5-b27
-EMACS_DISTNAME= xemacs-${EMACSVERSION}
+PKGNAME= ${DISTNAME}
PKGREVISION= 23
-CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
+COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.xemacs.org/
-
-CONFLICTS+= gnuclient-[0-9]*
-CONFLICTS+= xemacs-[0-9]*
-CONFLICTS+= xemacs-nox11-[0-9]*
+# extra options for x11 support, not for sharing with xemacs-current-nox11
-.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= yes
+PKG_SUPPORTED_OPTIONS+= x11 xft
+PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
+PKG_OPTIONS_GROUP.toolkit= gtk lucid motif
+PKG_SUGGESTED_OPTIONS+= x11
.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
-CONFIGURE_ARGS+= --with-pdump
-CFLAGS+= -Dunix
+###
+### Any of the "toolkit" options or "xft" implies "x11".
+###
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
+ !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxft)
+. if empty(PKG_OPTIONS:Mx11)
+PKG_OPTIONS+= x11
+. endif
+.endif
-# 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}
+###
+### Default to using the Lucid X11 toolkit if none is specified.
+###
+.if !empty(PKG_OPTIONS:Mx11)
+. if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
+ empty(PKG_OPTIONS:Mmotif)
+PKG_OPTIONS+= lucid
+. endif
.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}
+###
+### Support drawing pretty X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mx11)
+. include "../../mk/jpeg.buildlink3.mk"
+. include "../../graphics/png/buildlink3.mk"
+. include "../../graphics/tiff/buildlink3.mk"
+. include "../../x11/xbitmaps/buildlink3.mk"
+CONFIGURE_ARGS+= --with-x
+. if ${X11_TYPE} != "modular"
+CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}:${X11BASE}
+CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
+. else
+CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib
+. endif
+.else
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-jpeg
+CONFIGURE_ARGS+= --without-png
+CONFIGURE_ARGS+= --without-tiff
+CONFIGURE_ARGS+= --without-xpm
+CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib
+.endif
-# 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
+###
+### Support using Xft for rendering TrueType fonts.
+###
+.if !empty(PKG_OPTIONS:Mxft)
+. include "../../fonts/fontconfig/buildlink3.mk"
+. include "../../graphics/freetype2/buildlink3.mk"
+. include "../../x11/libXft/buildlink3.mk"
+. include "../../x11/libXrender/buildlink3.mk"
+CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges
+.endif
-pre-build:
- rm -f ${WRKSRC}/etc/ctags.1.orig
+###
+### Support using GTK X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mgtk)
+. include "../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gtk
+.endif
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
+###
+### Support using Motif X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mmotif)
+. include "../../mk/motif.buildlink3.mk"
+.endif
+
+###
+### Support using Lucid X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mlucid)
+. include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+= --with-widgets=lucid
+.endif
+
+.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 6688e6c8212b -r 048f2a74e85e editors/xemacs-current/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/Makefile.common Fri Dec 30 23:09:41 2016 +0000
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile.common,v 1.4 2016/12/30 23:09:41 wiz Exp $
+#
+# used by editors/xemacs-current/Makefile
+# used by editors/xemacs-current-nox11/Makefile
+
+DISTNAME= xemacs-21.5.27
+EMACSVERSION= 21.5-b27
+EMACS_DISTNAME= xemacs-${EMACSVERSION}
+CATEGORIES= editors
+MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.xemacs.org/
+
+PATCHDIR= ${.CURDIR}/../../editors/xemacs-current/patches
+DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs-current/distinfo
+PLIST_SRC= ${.CURDIR}/../../editors/xemacs-current/PLIST
+
+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
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-clash-detection
+CONFIGURE_ARGS+= --with-mule
+CONFIGURE_ARGS+= --with-zlib
+CONFIGURE_ARGS+= --without-msw
+CONFIGURE_ARGS+= --with-pdump
+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}
+.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"
diff -r 6688e6c8212b -r 048f2a74e85e editors/xemacs-current/options.mk
--- a/editors/xemacs-current/options.mk Fri Dec 30 23:02:57 2016 +0000
Home |
Main Index |
Thread Index |
Old Index