svn commit: r329978 - head/textproc/asciidoc

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Oct 10 08:57:13 2013
New Revision: 329978
URL: http://svnweb.freebsd.org/changeset/ports/329978

Log:
  - Convert to new OPTIONS helper
  - Support STAGEDIR

Modified:
  head/textproc/asciidoc/Makefile
  head/textproc/asciidoc/pkg-plist

Modified: head/textproc/asciidoc/Makefile
==============================================================================
--- head/textproc/asciidoc/Makefile	Thu Oct 10 08:42:51 2013	(r329977)
+++ head/textproc/asciidoc/Makefile	Thu Oct 10 08:57:13 2013	(r329978)
@@ -17,14 +17,13 @@ RUN_DEPENDS=	python2:${PORTSDIR}/lang/py
 
 OPTIONS_DEFINE=	VIM
 OPTIONS_DEFAULT=VIM
+OPTIONS_SUB=	yes
 VIM_DESC=	Install Vim ftdetect & syntax files
 
 GNU_CONFIGURE=	yes
 USE_PYTHON=	-2.7
 USES=		gmake
 
-MAN1=		a2x.1 asciidoc.1
-
 CONF_FILES=	asciidoc.conf docbook45.conf \
 		filters/code/code-filter.conf \
 		filters/graphviz/graphviz-filter.conf \
@@ -38,15 +37,14 @@ CONF_FILES=	asciidoc.conf docbook45.conf
 		latex.conf slidy.conf text.conf wordpress.conf \
 		xhtml11.conf xhtml11-quirks.conf
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVIM}
 MAKE_ENV+=	vimdir=${PREFIX}/share/vim/${VIM_DATADIR}
-PLIST_SUB+=	VIM="" VIM_DATADIR=${VIM_DATADIR}
+PLIST_SUB+=	VIM_DATADIR=${VIM_DATADIR}
 VIM__DATADIR!=	${MAKE} -C ../../editors/vim/ -V _DATADIR
 .else
-PLIST_SUB+=	VIM="@comment " VIM_DATADIR=""
+PLIST_SUB+=	VIM_DATADIR=""
 .endif
 
 post-patch:
@@ -59,13 +57,13 @@ post-patch:
 
 pre-install:
 .if ${PORT_OPTIONS:MVIM}
-	@${MKDIR} ${PREFIX}/share/vim/${VIM_DATADIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/
 .endif
 
 post-install:
 .for conf_file in ${CONF_FILES}
-	@if [ ! -f ${ETCDIR}/${conf_file} ]; then \
-		${CP} -p ${ETCDIR}/${conf_file}.sample ${ETCDIR}/${conf_file} ; \
+	@if [ ! -f ${STAGEDIR}${ETCDIR}/${conf_file} ]; then \
+		${CP} -p ${STAGEDIR}${ETCDIR}/${conf_file}.sample ${STAGEDIR}${ETCDIR}/${conf_file} ; \
 	fi
 .endfor
 

Modified: head/textproc/asciidoc/pkg-plist
==============================================================================
--- head/textproc/asciidoc/pkg-plist	Thu Oct 10 08:42:51 2013	(r329977)
+++ head/textproc/asciidoc/pkg-plist	Thu Oct 10 08:57:13 2013	(r329978)
@@ -136,6 +136,8 @@ bin/asciidoc.py
 @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
+man/man1/a2x.1.gz
+man/man1/asciidoc.1.gz
 %%VIM%%%%VIM_DATADIR%%share/vim/ftdetect/asciidoc_filetype.vim
 %%VIM%%%%VIM_DATADIR%%share/vim/syntax/asciidoc.vim
 %%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/syntax