From ec4cb63ce5a540cc178609a5b8ee1a445acbee0c Mon Sep 17 00:00:00 2001 From: Marcus von Appen Date: Tue, 23 Apr 2013 15:33:16 +0000 Subject: [PATCH] - Fix conflicting info files with editors/emacs Reported by: marino via IRC --- devel/cedet/Makefile | 20 +++++++--------- devel/cedet/files/patch-semantic-doc-Makefile | 23 +++++++++++++++---- .../files/patch-semantic-doc-bovine.info | 12 ++++++++++ .../files/patch-semantic-doc-wisent.info | 12 ++++++++++ devel/cedet/files/patch-srecode-Makefile | 20 ++++++++++++++++ devel/cedet/files/patch-srecode-srecode.info | 13 +++++++++++ 6 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 devel/cedet/files/patch-semantic-doc-bovine.info create mode 100644 devel/cedet/files/patch-semantic-doc-wisent.info create mode 100644 devel/cedet/files/patch-srecode-Makefile create mode 100644 devel/cedet/files/patch-srecode-srecode.info diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile index a33d7d85104f..4afc39fa5e72 100644 --- a/devel/cedet/Makefile +++ b/devel/cedet/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: cedet -# Date created: 2004-02-28 -# Whom: Dryice Liu -# +# Created by: Dryice Liu # $FreeBSD$ -# PORTNAME= cedet PORTVERSION= 1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel elisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME} PKGNAMESUFFIX= -${EMACS_PORT_NAME} @@ -21,14 +17,14 @@ USE_GMAKE= yes CEDET_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} -INFO= bovine cogre ede-cedet eieio-cedet grammar-fw semantic-cedet \ - semantic-appdev semantic-langdev semantic-user \ - wisent speedbar-cedet srecode +INFO= bovine-cedet cogre ede-cedet eieio-cedet grammar-fw \ + semantic-cedet semantic-appdev semantic-langdev semantic-user \ + wisent-cedet speedbar-cedet srecode-cedet SEMANTIC_ELISP_SUBDIRS= bovine wisent -SEMANTIC_INFOS= bovine.info grammar-fw.info semantic-appdev.info \ +SEMANTIC_INFOS= bovine-cedet.info grammar-fw.info semantic-appdev.info \ semantic-langdev.info semantic-user.info semantic-cedet.info \ - wisent.info + wisent-cedet.info CONFLICTS= eieio-[0-9]* semantic-[0-9]* speedbar-[0-9]* @@ -112,7 +108,7 @@ do-install: .for i in *.srt ${INSTALL_DATA} ${WRKSRC}/srecode/templates/${i} ${CEDET_LISPDIR}/srecode/templates .endfor - ${INSTALL_DATA} ${WRKSRC}/srecode/srecode.info ${PREFIX}/info + ${INSTALL_DATA} ${WRKSRC}/srecode/srecode-cedet.info ${PREFIX}/info #contrib ${MKDIR} ${CEDET_LISPDIR}/contrib diff --git a/devel/cedet/files/patch-semantic-doc-Makefile b/devel/cedet/files/patch-semantic-doc-Makefile index 5cbfee88c562..75fb54ca4f4f 100644 --- a/devel/cedet/files/patch-semantic-doc-Makefile +++ b/devel/cedet/files/patch-semantic-doc-Makefile @@ -1,5 +1,5 @@ ---- semantic/doc/Makefile.orig 2010-05-17 18:57:36.000000000 +0200 -+++ semantic/doc/Makefile 2010-05-17 18:59:11.000000000 +0200 +--- semantic/doc/Makefile.orig 2012-04-15 17:28:43.000000000 +0200 ++++ semantic/doc/Makefile 2013-04-21 16:51:13.000000000 +0200 @@ -11,7 +11,7 @@ images_MISC=grammar-fw-ov.png grammar-fw-ov.txt @@ -14,7 +14,7 @@ -all: images grammar-fw.info semantic.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info -+all: images grammar-fw.info semantic-cedet.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info ++all: images grammar-fw.info semantic-cedet.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine-cedet.info wisent-cedet.info images: @ @@ -27,15 +27,28 @@ $(MAKEINFO) $< semantic-user.info: $(semantic-user_info_TEXINFOS) +@@ -43,10 +43,10 @@ + semantic-langdev.info: $(semantic-langdev_info_TEXINFOS) + $(MAKEINFO) $< + +-bovine.info: $(bovine_info_TEXINFOS) ++bovine-cedet.info: $(bovine_info_TEXINFOS) + $(MAKEINFO) $< + +-wisent.info: $(wisent_info_TEXINFOS) ++wisent-cedet.info: $(wisent_info_TEXINFOS) + $(MAKEINFO) $< + + tags: @@ -57,9 +57,9 @@ .PHONY: dist -dist: grammar-fw.info semantic.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info -+dist: grammar-fw.info semantic-cedet.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine.info wisent.info ++dist: grammar-fw.info semantic-cedet.info semantic-user.info semantic-appdev.info semantic-langdev.info bovine-cedet.info wisent-cedet.info mkdir $(DISTDIR) - cp $(images_MISC) $(semantic-grammar_TEXINFOS) grammar-fw.info* $(Documentation_TEXINFOS) semantic.info* $(semantic-user_info_TEXINFOS) semantic-user.info* $(semantic-appdev_info_TEXINFOS) semantic-appdev.info* $(semantic-langdev_info_TEXINFOS) semantic-langdev.info* $(bovine_info_TEXINFOS) bovine.info* $(wisent_info_TEXINFOS) wisent.info* $(ede_FILES) $(DISTDIR) -+ cp $(images_MISC) $(semantic-grammar_TEXINFOS) grammar-fw.info* $(Documentation_TEXINFOS) semantic-cedet.info* $(semantic-user_info_TEXINFOS) semantic-user.info* $(semantic-appdev_info_TEXINFOS) semantic-appdev.info* $(semantic-langdev_info_TEXINFOS) semantic-langdev.info* $(bovine_info_TEXINFOS) bovine.info* $(wisent_info_TEXINFOS) wisent.info* $(ede_FILES) $(DISTDIR) ++ cp $(images_MISC) $(semantic-grammar_TEXINFOS) grammar-fw.info* $(Documentation_TEXINFOS) semantic-cedet.info* $(semantic-user_info_TEXINFOS) semantic-user.info* $(semantic-appdev_info_TEXINFOS) semantic-appdev.info* $(semantic-langdev_info_TEXINFOS) semantic-langdev.info* $(bovine_info_TEXINFOS) bovine-cedet.info* $(wisent_info_TEXINFOS) wisent-cedet.info* $(ede_FILES) $(DISTDIR) Makefile: Project.ede @echo Makefile is out of date! It needs to be regenerated by EDE. diff --git a/devel/cedet/files/patch-semantic-doc-bovine.info b/devel/cedet/files/patch-semantic-doc-bovine.info new file mode 100644 index 000000000000..32fd20f3b7ca --- /dev/null +++ b/devel/cedet/files/patch-semantic-doc-bovine.info @@ -0,0 +1,12 @@ +--- semantic/doc/bovine.texi.orig 2012-04-15 17:28:43.000000000 +0200 ++++ semantic/doc/bovine.texi 2013-04-21 16:30:15.000000000 +0200 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename bovine.info +-@set TITLE Bovine parser development ++@setfilename bovine-cedet.info ++@set TITLE Bovine parser development (cedet version) + @set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim + @settitle @value{TITLE} + diff --git a/devel/cedet/files/patch-semantic-doc-wisent.info b/devel/cedet/files/patch-semantic-doc-wisent.info new file mode 100644 index 000000000000..edd8e61433c9 --- /dev/null +++ b/devel/cedet/files/patch-semantic-doc-wisent.info @@ -0,0 +1,12 @@ +--- semantic/doc/wisent.texi.orig 2013-04-21 16:52:26.000000000 +0200 ++++ semantic/doc/wisent.texi 2013-04-21 16:50:29.000000000 +0200 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename wisent.info +-@set TITLE Wisent Parser Development ++@setfilename wisent-cedet.info ++@set TITLE Wisent Parser Development (cedet version) + @set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim + @settitle @value{TITLE} + diff --git a/devel/cedet/files/patch-srecode-Makefile b/devel/cedet/files/patch-srecode-Makefile new file mode 100644 index 000000000000..b780bf265ca8 --- /dev/null +++ b/devel/cedet/files/patch-srecode-Makefile @@ -0,0 +1,20 @@ +--- srecode/Makefile.orig 2013-04-21 16:46:26.000000000 +0200 ++++ srecode/Makefile 2013-04-21 16:46:51.000000000 +0200 +@@ -29,7 +29,7 @@ + + + +-all: autoloads lang srecode srecode.info tests document templates ++all: autoloads lang srecode srecode-cedet.info tests document templates + + .PHONY: autoloads + autoloads: +@@ -62,7 +62,7 @@ + @echo "(setq debug-on-error t)" >> $@-compile-script + "$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^ + +-srecode.info: $(doc_TEXINFOS) ++srecode-cedet.info: $(doc_TEXINFOS) + $(MAKEINFO) $< + + .PHONY: tests diff --git a/devel/cedet/files/patch-srecode-srecode.info b/devel/cedet/files/patch-srecode-srecode.info new file mode 100644 index 000000000000..3139c968ea7f --- /dev/null +++ b/devel/cedet/files/patch-srecode-srecode.info @@ -0,0 +1,13 @@ +--- srecode/srecode.texi.orig 2013-04-21 16:48:19.000000000 +0200 ++++ srecode/srecode.texi 2013-04-21 16:47:13.000000000 +0200 +@@ -3,8 +3,8 @@ + @c $Id: srecode.texi,v 1.24 2010-05-30 20:22:40 scymtym Exp $ + @c + @c %**start of header +-@setfilename srecode.info +-@set TITLE SRecoder Manual ++@setfilename srecode-cedet.info ++@set TITLE SRecoder Manual (cedet version) + @set AUTHOR Eric M. Ludlam + @settitle @value{TITLE} + @c %**end of header