summaryrefslogtreecommitdiff
path: root/editors/xemacs
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2018-01-30 11:52:18 +0000
committerhauke <hauke@pkgsrc.org>2018-01-30 11:52:18 +0000
commit6bd2c51e7e2f0dd3c7a556728e74a7e3a8f9a1e7 (patch)
tree7a831c9588d858404f14ae3199208049fbe41cf7 /editors/xemacs
parente0279c17dbc2c25811e8e442152510785e857c9a (diff)
downloadpkgsrc-6bd2c51e7e2f0dd3c7a556728e74a7e3a8f9a1e7.tar.gz
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 (limited to 'editors/xemacs')
-rw-r--r--editors/xemacs/Makefile11
-rw-r--r--editors/xemacs/Makefile.common8
-rw-r--r--editors/xemacs/options.mk3
3 files changed, 14 insertions, 8 deletions
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