From owner-svn-ports-all@FreeBSD.ORG Thu Dec 5 12:13:02 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B09A9957; Thu, 5 Dec 2013 12:13:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 820451718; Thu, 5 Dec 2013 12:13:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5CD2Pl004321; Thu, 5 Dec 2013 12:13:02 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5CD2CV004319; Thu, 5 Dec 2013 12:13:02 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201312051213.rB5CD2CV004319@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 5 Dec 2013 12:13:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335663 - head/textproc/asciidoc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 12:13:02 -0000 Author: sunpoet Date: Thu Dec 5 12:13:01 2013 New Revision: 335663 URL: http://svnweb.freebsd.org/changeset/ports/335663 Log: - Remove VIM option: editors/vim installs identical syntax/asciidoc.vim now - Bump PORTREVISION for package change PR: ports/184511 Submitted by: mandree Modified: head/textproc/asciidoc/Makefile head/textproc/asciidoc/pkg-plist Modified: head/textproc/asciidoc/Makefile ============================================================================== --- head/textproc/asciidoc/Makefile Thu Dec 5 12:07:00 2013 (r335662) +++ head/textproc/asciidoc/Makefile Thu Dec 5 12:13:01 2013 (r335663) @@ -3,6 +3,7 @@ PORTNAME= asciidoc PORTVERSION= 8.6.9 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF @@ -14,11 +15,6 @@ LICENSE_COMB= multi RUN_DEPENDS= python2:${PORTSDIR}/lang/python2 -OPTIONS_DEFINE= VIM -OPTIONS_DEFAULT=VIM -OPTIONS_SUB= yes -VIM_DESC= Install Vim syntax file - GNU_CONFIGURE= yes USE_PYTHON= -2.7 USES= gmake @@ -34,18 +30,9 @@ CONF_FILES= asciidoc.conf docbook45.conf lang-ru.conf lang-uk.conf latex.conf slidy.conf text.conf \ xhtml11.conf xhtml11-quirks.conf -.include - -.if ${PORT_OPTIONS:MVIM} -PLIST_SUB+= VIM_DATADIR=${VIM_DATADIR} -VIM_DATADIR!= ${MAKE} -C ../../editors/vim/ -V _DATADIR -.else -PLIST_SUB+= VIM_DATADIR="" -.endif - post-patch: @${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|${SETENV} python|&2|' ${WRKSRC}/a2x.py ${WRKSRC}/asciidoc.py + @${REINPLACE_CMD} -e '1 s|${SETENV} python|&2|' ${WRKSRC}/a2x.py ${WRKSRC}/asciidoc.py .for conf_file in ${CONF_FILES} @cd ${WRKSRC}/ && ${MV} ${conf_file} ${conf_file}.sample .endfor @@ -56,9 +43,5 @@ post-install: ${CP} -p ${STAGEDIR}${ETCDIR}/${conf_file}.sample ${STAGEDIR}${ETCDIR}/${conf_file}; \ fi .endfor -.if ${PORT_OPTIONS:MVIM} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/syntax/ - ${INSTALL_DATA} ${WRKSRC}/vim/syntax/asciidoc.vim ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/syntax/ -.endif .include Modified: head/textproc/asciidoc/pkg-plist ============================================================================== --- head/textproc/asciidoc/pkg-plist Thu Dec 5 12:07:00 2013 (r335662) +++ head/textproc/asciidoc/pkg-plist Thu Dec 5 12:13:01 2013 (r335663) @@ -141,10 +141,6 @@ bin/asciidoc.py @exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ]; then cp -p %D/%F %B/xhtml11-quirks.conf; fi man/man1/a2x.1.gz man/man1/asciidoc.1.gz -%%VIM%%share/vim/%%VIM_DATADIR%%/syntax/asciidoc.vim -%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/syntax -%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%% -%%VIM%%@dirrmtry share/vim @dirrm %%ETCDIR%%/themes/volnitsky @dirrm %%ETCDIR%%/themes/flask @dirrm %%ETCDIR%%/themes