From 6bd2c51e7e2f0dd3c7a556728e74a7e3a8f9a1e7 Mon Sep 17 00:00:00 2001 From: hauke Date: Tue, 30 Jan 2018 11:52:18 +0000 Subject: The xemacs* package Makefiles are minimal, with all common information factored out to Makefile.common. This includes both upstream and pkgsrc specific.version information. --- 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(-) (limited to 'editors') diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile index 50bb61093e8..da4925e587a 100644 --- a/editors/xemacs-current-nox11/Makefile +++ b/editors/xemacs-current-nox11/Makefile @@ -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 --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 47b1ea24e9b..5a05cafd6c8 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -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 --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common index 8516c042f10..42a1015f176 100644 --- a/editors/xemacs-current/Makefile.common +++ b/editors/xemacs-current/Makefile.common @@ -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 --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index d01895aad73..525c23b8910 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -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 --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 24cd185d84e..8808c72c241 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -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 --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 32d84854d76..69c45e98628 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -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 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 diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 6b20f58e002..39b1abd2b29 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -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 -- cgit v1.2.3