- Fix broken file locations after emacs 23.2 update

Reported by:	pointyhat
This commit is contained in:
Marcus von Appen 2010-05-17 18:03:43 +00:00
parent 2e40e8ae1e
commit 129c750de5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254497
7 changed files with 179 additions and 9 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= cedet
PORTVERSION= 1.0.p7
PORTREVISION= 1
CATEGORIES= devel elisp
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0pre7
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@ -21,13 +22,13 @@ USE_GMAKE= yes
CEDET_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
INFO= bovine cogre ede eieio grammar-fw semantic \
INFO= bovine cogre ede-cedet eieio-cedet grammar-fw semantic-cedet \
semantic-appdev semantic-langdev semantic-user \
wisent speedbar-cedet srecode
SEMANTIC_ELISP_SUBDIRS= bovine wisent
SEMANTIC_INFOS= bovine.info grammar-fw.info semantic-appdev.info \
semantic-langdev.info semantic-user.info semantic.info \
semantic-langdev.info semantic-user.info semantic-cedet.info \
wisent.info
CONFLICTS= eieio-[0-9]* semantic-[0-9]* speedbar-[0-9]*
@ -67,14 +68,14 @@ do-install:
.for i in *.el *.elc
${INSTALL_DATA} ${WRKSRC}/ede/${i} ${CEDET_LISPDIR}/ede
.endfor
${INSTALL_DATA} ${WRKSRC}/ede/ede.info ${PREFIX}/info
${INSTALL_DATA} ${WRKSRC}/ede/ede-cedet.info ${PREFIX}/info
# eieio
${MKDIR} ${CEDET_LISPDIR}/eieio
.for i in *.el *.elc
${INSTALL_DATA} ${WRKSRC}/eieio/${i} ${CEDET_LISPDIR}/eieio
.endfor
${INSTALL_DATA} ${WRKSRC}/eieio/eieio.info ${PREFIX}/info
${INSTALL_DATA} ${WRKSRC}/eieio/eieio-cedet.info ${PREFIX}/info
# semantic
${MKDIR} ${CEDET_LISPDIR}/semantic

View File

@ -1,6 +1,6 @@
--- ede/Makefile.orig 2010-05-04 22:49:33.000000000 +0200
+++ ede/Makefile 2010-05-04 22:49:53.000000000 +0200
@@ -23,7 +23,7 @@
--- ede/Makefile.orig 2010-05-17 08:36:43.000000000 +0200
+++ ede/Makefile 2010-05-17 08:38:03.000000000 +0200
@@ -23,13 +23,13 @@
projects_LISP=project-am.el ede-simple.el ede-cpp-root.el ede-emacs.el ede-linux.el
aux-lisp_LISP=autoconf-edit.el autoconf-compat.el makefile-edit.el
ede_info_TEXINFOS=ede.texi ede-projects.texi ede-targets.texi ede-sourcecode.texi ede-compilers.texi
@ -9,3 +9,31 @@
VERSION=1.0pre7
DISTDIR=$(top)EDE-$(VERSION)
-all: autoloads init ede proj-project projects aux-lisp ede.info EDE_Templates
+all: autoloads init ede proj-project projects aux-lisp ede-cedet.info EDE_Templates
.PHONY: autoloads
autoloads:
@@ -97,7 +97,7 @@
@echo "(setq debug-on-error t)" >> $@-compile-script
"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
-ede.info: $(ede_info_TEXINFOS)
+ede-cedet.info: $(ede_info_TEXINFOS)
$(MAKEINFO) $<
.PHONY:EDE_Templates
@@ -113,9 +113,9 @@
.PHONY: dist
-dist: autoloads ede.info
+dist: autoloads ede-cedet.info
mkdir $(DISTDIR)
- cp ede-loaddefs.el $(init_LISP) $(ede_LISP) $(proj-project_LISP) $(projects_LISP) $(aux-lisp_LISP) $(misc_AUX) $(ede_info_TEXINFOS) ede.info* $(ede_FILES) $(DISTDIR)
+ cp ede-loaddefs.el $(init_LISP) $(ede_LISP) $(proj-project_LISP) $(projects_LISP) $(aux-lisp_LISP) $(misc_AUX) $(ede_info_TEXINFOS) ede-cedet.info* $(ede_FILES) $(DISTDIR)
$(MAKE) -C templates $(MFLAGS) DISTDIR=$(DISTDIR)/templates dist
Makefile: Project.ede

View File

@ -0,0 +1,27 @@
--- ede/ede.texi.orig 2010-05-17 08:40:25.000000000 +0200
+++ ede/ede.texi 2010-05-17 08:43:35.000000000 +0200
@@ -2,20 +2,20 @@
@c
@c $Id: ede.texi,v 1.26 2010/02/20 14:26:41 zappo Exp $
@c
-@setfilename ede.info
-@settitle Emacs Development Environment
+@setfilename ede-cedet.info
+@settitle Emacs Development Environment (cedet version)
@ifinfo
@format
START-INFO-DIR-ENTRY
-* ede: (ede). Project management for Emacs
+* ede-cedet: (ede-cedet). Project management for Emacs (cedet version)
END-INFO-DIR-ENTRY
@end format
@end ifinfo
@titlepage
@sp 10
-@center @titlefont{ede}
+@center @titlefont{ede-cedet}
@vskip 0pt plus 1 fill
Copyright @copyright{} 1998, 1999, 2000, 2001, 2004, 2005, 2008, 2009, 2010 Eric M. Ludlam
@end titlepage

View File

@ -0,0 +1,41 @@
--- eieio/Makefile.orig 2010-05-17 19:24:01.000000000 +0200
+++ eieio/Makefile 2010-05-17 19:25:02.000000000 +0200
@@ -22,7 +22,7 @@
ELISPPRELOAD= cedet-compat
examples_LISP=chart.el eieio-speedbar.el linemark.el lmcompile.el
eieio_info_TEXINFOS=eieio.texi
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo --force --no-split
test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el
Misc_MISC=INSTALL ChangeLog NEWS
VERSION=1.2
@@ -30,7 +30,7 @@
-all: autoloads init eieio examples eieio.info
+all: autoloads init eieio examples eieio-cedet.info
.PHONY: autoloads
autoloads:
@@ -74,7 +74,7 @@
@echo "(setq debug-on-error t)" >> $@-compile-script
"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
-eieio.info: $(eieio_info_TEXINFOS)
+eieio-cedet.info: $(eieio_info_TEXINFOS)
$(MAKEINFO) $<
.PHONY: test
@@ -97,9 +97,9 @@
.PHONY: dist
-dist: autoloads eieio.info
+dist: autoloads eieio-cedet.info
mkdir $(DISTDIR)
- cp eieio-loaddefs.el $(init_LISP) $(eieio_LISP) $(examples_LISP) $(eieio_info_TEXINFOS) eieio.info* $(test_LISP) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
+ cp eieio-loaddefs.el $(init_LISP) $(eieio_LISP) $(examples_LISP) $(eieio_info_TEXINFOS) eieio-cedet.info* $(test_LISP) $(Misc_MISC) $(ede_FILES) $(DISTDIR)
Makefile: Project.ede
@echo Makefile is out of date! It needs to be regenerated by EDE.

View File

@ -0,0 +1,22 @@
--- eieio/eieio.texi.orig 2010-05-17 19:25:52.000000000 +0200
+++ eieio/eieio.texi 2010-05-17 19:26:35.000000000 +0200
@@ -10,8 +10,8 @@
@c See the comments at the end of this document.
@c they need to be integrated into the text of this manual.
@c
-@setfilename eieio.info
-@set TITLE Enhanced Implementation of Emacs Interpreted Objects
+@setfilename eieio-cedet.info
+@set TITLE Enhanced Implementation of Emacs Interpreted Objects (cedet version)
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
@@ -38,7 +38,7 @@
@ifinfo
@format
START-INFO-DIR-ENTRY
-* eieio: (eieio). Objects for Emacs
+* eieio-cedet: (eieio). Objects for Emacs
END-INFO-DIR-ENTRY
@end format
@end ifinfo

View File

@ -1,5 +1,5 @@
--- semantic/doc/Makefile.orig 2010-05-04 22:56:54.000000000 +0200
+++ semantic/doc/Makefile 2010-05-04 22:57:06.000000000 +0200
--- semantic/doc/Makefile.orig 2010-05-17 18:57:36.000000000 +0200
+++ semantic/doc/Makefile 2010-05-17 18:59:11.000000000 +0200
@@ -11,7 +11,7 @@
images_MISC=grammar-fw-ov.png grammar-fw-ov.txt
@ -9,3 +9,33 @@
Documentation_TEXINFOS=semantic.texi glossary.texi overview.texi installation.texi fdl.texi internals.texi semanticheader.texi
semantic-user_info_TEXINFOS=user-guide.texi minor-modes.texi
semantic-appdev_info_TEXINFOS=app-dev-guide.texi tags.texi
@@ -23,7 +23,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
images:
@
@@ -31,7 +31,7 @@
grammar-fw.info: $(semantic-grammar_TEXINFOS)
$(MAKEINFO) $<
-semantic.info: $(Documentation_TEXINFOS)
+semantic-cedet.info: $(Documentation_TEXINFOS)
$(MAKEINFO) $<
semantic-user.info: $(semantic-user_info_TEXINFOS)
@@ -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
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)
Makefile: Project.ede
@echo Makefile is out of date! It needs to be regenerated by EDE.

View File

@ -0,0 +1,21 @@
--- semantic/doc/semantic.texi.orig 2010-05-17 19:00:23.000000000 +0200
+++ semantic/doc/semantic.texi 2010-05-17 19:01:54.000000000 +0200
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
-@setfilename semantic.info
-@set TITLE Semantic Manual
+@setfilename semantic-cedet.info
+@set TITLE Semantic Manual (cedet version)
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}
@@ -44,7 +44,7 @@
@ifinfo
@dircategory Emacs
@direntry
-* Semantic: (semantic). Infrastructure for parser based text analysis.
+* Semantic-cedet: (semantic). Infrastructure for parser based text analysis.
@end direntry
@end ifinfo