From 31a552d0c1500ec6968e36d3d324c3f1c38ca136 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 14 Nov 2014 09:09:46 +0000 Subject: [PATCH] - Fix EXAMPLES installation - Cleanup plist --- textproc/sphinxsearch-devel/Makefile | 3 ++- textproc/sphinxsearch-devel/pkg-plist | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile index 3bf6a014fb73..1636942389e4 100644 --- a/textproc/sphinxsearch-devel/Makefile +++ b/textproc/sphinxsearch-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= sphinxsearch PORTVERSION= 2.2.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc databases MASTER_SITES= http://sphinxsearch.com/files/ \ @@ -167,7 +168,7 @@ install-man: install-examples: .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} "${EXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}) .endif .include diff --git a/textproc/sphinxsearch-devel/pkg-plist b/textproc/sphinxsearch-devel/pkg-plist index c67005db0e02..329dd732472a 100644 --- a/textproc/sphinxsearch-devel/pkg-plist +++ b/textproc/sphinxsearch-devel/pkg-plist @@ -3,9 +3,7 @@ bin/indextool bin/search bin/spelldump sbin/searchd -@unexec if cmp -s %D/etc/sphinx.conf.sample %D/etc/sphinx.conf; then rm -f %D/etc/sphinx.conf; fi -etc/sphinx.conf.sample -@exec if [ ! -f %D/etc/sphinx.conf ] ; then cp -p %D/%F %B/sphinx.conf; fi +@sample etc/sphinx.conf.sample %%PORTDOCS%%man/man1/indexer.1.gz %%PORTDOCS%%man/man1/indextool.1.gz %%PORTDOCS%%man/man1/search.1.gz @@ -15,4 +13,3 @@ etc/sphinx.conf.sample %%PORTDOCS%%%%DOCSDIR%%/sphinx.html %%PORTDOCS%%%%DOCSDIR%%/sphinx.txt %%PORTDOCS%%%%DOCSDIR%%/sphinx.xml -%%PORTDOCS%%@dirrm %%DOCSDIR%%