[pkgsrc/trunk]: pkgsrc/editors Support XEmacs 21.5.x without X too.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/editors Support XEmacs 21.5.x without X too.
From: uebayasi <uebayasi%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:29:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/736a4fb1d7af
branches:  trunk
changeset: 535269:736a4fb1d7af
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Nov 12 01:48:47 2007 +0000

description:
Support XEmacs 21.5.x without X too.

diffstat:

 editors/Makefile                           |   3 +-
 editors/xemacs-current-nox11/Makefile      |   9 +++
 editors/xemacs-current-nox11/buildlink3.mk |  23 +++++++++
 editors/xemacs-current/Makefile            |  70 +-----------------------------
 editors/xemacs-current/Makefile.common     |  58 ++++++++++++++++++++++++
 editors/xemacs-current/options.mk          |  39 +++++++++++++++-
 6 files changed, 131 insertions(+), 71 deletions(-)

diffs (251 lines):

diff -r e12d97206a93 -r 736a4fb1d7af editors/Makefile
--- a/editors/Makefile  Mon Nov 12 00:18:58 2007 +0000
+++ b/editors/Makefile  Mon Nov 12 01:48:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/11/04 12:36:13 rillig Exp $
+# $NetBSD: Makefile,v 1.123 2007/11/12 01:48:47 uebayasi Exp $
 #
 
 COMMENT=       Editors
@@ -106,6 +106,7 @@
 SUBDIR+=       xcoral
 SUBDIR+=       xemacs
 SUBDIR+=       xemacs-current
+SUBDIR+=       xemacs-current-nox11
 SUBDIR+=       xemacs-nox11
 SUBDIR+=       xemacs-packages
 SUBDIR+=       xfce4-mousepad
diff -r e12d97206a93 -r 736a4fb1d7af editors/xemacs-current-nox11/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current-nox11/Makefile     Mon Nov 12 01:48:47 2007 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2007/11/12 01:48:48 uebayasi Exp $
+
+.include "../../editors/xemacs-current/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/xemacs/xemacs-nox11/}
+
+CONFLICTS=     xemacs-[0-9]*
+
+.include "../../mk/bsd.pkg.mk"
diff -r e12d97206a93 -r 736a4fb1d7af editors/xemacs-current-nox11/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current-nox11/buildlink3.mk        Mon Nov 12 01:48:47 2007 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/11/12 01:48:48 uebayasi Exp $
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+XEMACS_NOX11_BUILDLINK3_MK:=   ${XEMACS_NOX11_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=    xemacs-nox11
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nxemacs-nox11}
+BUILDLINK_PACKAGES+=   xemacs-nox11
+BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11
+
+.if ${XEMACS_NOX11_BUILDLINK3_MK} == "+"
+.include "../../mk/emacs.mk"
+BUILDLINK_API_DEPENDS.xemacs-nox11+=   ${_EMACS_REQD.xemacs215nox}
+BUILDLINK_PKGSRCDIR.xemacs-nox11?=     ${_EMACS_DEP.xemacs215nox}
+.endif # XEMACS_NOX11_BUILDLINK3_MK
+
+BUILDLINK_CONTENTS_FILTER.xemacs-nox11=        ${EGREP} '.*\.el$$|.*\.elc$$'
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r e12d97206a93 -r 736a4fb1d7af editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Mon Nov 12 00:18:58 2007 +0000
+++ b/editors/xemacs-current/Makefile   Mon Nov 12 01:48:47 2007 +0000
@@ -1,71 +1,5 @@
-# $NetBSD: Makefile,v 1.62 2007/06/30 17:59:03 joerg 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]*
-
-
-BUILD_DEFS+=   XEMACS_WIDGETS
-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 "options.mk"
+# $NetBSD: Makefile,v 1.63 2007/11/12 01:48:47 uebayasi Exp $
 
-XEMACS_WIDGETS?=       lucid
-.if ${XEMACS_WIDGETS} == "gtk"
-.  include "../../x11/gtk/buildlink3.mk"
-WITH_WIDGETS=  --with-gtk
-.elif ${XEMACS_WIDGETS} == "motif"
-.  include "../../mk/motif.buildlink3.mk"
-.else
-.  include "../../mk/xaw.buildlink3.mk"
-WITH_WIDGETS=  --with-widgets=lucid
-.endif
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/xbitmaps/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
+.include "../../editors/xemacs-current/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff -r e12d97206a93 -r 736a4fb1d7af editors/xemacs-current/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/Makefile.common    Mon Nov 12 01:48:47 2007 +0000
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile.common,v 1.1 2007/11/12 01:48:47 uebayasi 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=     ../../editors/xemacs-current/DESCR
+PLIST_SRC=     ../../editors/xemacs-current/PLIST
+DISTINFO_FILE= ../../editors/xemacs-current/distinfo
+FILESDIR=      ../../editors/xemacs-current/files
+PATCHDIR=      ../../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 e12d97206a93 -r 736a4fb1d7af editors/xemacs-current/options.mk
--- a/editors/xemacs-current/options.mk Mon Nov 12 00:18:58 2007 +0000
+++ b/editors/xemacs-current/options.mk Mon Nov 12 01:48:47 2007 +0000
@@ -1,10 +1,19 @@
-# $NetBSD: options.mk,v 1.8 2006/09/04 09:20:51 martin Exp $
+# $NetBSD: options.mk,v 1.9 2007/11/12 01:48:48 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xemacs
-PKG_SUPPORTED_OPTIONS= esound ldap xface canna debug
+PKG_SUPPORTED_OPTIONS= esound ldap xface canna debug x11
+PKG_OPTIONS_OPTIONAL_GROUPS=   toolkit
+PKG_OPTIONS_GROUP.toolkit=     gtk motif xaw
+PKG_SUGGESTED_OPTIONS= x11 xaw
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw)
+.  if empty(PKG_OPTIONS:Mx11)
+PKG_OPTIONS+=          x11
+.  endif
+.endif
+
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=       --with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
@@ -36,3 +45,29 @@
 CONFIGURE_ARGS+=       --enable-debug=yes --with-debug
 .endif
 
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
+.  include "../../x11/xbitmaps/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-x11
+CONFIGURE_ARGS+=       --without-jpeg
+CONFIGURE_ARGS+=       --without-png
+CONFIGURE_ARGS+=       --without-tiff
+CONFIGURE_ARGS+=       --without-xpm
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+.  include "../../x11/gtk/buildlink3.mk"
+WITH_WIDGETS=  --with-gtk
+.endif
+
+.if !empty(PKG_OPTIONS:Mmotif)
+.  include "../../mk/motif.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw)
+.  include "../../mk/xaw.buildlink3.mk"
+WITH_WIDGETS=  --with-widgets=lucid
+.endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/enchant <cstdio> only defines std::FILE, not ...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xpmicons Remove ftp.cit.gu.edu.au from MASTER_SITE...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/enchant <cstdio> only defines std::FILE, not ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xpmicons Remove ftp.cit.gu.edu.au from MASTER_SITE...
Indexes:
Home | Main Index | Thread Index | Old Index