- Update to 2.1.4

PR:		ports/88302
Submitted by:	Boris B. Samorodov <bsam@ipt.ru>

- Install INFO in a more standard fashion
This commit is contained in:
Pav Lucistnik 2005-11-02 21:42:33 +00:00
parent 28e37dcea4
commit cebfb9c66b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=147052
4 changed files with 39 additions and 18 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= tramp
PORTVERSION= 2.1.3
PORTREVISION= 1
PORTVERSION= 2.1.4
CATEGORIES= net elisp
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -22,19 +21,17 @@ USE_GMAKE= yes
USE_AUTOCONF_VER= 259
TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR} \
DIRSECTION=${DIRSECTION} \
INFOENTRY=${INFOENTRY} INFOENTRY_JA=${INFOENTRY_JA}
PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR}
CONFIGURE_ENV= TEXI2DVI=no
CONFIGURE_ARGS= --with-contrib --prefix=${PREFIX} \
--with-lispdir=${PREFIX}/${TRAMP_LISPDIR} \
--with-emacs=${EMACS_CMD}
INFO= tramp
.if defined(JAPANESE_INFO)
CONFIGURE_ARGS+= --with-japanese-manual
PLIST_SUB+= JAPANESE_INFO=""
.else
PLIST_SUB+= JAPANESE_INFO="@comment "
INFO+= tramp
.endif
.if ${EMACS_PORT_NAME} == emacs20

View file

@ -1,2 +1,2 @@
MD5 (tramp-2.1.3.tar.gz) = 8c41fd80b383e05125a4ac99c896ea99
SIZE (tramp-2.1.3.tar.gz) = 294223
MD5 (tramp-2.1.4.tar.gz) = 748a8e287a4bc6e6dfb66dd2b6da974a
SIZE (tramp-2.1.4.tar.gz) = 305356

View file

@ -0,0 +1,30 @@
--- texi/Makefile.in.orig Sun Jul 10 19:36:08 2005
+++ texi/Makefile.in Wed Nov 2 22:25:01 2005
@@ -60,7 +60,8 @@
all: tramp dvi html
install: tramp $(infodir)/dir
- $(INSTALL) $(INFO_FILES) $(infodir)
+ $(foreach file, $(INFO_FILES), \
+ $(INSTALL) $(file).info $(infodir)/$(file).info; )
clean:
$(RM) $(CLEAN_FILES)
@@ -71,7 +72,7 @@
$(localinfodir)/%: $(TEXI_FILES) $(JA_TEXI_FILES)
$(MAKEINFO) --footnote-style=end -D $(EMACS_INFO) -D $(JA_MANUAL) \
- -D $(INSTALL_CHAPTER) -o $@ $*.texi
+ -D $(INSTALL_CHAPTER) -o $@.info $*.texi
# don't call install-info if it failed in configure
$(localinfodir)/dir $(infodir)/dir:
@@ -80,7 +81,7 @@
$(if $(findstring no, $(INSTALL_INFO)),, \
$(foreach file, $(INFO_FILES), \
$(if $(shell grep "($(notdir $(file)))\." $@),, \
- $(INSTALL_INFO) --info-dir=$(dir $@) $(file);)))
+ $(INSTALL_INFO) --info-dir=$(dir $@) $(file).info;)))
dvi: tramp.dvi $(if $(JA_TEXI_FILES), tramp_ja.dvi)

View file

@ -22,14 +22,8 @@
%%TRAMP_LISPDIR%%/tramp-vc.elc
%%TRAMP_LISPDIR%%/tramp.el
%%TRAMP_LISPDIR%%/tramp.elc
%%TRAMP_LISPDIR%%/trampcache.el
%%TRAMP_LISPDIR%%/trampcache.elc
%%TRAMP_LISPDIR%%/tramp-cache.el
%%TRAMP_LISPDIR%%/tramp-cache.elc
%%TRAMP_LISPDIR%%/trampver.el
%%TRAMP_LISPDIR%%/trampver.elc
@dirrm %%TRAMP_LISPDIR%%
@unexec install-info --delete %D/info/tramp %D/info/dir
%%JAPANESE_INFO%%@unexec install-info --delete %D/info/tramp_ja %D/info/dir
info/tramp
%%JAPANESE_INFO%%info/tramp_ja
@exec install-info %D/info/tramp %D/info/dir
%%JAPANESE_INFO%%@exec install-info %D/info/tramp_ja %D/info/dir