[pkgsrc/trunk]: pkgsrc/editors The xemacs* package Makefiles are minimal, wit...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2380c5a2e648
branches:  trunk
changeset: 374861:2380c5a2e648
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue Jan 30 11:52:18 2018 +0000

description:
The xemacs* package Makefiles are minimal, with all common information
factored out to Makefile.common. This includes both upstream and
pkgsrc specific.version information.

diffstat:

 editors/xemacs-current-nox11/Makefile  |   4 ++--
 editors/xemacs-current/Makefile        |   4 ++--
 editors/xemacs-current/Makefile.common |   4 ++--
 editors/xemacs-nox11/Makefile          |   5 +++--
 editors/xemacs/Makefile                |  11 ++++++++---
 editors/xemacs/Makefile.common         |   8 ++++----
 editors/xemacs/options.mk              |   3 ++-
 7 files changed, 23 insertions(+), 16 deletions(-)

diffs (137 lines):

diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs-current-nox11/Makefile
--- a/editors/xemacs-current-nox11/Makefile     Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs-current-nox11/Makefile     Tue Jan 30 11:52:18 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2018/01/28 20:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/30 11:52:18 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   1
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
+# Version information in ../../editors/xemacs-current/Makefile.common
 
 .include "../../editors/xemacs-current/options.mk"
 .include "../../editors/xemacs-current/Makefile.common"
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs-current/Makefile   Tue Jan 30 11:52:18 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.94 2018/01/28 20:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2018/01/30 11:52:18 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   1
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
+# Version information in ../../editors/xemacs-current/Makefile.common
 
 PKG_SUPPORTED_OPTIONS+=                x11 xft xface
 PKG_SUGGESTED_OPTIONS+=                x11
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs-current/Makefile.common
--- a/editors/xemacs-current/Makefile.common    Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs-current/Makefile.common    Tue Jan 30 11:52:18 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/11/17 14:17:17 hauke Exp $
+# $NetBSD: Makefile.common,v 1.9 2018/01/30 11:52:18 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -6,7 +6,7 @@
 DISTNAME=      xemacs-21.5.34
 EMACSVERSION=  21.5-b34
 EMACS_DISTNAME=        xemacs-${EMACSVERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs-nox11/Makefile     Tue Jan 30 11:52:18 2018 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2018/01/28 20:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/30 11:52:18 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   1
 COMMENT=       XEmacs text editor version 21 (no x11 support)
 
+# Version information in ../../editors/xemacs/Makefile.common
+
 .include "../../editors/xemacs/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs/Makefile   Tue Jan 30 11:52:18 2018 +0000
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.119 2018/01/28 20:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2018/01/30 11:52:18 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   1
-COMMENT=       XEmacs text editor version 21
+COMMENT=       XEmacs text editor version 21.4
+
+# extra options for x11 support, not for sharing with xemacs-current-nox11
+# Version information in ../../editors/xemacs/Makefile.common
 
 PKG_SUPPORTED_OPTIONS+=                x11 xface
 PKG_SUGGESTED_OPTIONS+=                x11
 
+.include "options.mk"
+
 .include "Makefile.common"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs/Makefile.common
--- a/editors/xemacs/Makefile.common    Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs/Makefile.common    Tue Jan 30 11:52:18 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.26 2017/07/13 17:55:30 hauke Exp $
+# $NetBSD: Makefile.common,v 1.27 2018/01/30 11:52:18 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
 
 DISTNAME=      xemacs-21.4.24
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.xemacs.org/
 LICENSE=       gnu-gpl-v2
 
+.include "../../mk/bsd.prefs.mk"
+
 FILESDIR=              ${.CURDIR}/../../editors/xemacs/files
 PATCHDIR=              ${.CURDIR}/../../editors/xemacs/patches
 DISTINFO_FILE=         ${.CURDIR}/../../editors/xemacs/distinfo
@@ -33,8 +35,6 @@
 PLIST_SUBST+=          ELSUFX=''
 .endif
 
-.include "options.mk"
-
 CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}/man1
diff -r 1bf0d0f7b52b -r 2380c5a2e648 editors/xemacs/options.mk
--- a/editors/xemacs/options.mk Tue Jan 30 11:47:39 2018 +0000
+++ b/editors/xemacs/options.mk Tue Jan 30 11:52:18 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2017/02/23 10:46:34 hauke Exp $
+# $NetBSD: options.mk,v 1.15 2018/01/30 11:52:18 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=                ldap canna debug
@@ -69,6 +69,7 @@
 
 PLIST_VARS+=            debug
 .if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-debug=yes --with-debug
 CFLAGS+=                -g3
 INSTALL_UNSTRIPPED=     yes
 .endif