pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emacs-git: now needs makeinfo>=4.13, mark it as such.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jan 5 15:50:09 2017 +0100
Changeset:	1fa6917e9814604602fb43c2ae8cc11e2c9293d9

Modified Files:
	emacs-git/Makefile
	emacs-git/PLIST

Log Message:
emacs-git: now needs makeinfo>=4.13, mark it as such.

Update PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1fa6917e9814604602fb43c2ae8cc11e2c9293d9

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

diffstat:
 emacs-git/Makefile | 7 ++++---
 emacs-git/PLIST    | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 4d7754c..685a0cb 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	GNU editing macros (development version)
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	autoconf automake gmake gzip makeinfo
+USE_TOOLS+=	autoconf automake gmake gsed gzip makeinfo
 # for example, Mac OS X 10.6.1 has 2.61 which fails
 AUTOCONF_REQD=	2.65
-
-CONFLICTS+=	emacs-nox11-[0-9]*
+# NetBSD has 4.8
+TEXINFO_REQD=	4.13
 
 MAKE_JOBS_SAFE=	no
 
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 # For wip special, following gives symbol names when back trace is shown.
 CFLAGS+=		-g
+CONFIGURE_ARGS+=	MAKEINFO=${LOCALBASE}/bin/makeinfo
 
 BUILD_TARGET=		bootstrap
 BUILD_DEFS+=		VARBASE
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index 755c037..648943c 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -3577,6 +3577,8 @@ share/emacs/${PKGVERSION}/lisp/term/screen.el.gz
 share/emacs/${PKGVERSION}/lisp/term/screen.elc
 share/emacs/${PKGVERSION}/lisp/term/sun.el.gz
 share/emacs/${PKGVERSION}/lisp/term/sun.elc
+share/emacs/${PKGVERSION}/lisp/term/tmux.el.gz
+share/emacs/${PKGVERSION}/lisp/term/tmux.elc
 share/emacs/${PKGVERSION}/lisp/term/tty-colors.el.gz
 share/emacs/${PKGVERSION}/lisp/term/tty-colors.elc
 share/emacs/${PKGVERSION}/lisp/term/tvi970.el.gz


Home | Main Index | Thread Index | Old Index