diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2008-07-09 21:52:26 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2008-07-09 21:52:26 +0000 |
| commit | 820c61d6753738ebd83dba058e787d0a6eed35ec (patch) | |
| tree | 1fbe219135add41e1a3dea01c1c1595adfe33695 /net | |
| parent | 4bed40bd9c18fa68ad8cabc16c9d6b08817ac980 (diff) | |
| download | ports-820c61d6753738ebd83dba058e787d0a6eed35ec.tar.gz ports-820c61d6753738ebd83dba058e787d0a6eed35ec.zip | |
- emacs22 and later has stock tramp.info (but little older version) and
it conflicts with port-installed tramp.info. So install here as
tramp21.info to unbreak packaging.
Notes
Notes:
svn path=/head/; revision=216640
Diffstat (limited to 'net')
| -rw-r--r-- | net/tramp/Makefile | 3 | ||||
| -rw-r--r-- | net/tramp/files/patch-texi-Makefile.in | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/tramp/Makefile b/net/tramp/Makefile index 06b212e720ef..1fbabd6695f4 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -7,6 +7,7 @@ PORTNAME= tramp PORTVERSION= 2.1.12 +PORTREVISION= 1 CATEGORIES= net elisp MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -27,7 +28,7 @@ CONFIGURE_ARGS= --with-contrib --prefix=${PREFIX} \ --with-lispdir=${PREFIX}/${TRAMP_LISPDIR} \ --with-emacs=${EMACS_CMD} -INFO= tramp +INFO= tramp21 .if defined(JAPANESE_INFO) CONFIGURE_ARGS+= --with-japanese-manual diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in index 13b232a9235e..17e7ab191152 100644 --- a/net/tramp/files/patch-texi-Makefile.in +++ b/net/tramp/files/patch-texi-Makefile.in @@ -1,5 +1,5 @@ ---- texi/Makefile.in.orig 2007-09-28 09:32:11.000000000 -0500 -+++ texi/Makefile.in 2008-03-11 10:11:25.000000000 -0500 +--- texi/Makefile.in.orig 2007-09-28 23:32:11.000000000 +0900 ++++ texi/Makefile.in 2008-07-10 06:48:37.000000000 +0900 @@ -51,10 +51,10 @@ TEXI_FILES = tramp.texi trampver.texi doclicense.texi \ $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi) @@ -8,14 +8,14 @@ - $(if $(JA_TEXI_FILES), $(localinfodir)/tramp_ja) -INSTALL_FILES = $(DESTDIR)$(infodir)/tramp \ - $(if $(JA_TEXI_FILES), $(DESTDIR)$(infodir)/tramp_ja) -+INFO_FILES = $(localinfodir)/tramp.info \ ++INFO_FILES = $(localinfodir)/tramp21.info \ + $(if $(JA_TEXI_FILES), $(localinfodir)/tramp_ja.info) -+INSTALL_FILES = $(DESTDIR)$(infodir)/tramp.info \ ++INSTALL_FILES = $(DESTDIR)$(infodir)/tramp21.info \ + $(if $(JA_TEXI_FILES), $(DESTDIR)$(infodir)/tramp_ja.info) CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*) # To be used by maintainer only -@@ -67,19 +67,19 @@ +@@ -67,19 +67,22 @@ tramp: $(INFO_FILES) $(localinfodir)/dir @@ -35,7 +35,10 @@ + -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $*.texi -$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja: -+$(DESTDIR)$(infodir)/tramp.info $(DESTDIR)$(infodir)/tramp_ja.info: ++$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info ++ cp $(localinfodir)/tramp.info $@ ++ ++$(DESTDIR)$(infodir)/tramp21.info $(DESTDIR)$(infodir)/tramp_ja.info: $(MKDIR) $(dir $@) $(INSTALL) $(INFO_FILES) $(DESTDIR)$(infodir) |