CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Jan 30 11:52:18 UTC 2018

Modified Files:
        pkgsrc/editors/xemacs: Makefile Makefile.common options.mk
        pkgsrc/editors/xemacs-current: Makefile Makefile.common
        pkgsrc/editors/xemacs-current-nox11: Makefile
        pkgsrc/editors/xemacs-nox11: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/xemacs/options.mk
cvs rdiff -u -r1.94 -r1.95 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/xemacs-current-nox11/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/editors/xemacs-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.119 pkgsrc/editors/xemacs/Makefile:1.120
--- pkgsrc/editors/xemacs/Makefile:1.119        Sun Jan 28 20:10:49 2018
+++ pkgsrc/editors/xemacs/Makefile      Tue Jan 30 11:52:18 2018
@@ -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"

Index: pkgsrc/editors/xemacs/Makefile.common
diff -u pkgsrc/editors/xemacs/Makefile.common:1.26 pkgsrc/editors/xemacs/Makefile.common:1.27
--- pkgsrc/editors/xemacs/Makefile.common:1.26  Thu Jul 13 17:55:30 2017
+++ pkgsrc/editors/xemacs/Makefile.common       Tue Jan 30 11:52:18 2018
@@ -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 @@ MAINTAINER=   hauke%NetBSD.org@localhost
 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='.gz'
 PLIST_SUBST+=          ELSUFX=''
 .endif
 
-.include "options.mk"
-
 CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}/man1

Index: pkgsrc/editors/xemacs/options.mk
diff -u pkgsrc/editors/xemacs/options.mk:1.14 pkgsrc/editors/xemacs/options.mk:1.15
--- pkgsrc/editors/xemacs/options.mk:1.14       Thu Feb 23 10:46:34 2017
+++ pkgsrc/editors/xemacs/options.mk    Tue Jan 30 11:52:18 2018
@@ -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 @@ CONFIGURE_ARGS+=      --without-canna
 
 PLIST_VARS+=            debug
 .if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-debug=yes --with-debug
 CFLAGS+=                -g3
 INSTALL_UNSTRIPPED=     yes
 .endif

Index: pkgsrc/editors/xemacs-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.94 pkgsrc/editors/xemacs-current/Makefile:1.95
--- pkgsrc/editors/xemacs-current/Makefile:1.94 Sun Jan 28 20:10:49 2018
+++ pkgsrc/editors/xemacs-current/Makefile      Tue Jan 30 11:52:18 2018
@@ -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

Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.8 pkgsrc/editors/xemacs-current/Makefile.common:1.9
--- pkgsrc/editors/xemacs-current/Makefile.common:1.8   Fri Nov 17 14:17:17 2017
+++ pkgsrc/editors/xemacs-current/Makefile.common       Tue Jan 30 11:52:18 2018
@@ -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/[.][^.]*$//}/}
 

Index: pkgsrc/editors/xemacs-current-nox11/Makefile
diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.6 pkgsrc/editors/xemacs-current-nox11/Makefile:1.7
--- pkgsrc/editors/xemacs-current-nox11/Makefile:1.6    Sun Jan 28 20:10:49 2018
+++ pkgsrc/editors/xemacs-current-nox11/Makefile        Tue Jan 30 11:52:18 2018
@@ -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"

Index: pkgsrc/editors/xemacs-nox11/Makefile
diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.24 pkgsrc/editors/xemacs-nox11/Makefile:1.25
--- pkgsrc/editors/xemacs-nox11/Makefile:1.24   Sun Jan 28 20:10:49 2018
+++ pkgsrc/editors/xemacs-nox11/Makefile        Tue Jan 30 11:52:18 2018
@@ -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"