From owner-svn-ports-all@FreeBSD.ORG Sun Aug 25 08:04:56 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F21AB2FD; Sun, 25 Aug 2013 08:04:55 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) 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 DF5972F4B; Sun, 25 Aug 2013 08:04:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7P84t2c026732; Sun, 25 Aug 2013 08:04:55 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7P84tZQ026730; Sun, 25 Aug 2013 08:04:55 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201308250804.r7P84tZQ026730@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 25 Aug 2013 08:04:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325329 - 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.14 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: Sun, 25 Aug 2013 08:04:56 -0000 Author: sunpoet Date: Sun Aug 25 08:04:55 2013 New Revision: 325329 URL: http://svnweb.freebsd.org/changeset/ports/325329 Log: - Add option: VIM for vim ftdetect & syntax files - Cleanup Makefile header - Take maintainership - Fix PLIST: remove blank line Modified: head/textproc/asciidoc/Makefile head/textproc/asciidoc/pkg-plist (contents, props changed) Modified: head/textproc/asciidoc/Makefile ============================================================================== --- head/textproc/asciidoc/Makefile Sun Aug 25 05:39:31 2013 (r325328) +++ head/textproc/asciidoc/Makefile Sun Aug 25 08:04:55 2013 (r325329) @@ -7,17 +7,21 @@ PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Text document format for writing short documents and man pages LICENSE= GPLv2 MIT LICENSE_COMB= multi -RUN_DEPENDS+= python2:${PORTSDIR}/lang/python2 +RUN_DEPENDS= python2:${PORTSDIR}/lang/python2 + +OPTIONS_DEFINE= VIM +OPTIONS_DEFAULT=VIM +VIM_DESC= Install Vim ftdetect & syntax files -USE_PYTHON= -2.7 -USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PYTHON= -2.7 +USES= gmake MAN1= a2x.1 asciidoc.1 @@ -34,10 +38,28 @@ CONFFILES= asciidoc.conf docbook45.conf latex.conf slidy.conf text.conf wordpress.conf \ xhtml11.conf xhtml11-quirks.conf +.include + +.if ${PORT_OPTIONS:MVIM} +MAKE_ENV+= vimdir=${PREFIX}/share/vim/${VIM_DATADIR} +PLIST_SUB+= VIM="" VIM_DATADIR=${VIM_DATADIR} +VIM__DATADIR!= ${MAKE} -C ../../editors/vim/ -V _DATADIR +.else +PLIST_SUB+= VIM="@comment " VIM_DATADIR="" +.endif + post-patch: .for f in ${CONFFILES} @cd ${WRKSRC} && ${MV} ${f} ${f}.sample .endfor +.if ${PORT_OPTIONS:MVIM} + @${REINPLACE_CMD} -e '/^vimdir = /d' ${WRKSRC}/Makefile.in +.endif + +pre-install: +.if ${PORT_OPTIONS:MVIM} + @${MKDIR} ${PREFIX}/share/vim/${VIM_DATADIR}/ +.endif post-install: .for f in ${CONFFILES} Modified: head/textproc/asciidoc/pkg-plist ============================================================================== --- head/textproc/asciidoc/pkg-plist Sun Aug 25 05:39:31 2013 (r325328) +++ head/textproc/asciidoc/pkg-plist Sun Aug 25 08:04:55 2013 (r325329) @@ -131,17 +131,17 @@ bin/asciidoc.py %%ETCDIR%%/wordpress.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/wordpress.conf ] ; then cp -p %D/%F %B/wordpress.conf; fi @unexec if cmp -s %D/%%ETCDIR%%/xhtml11.conf.sample %D/%%ETCDIR%%/xhtml11.conf; then rm -f %D/%%ETCDIR%%/xhtml11.conf; fi -%%ETCDIR%%/xhtml11.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi +%%ETCDIR%%/xhtml11.conf.sample @unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi %%ETCDIR%%/xhtml11-quirks.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi -share/vim/vimfiles/ftdetect/asciidoc_filetype.vim -share/vim/vimfiles/syntax/asciidoc.vim -@dirrmtry share/vim/vimfiles/syntax -@dirrmtry share/vim/vimfiles/ftdetect -@dirrmtry share/vim/vimfiles -@dirrmtry share/vim +%%VIM%%%%VIM_DATADIR%%share/vim/ftdetect/asciidoc_filetype.vim +%%VIM%%%%VIM_DATADIR%%share/vim/syntax/asciidoc.vim +%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/syntax +%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/ftdetect +%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%% +%%VIM%%@dirrmtry share/vim @dirrm %%ETCDIR%%/themes/volnitsky @dirrm %%ETCDIR%%/themes/flask @dirrm %%ETCDIR%%/themes