Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2013 06:48:02 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327222 - head/textproc/asciidoc
Message-ID:  <201309140648.r8E6m33u010190@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Sep 14 06:48:02 2013
New Revision: 327222
URL: http://svnweb.freebsd.org/changeset/ports/327222

Log:
  - Fix PLIST
  - Cosmetic change

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

Modified: head/textproc/asciidoc/Makefile
==============================================================================
--- head/textproc/asciidoc/Makefile	Sat Sep 14 06:39:51 2013	(r327221)
+++ head/textproc/asciidoc/Makefile	Sat Sep 14 06:48:02 2013	(r327222)
@@ -25,7 +25,7 @@ USES=		gmake
 
 MAN1=		a2x.1 asciidoc.1
 
-CONFFILES=	asciidoc.conf docbook45.conf \
+CONF_FILES=	asciidoc.conf docbook45.conf \
 		filters/code/code-filter.conf \
 		filters/graphviz/graphviz-filter.conf \
 		filters/latex/latex-filter.conf \
@@ -49,8 +49,8 @@ PLIST_SUB+=	VIM="@comment " VIM_DATADIR=
 .endif
 
 post-patch:
-.for f in ${CONFFILES}
-	@cd ${WRKSRC} && ${MV} ${f} ${f}.sample
+.for conf_file in ${CONF_FILES}
+	@cd ${WRKSRC} && ${MV} ${conf_file} ${conf_file}.sample
 .endfor
 .if ${PORT_OPTIONS:MVIM}
 	@${REINPLACE_CMD} -e '/^vimdir = /d' ${WRKSRC}/Makefile.in
@@ -62,9 +62,9 @@ pre-install:
 .endif
 
 post-install:
-.for f in ${CONFFILES}
-	@if [ ! -f ${ETCDIR}/${f} ]; then \
-		${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \
+.for conf_file in ${CONF_FILES}
+	@if [ ! -f ${ETCDIR}/${conf_file} ]; then \
+		${CP} -p ${ETCDIR}/${conf_file}.sample ${ETCDIR}/${conf_file} ; \
 	fi
 .endfor
 

Modified: head/textproc/asciidoc/pkg-plist
==============================================================================
--- head/textproc/asciidoc/pkg-plist	Sat Sep 14 06:39:51 2013	(r327221)
+++ head/textproc/asciidoc/pkg-plist	Sat Sep 14 06:48:02 2013	(r327222)
@@ -131,8 +131,8 @@ 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
-@exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi
 %%ETCDIR%%/xhtml11.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi
 @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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309140648.r8E6m33u010190>