On Sat, 6 Sep 2014 11:30:37 +0200 Christopher Zimmermann <chr...@openbsd.org> wrote:
> Hi,
>
> besiges bumping the version I install the plugin into the version
> independent vimfiles directory and automatically update the
> documentation tags on install/update and uninstall using @exec-always
> and @unexec-delete. The tags file is removed when the docs directory is
> empty after uninstalling, so the tags file won't interfere with deletion
> of the doc directory when all plugins are uninstalled.
> Is this a proper usage of those directives?
> OK?
Here is an updated diff. It will build the doc/tags file at build time
and merge it at install time with the tags files of other plugins that
might already be installed.
OK?
Christopher
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-taglist/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 11 Mar 2013 10:50:31 -0000 1.6
+++ Makefile 7 Sep 2014 16:22:24 -0000
@@ -2,9 +2,8 @@
COMMENT = source code browser plugin for the Vim text editor
-DISTNAME = taglist_45
-PKGNAME = vim-taglist-4.5
-REVISION = 2
+DISTNAME = taglist_46
+PKGNAME = vim-taglist-4.6
CATEGORIES = devel editors
EXTRACT_SUFX = .zip
@@ -16,12 +15,9 @@ MAINTAINER = Simon Bertrang <simon@openb
# BSD like license
PERMIT_PACKAGE_CDROM = Yes
-VIMDIR = vim73
-
-SUBST_VARS = VIMDIR
-
WRKDIST = ${WRKDIR}
+BUILD_DEPENDS = editors/vim
RUN_DEPENDS = devel/ectags \
editors/vim
@@ -29,11 +25,15 @@ NO_BUILD = Yes
NO_TEST = Yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/vim/${VIMDIR}/plugin/ \
- ${PREFIX}/share/vim/${VIMDIR}/doc/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vim/vimfiles/{plugin,doc}
${INSTALL_DATA} ${WRKSRC}/plugin/taglist.vim \
- ${PREFIX}/share/vim/${VIMDIR}/plugin/
+ ${PREFIX}/share/vim/vimfiles/plugin/
${INSTALL_DATA} ${WRKSRC}/doc/taglist.txt \
- ${PREFIX}/share/vim/${VIMDIR}/doc/
+ ${PREFIX}/share/vim/vimfiles/doc/
+ vim --cmd helptags\ ${PREFIX}/share/vim/vimfiles/doc/ \
+ --cmd q
+ sort -c ${PREFIX}/share/vim/vimfiles/doc/tags
+ mv ${PREFIX}/share/vim/vimfiles/doc/tags \
+ ${PREFIX}/share/vim/vimfiles/doc/vim-taglist.tags
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/vim-taglist/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 26 May 2008 09:33:54 -0000 1.1.1.1
+++ distinfo 7 Sep 2014 16:22:24 -0000
@@ -1,5 +1,2 @@
-MD5 (taglist_45.zip) = mbU2amTupgkrsUDffUwalQ==
-RMD160 (taglist_45.zip) = zH1CjIseRX2WhvEoYhg6ZSTgRNY=
-SHA1 (taglist_45.zip) = yAVrNZCoPwauOha4rns1DdTIfnw=
-SHA256 (taglist_45.zip) = iqL0kQSJ8MTvKkpdne0Hiw6KBUpUKZiaT3jCS7hnU/4=
-SIZE (taglist_45.zip) = 50243
+SHA256 (taglist_46.zip) = Uk4qcAHRzyNEnEQyk7biGqZUoaI4pStu3OfxLQzZi6E=
+SIZE (taglist_46.zip) = 51455
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/vim-taglist/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 29 Oct 2008 09:04:53 -0000 1.2
+++ pkg/PLIST 7 Sep 2014 16:22:24 -0000
@@ -1,3 +1,13 @@
@comment $OpenBSD: PLIST,v 1.2 2008/10/29 09:04:53 simon Exp $
-share/vim/${VIMDIR}/doc/taglist.txt
-share/vim/${VIMDIR}/plugin/taglist.vim
+share/vim/vimfiles/
+share/vim/vimfiles/doc/
+share/vim/vimfiles/doc/taglist.txt
+share/vim/vimfiles/doc/vim-taglist.tags
+@comment merge tagfiles of plugin documentation
+@exec-always sort -mo %D/share/vim/vimfiles/doc/tags
%D/share/vim/vimfiles/doc/*.tags 2>/dev/null || true
+@comment remove tags, so that the vimfiles dir can be deleted if necessary
+@unexec-delete rm -f %D/share/vim/vimfiles/doc/tags
+@comment if there still is plugin documentation left, recreate tags file
+@unexec-delete sort -mo %D/share/vim/vimfiles/doc/tags
%D/share/vim/vimfiles/doc/*.tags 2>/dev/null || true
+share/vim/vimfiles/plugin/
+share/vim/vimfiles/plugin/taglist.vim
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
