From cd419fd1dfe3dc76a40073fe54d2993054dfc88c Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 1 Jul 2014 17:37:41 +0000 Subject: [PATCH] Make those ports more likely to build with texinfo from ports With hat: portmgr --- archivers/zutils/Makefile | 2 +- audio/emms/Makefile | 2 +- deskutils/planner.el/Makefile | 2 +- devel/magit/files/patch-Makefile | 16 ++++++++++++---- devel/xtla/Makefile | 2 +- editors/slime/Makefile | 2 +- graphics/gauche-gl/Makefile | 1 + graphics/geomview/Makefile | 4 ++-- mail/vm/Makefile | 2 +- math/ess/Makefile | 1 + math/eukleides/Makefile | 1 + news/husky-bsopack/Makefile | 1 + news/husky-hpt/Makefile | 1 + news/husky-hpucode/Makefile | 1 + news/husky-htick/Makefile | 1 + news/husky-msged/Makefile | 1 + 16 files changed, 28 insertions(+), 12 deletions(-) diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile index 1ffdb6e96d1a..e213be0f869f 100644 --- a/archivers/zutils/Makefile +++ b/archivers/zutils/Makefile @@ -28,6 +28,6 @@ post-patch: @${REINPLACE_CMD} '24,27d' ${WRKSRC}/configure post-install: - @${RM} ${STAGEDIR}${PREFIX}/info/dir + @-${RM} ${STAGEDIR}${PREFIX}/info/dir .include diff --git a/audio/emms/Makefile b/audio/emms/Makefile index e865f7b34b25..c509211eb260 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -12,7 +12,7 @@ COMMENT= The Emacs Multi-Media System LICENSE= GPLv3 -USES= gmake +USES= gmake makeinfo USE_EMACS= yes MAKE_ENV+= EMMSPREFIX=${STAGEDIR}${PREFIX} LOCALBASE=${LOCALBASE} \ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile index f855bec108e1..a13a9d01c2c3 100644 --- a/deskutils/planner.el/Makefile +++ b/deskutils/planner.el/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PlannerMode is an organizer and day planner for Emacs USE_EMACS= yes -USES= gmake +USES= gmake makeinfo BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/muse/muse.el:${PORTSDIR}/textproc/muse diff --git a/devel/magit/files/patch-Makefile b/devel/magit/files/patch-Makefile index 317c60831ee6..6033f88711c4 100644 --- a/devel/magit/files/patch-Makefile +++ b/devel/magit/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2012-09-25 04:41:19.000000000 +0900 -+++ Makefile 2013-09-21 23:01:04.000000000 +0900 +--- ./Makefile.orig 2012-09-24 19:41:19.000000000 +0000 ++++ ./Makefile 2014-07-01 17:24:01.000000000 +0000 @@ -1,5 +1,5 @@ VERSION=1.2.0 -EMACS=emacs @@ -7,7 +7,16 @@ PREFIX=/usr/local SYSCONFDIR=/etc ELS=magit.el magit-svn.el magit-topgit.el magit-stgit.el magit-key-mode.el magit-bisect.el magit-wip.el rebase-mode.el magit-blame.el -@@ -64,15 +64,13 @@ +@@ -40,7 +40,7 @@ + magit.elc: magit.el + + dir: magit.info +- install-info --dir=$@ $< ++ touch $@ + + magit.info: + +@@ -64,15 +64,12 @@ install: install_core install_docs install_core: core @@ -24,7 +33,6 @@ - install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info + mkdir -p $(INFODIR) + install -m 644 magit.info $(INFODIR) -+ install-info --info-dir=$(INFODIR) $(INFODIR)/magit.info install_contrib: contrib mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile index b18a9aa7eef9..db6d96d73a89 100644 --- a/devel/xtla/Makefile +++ b/devel/xtla/Makefile @@ -23,7 +23,7 @@ LISPDIR= ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} HAS_CONFIGURE= yes CONFIGURE_ARGS+= --with-emacs=${EMACS_NAME} --with-diff=gdiff --with-patch=gpatch -USES= gmake +USES= gmake makeinfo INFO= xtla OPTIONS_DEFINE= DOCS diff --git a/editors/slime/Makefile b/editors/slime/Makefile index 8226807efc1c..93189386f200 100644 --- a/editors/slime/Makefile +++ b/editors/slime/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= https://codeload.github.com/slime/slime/legacy.tar.gz/v${PORTVERSI MAINTAINER= joe@thrallingpenguin.com COMMENT= Superior Lisp Interaction Mode for Emacs -USES= gmake +USES= gmake makeinfo USE_EMACS= yes SLIME_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile index 00b9151cf1cd..d97a98de7f8c 100644 --- a/graphics/gauche-gl/Makefile +++ b/graphics/gauche-gl/Makefile @@ -26,6 +26,7 @@ DOCSDIR= ${PREFIX}/share/doc/gauche/${PORTNAME} PLIST_SUB= TARGET="${CONFIGURE_TARGET}" .if !defined(NOPORTDOCS) +USES= makeinfo INFO= gauche-gl-refe gauche-gl-refj .endif diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 636196da4e4f..17cd5f7f770f 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -USES= libtool motif tar:bzip2 +USES= libtool makeinfo motif tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-htmlbrowser=xdg-open --with-pdfviewer=xdg-open \ @@ -38,7 +38,7 @@ post-patch: ${WRKSRC}/src/bin/geomview/x11/Makefile.in post-build: - @(cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \ + @(cd ${WRKSRC}/doc && makeinfo --no-split --no-validate \ -o geomview.info geomview.texi) post-install: diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 91e4f3346562..d346b6c8f04f 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -14,7 +14,7 @@ COMMENT= A mail reader running inside Emacs or XEmacs GNU_CONFIGURE= yes USE_EMACS= yes -USES= gmake +USES= gmake makeinfo CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} MAKE_ARGS= prefix=${PREFIX} \ lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} \ diff --git a/math/ess/Makefile b/math/ess/Makefile index e616f0a0eae4..d981d9c222f8 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -23,6 +23,7 @@ OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} +USES+= makeinfo INFO= ess .endif diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile index 42986ab4d877..19731ba1b763 100644 --- a/math/eukleides/Makefile +++ b/math/eukleides/Makefile @@ -23,6 +23,7 @@ OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} +USES+= makeinfo USE_TEX+= pdftex:build PORTDOCS= de.pdf fr.pdf INFO= eukleides diff --git a/news/husky-bsopack/Makefile b/news/husky-bsopack/Makefile index 0c8f5a0a8a6d..a0039d4f9669 100644 --- a/news/husky-bsopack/Makefile +++ b/news/husky-bsopack/Makefile @@ -13,6 +13,7 @@ COMMENT= Binkley-style outbound netmail packer LIB_DEPENDS= fidoconfig.0:${PORTSDIR}/news/husky-fidoconf +USES= makeinfo MAN1= bsopack.1 MANCOMPRESSED= yes INFO= bsopack diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile index 6837885cbda4..d2ec5a8aecc2 100644 --- a/news/husky-hpt/Makefile +++ b/news/husky-hpt/Makefile @@ -22,6 +22,7 @@ USES= perl5 MAKE_ARGS+= PERL=0 .endif +USES+= makeinfo MAN1= hpt.1 hptlink.1 hpttree.1 txt2pkt.1 MANCOMPRESSED= yes INFO= hpt diff --git a/news/husky-hpucode/Makefile b/news/husky-hpucode/Makefile index 96bd6769af1d..4fa13a1c765c 100644 --- a/news/husky-hpucode/Makefile +++ b/news/husky-hpucode/Makefile @@ -13,6 +13,7 @@ COMMENT= Scan for UUE in message base LIB_DEPENDS= fidoconfig.0:${PORTSDIR}/news/husky-fidoconf +USES= makeinfo MAN1= hpucode.1 MANCOMPRESSED= yes INFO= hpucode diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile index b956b44a8c9f..5874c016fea3 100644 --- a/news/husky-htick/Makefile +++ b/news/husky-htick/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS= fidoconfig.0:${PORTSDIR}/news/husky-fidoconf CONFLICTS= husky-htick-devel-[0-9]* +USES= makeinfo MAN1= htick.1 INFO= htick diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile index ff91351d3360..a262782f2a17 100644 --- a/news/husky-msged/Makefile +++ b/news/husky-msged/Makefile @@ -14,6 +14,7 @@ COMMENT= Msged/TE (full-featured FTN mail reader) LIB_DEPENDS= libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf +USES= makeinfo MAKE_ARGS= MSGEDCFG="\\\"~/.msged\\\"" INFO= msged