2 files changed, 20 insertions, 67 deletions

diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index 2d581bd5a985..8e44f2a9bda7 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -13,40 +13,35 @@ COMMENT=	A document preparation system that allows concurrent publication
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
 		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libxml2.so.5:${PORTSDIR}/textproc/libxml2 \
+		libxslt.so.2:${PORTSDIR}/textproc/libxslt
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
 USE_TEX=	latex
 
-FIND_DIRS=	-type d
-FIND_DATA=	-type f -not \( -name "*.orig" -or -name "*.bak" \)
+OPTIONS_DEFINE=	DOCS
 
-LN_OPTS=	-sf
-RM_OPTS=	-r
+PORTDOCS=	*
 
 ECMDS_CONF=	${WRKSRC}/etc/ecmds.conf
 ECROMEDOC=	${DATADIR}/doc
 ECROMEBIN=	${DATADIR}/bin/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		     -e 's|%%DATADIR%%|${DATADIR}|g' ${ECMDS_CONF}
 
 do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${FIND} . ${FIND_DIRS} -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} . ${FIND_DATA} -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${ECROMEBIN}
-	${LN} ${LN_OPTS} ${ECROMEBIN} ${PREFIX}/bin/${PORTNAME}
-	${LN} ${LN_OPTS} ${ECROMEBIN} ${PREFIX}/bin/ecmds
-.if !defined(NOPORTDOCS)
-	${MV} ${ECROMEDOC} ${DOCSDIR}
-	${LN} ${LN_OPTS} ${DOCSDIR} ${ECROMEDOC}
-.else
-	${RM} ${RM_OPTS} ${ECROMEDOC}
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-not ( -name "*.orig" -or -name "*.bak" )"
+	${RM} -f ${STAGEDIR}${ECROMEBIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${ECROMEBIN}
+	${LN} -s ${ECROMEBIN} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${LN} -s ${ECROMEBIN} ${STAGEDIR}${PREFIX}/bin/ecmds
+	${MV} ${STAGEDIR}${DATADIR}/etc/ecmds.conf ${STAGEDIR}${DATADIR}/etc/ecmds.conf.sample
+	${MV} ${STAGEDIR}${DATADIR}/etc/plugins.conf ${STAGEDIR}${DATADIR}/etc/plugins.conf.sample
+	${MV} ${STAGEDIR}${ECROMEDOC} ${STAGEDIR}${DOCSDIR}
+	${LN} -s ${DOCSDIR} ${STAGEDIR}${ECROMEDOC}
 
 .include <bsd.port.mk>
diff --git a/textproc/ecromedos/pkg-plist b/textproc/ecromedos/pkg-plist
index bf66a7c2cf38..89b897545244 100644
--- a/textproc/ecromedos/pkg-plist
+++ b/textproc/ecromedos/pkg-plist
@@ -1,42 +1,5 @@
 bin/ecmds
 bin/ecromedos
-%%PORTDOCS%%%%DOCSDIR%%/langdef.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/biblio.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/m000001.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/prev.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/style.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/toc.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/pdf/manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/advanced.xml
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/compiling.xml
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/installation.xml
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/introduction.xml
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/manual.xml
-%%PORTDOCS%%%%DOCSDIR%%/manual/src/writing.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter1.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter2.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter3.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter4.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter5.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/prev.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/style.css
-%%PORTDOCS%%%%DOCSDIR%%/reference/html/toc.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/pdf/reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/AtoC.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/DtoL.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/MtoS.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/TtoZ.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/defs.xml
-%%PORTDOCS%%%%DOCSDIR%%/reference/src/reference.xml
 %%DATADIR%%/bin/configreader.py
 %%DATADIR%%/bin/configreader.pyc
 %%DATADIR%%/bin/ecmdsproc.py
@@ -58,8 +21,12 @@ bin/ecromedos
 %%DATADIR%%/data/toc.gif
 %%DATADIR%%/data/toc.png
 %%PORTDOCS%%%%DATADIR%%/doc
-%%DATADIR%%/etc/ecmds.conf
-%%DATADIR%%/etc/plugins.conf
+@unexec if cmp -s %D/%%DATADIR%%/etc/ecmds.conf.sample %D/%%DATADIR%%/etc/ecmds.conf; then rm -f %D/%%DATADIR%%/etc/ecmds.conf; fi
+%%DATADIR%%/etc/ecmds.conf.sample
+@exec if [ ! -f %D/%%DATADIR%%/etc/ecmds.conf ] ; then cp -p %D/%F %B/ecmds.conf; fi
+@unexec if cmp -s %D/%%DATADIR%%/etc/plugins.conf.sample %D/%%DATADIR%%/etc/plugins.conf; then rm -f %D/%%DATADIR%%/etc/plugins.conf; fi
+%%DATADIR%%/etc/plugins.conf.sample
+@exec if [ ! -f %D/%%DATADIR%%/etc/plugins.conf ] ; then cp -p %D/%F %B/plugins.conf; fi
 %%DATADIR%%/lib/__init__.py
 %%DATADIR%%/lib/hylight/__init__.py
 %%DATADIR%%/lib/hylight/__init__.pyc
@@ -249,15 +216,6 @@ bin/ecromedos
 %%DATADIR%%/transform/xhtml/toc.xsl
 %%DATADIR%%/transform/xhtml/utility.xsl
 %%DATADIR%%/transform/xhtml/xhtml.xsl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/src
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/src
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/etc