- obey DATADIR and DOCSDIR

- obey -DNOPORTDOCS (and fix plist)
- use REINPLACE_CMD intead of custom hack

Prompted by:	QAT QA run
Approved by:	mantainer timeout on QATMail

2 files changed, 36 insertions, 36 deletions

diff --git a/misc/spamcalc/Makefile b/misc/spamcalc/Makefile
index 449bb34773c4..180afff0f3f3 100644
--- a/misc/spamcalc/Makefile
+++ b/misc/spamcalc/Makefile
@@ -17,26 +17,26 @@ COMMENT=	Calculates "DNS-spam"-values for hostnames
 USE_PERL5=	YES
 
 do-build:
-	${MV} ${WRKSRC}/sc.pl ${WRKSRC}/sc.pl.orig
-	${SED} -e "s,sc.conf,${PREFIX}/etc/spamcalc.conf," < ${WRKSRC}/sc.pl.orig > ${WRKSRC}/sc.pl
-	${MV} ${WRKSRC}/sc.conf ${WRKSRC}/sc.conf.orig
-	${SED} -e "s,datafilesdir.*,datafilesdir = ${PREFIX}/share/spamcalc," < ${WRKSRC}/sc.conf.orig > ${WRKSRC}/sc.conf
+	${REINPLACE_CMD} -e "s,sc.conf,${PREFIX}/etc/spamcalc.conf," \
+		${WRKSRC}/sc.pl
+	${REINPLACE_CMD} -e "s,datafilesdir.*,datafilesdir = ${DATADIR}," \
+		${WRKSRC}/sc.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sc.pl ${PREFIX}/bin/spamcalc
 	${INSTALL_DATA} ${WRKSRC}/sc.conf ${PREFIX}/etc/spamcalc.conf
-	${MKDIR} ${PREFIX}/share/spamcalc
+	${MKDIR} ${DATADIR}
 .for i in words regexps domains
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/spamcalc
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}
 .endfor
-	${MKDIR} ${PREFIX}/share/spamcalc/data
+	${MKDIR} ${DATADIR}/data
 .for i in domains.blacklist domains.whitelist regexps.general regexps.nonspam spam.txt words.de words.it words.negative words.nl words.pl words.swear words.template words.uk
-	${INSTALL_DATA} ${WRKSRC}/data/${i} ${PREFIX}/share/spamcalc/data
+	${INSTALL_DATA} ${WRKSRC}/data/${i} ${DATADIR}/data
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/spamcalc
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 .for i in LICENSE algorithms arguments feedback files introduction todo
-	${INSTALL_MAN} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/spamcalc
+	${INSTALL_MAN} ${WRKSRC}/docs/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/misc/spamcalc/pkg-plist b/misc/spamcalc/pkg-plist
index c66e9c6e4f89..4d92e822c3a9 100644
--- a/misc/spamcalc/pkg-plist
+++ b/misc/spamcalc/pkg-plist
@@ -1,28 +1,28 @@
 bin/spamcalc
 etc/spamcalc.conf
-share/spamcalc/data/domains.blacklist
-share/spamcalc/data/domains.whitelist
-share/spamcalc/data/regexps.general
-share/spamcalc/data/regexps.nonspam
-share/spamcalc/data/spam.txt
-share/spamcalc/data/words.de
-share/spamcalc/data/words.it
-share/spamcalc/data/words.negative
-share/spamcalc/data/words.nl
-share/spamcalc/data/words.pl
-share/spamcalc/data/words.swear
-share/spamcalc/data/words.template
-share/spamcalc/data/words.uk
-@dirrm share/spamcalc/data
-%%PORTDOCS%%share/doc/spamcalc/LICENSE
-%%PORTDOCS%%share/doc/spamcalc/algorithms
-%%PORTDOCS%%share/doc/spamcalc/arguments
-%%PORTDOCS%%share/doc/spamcalc/feedback
-%%PORTDOCS%%share/doc/spamcalc/files
-%%PORTDOCS%%share/doc/spamcalc/introduction
-%%PORTDOCS%%share/doc/spamcalc/todo
-%%PORTDOCS%%@dirrm share/doc/spamcalc
-share/spamcalc/words
-share/spamcalc/regexps
-share/spamcalc/domains
-@dirrm share/spamcalc
+%%DATADIR%%/data/domains.blacklist
+%%DATADIR%%/data/domains.whitelist
+%%DATADIR%%/data/regexps.general
+%%DATADIR%%/data/regexps.nonspam
+%%DATADIR%%/data/spam.txt
+%%DATADIR%%/data/words.de
+%%DATADIR%%/data/words.it
+%%DATADIR%%/data/words.negative
+%%DATADIR%%/data/words.nl
+%%DATADIR%%/data/words.pl
+%%DATADIR%%/data/words.swear
+%%DATADIR%%/data/words.template
+%%DATADIR%%/data/words.uk
+%%DATADIR%%/words
+%%DATADIR%%/regexps
+%%DATADIR%%/domains
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/algorithms
+%%PORTDOCS%%%%DOCSDIR%%/arguments
+%%PORTDOCS%%%%DOCSDIR%%/feedback
+%%PORTDOCS%%%%DOCSDIR%%/files
+%%PORTDOCS%%%%DOCSDIR%%/introduction
+%%PORTDOCS%%%%DOCSDIR%%/todo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%