- Honour NOPORTEXAMPLES and use EXAMPLESDIR

2 files changed, 25 insertions, 35 deletions

diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index ddb54e666188..a4ac63197d7b 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hf
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hfterm
@@ -33,26 +33,18 @@ post-configure:
 	${WRKSRC}/hfkernel/Makefile
 
 post-install:
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/hf-examplefiles
-.for d in ${WRKSRC}/doc/hf-examplefiles/fix.01 \
-	${WRKSRC}/doc/hf-examplefiles/fix.02 \
-	${WRKSRC}/doc/hf-examplefiles/fix.03 \
-	${WRKSRC}/doc/hf-examplefiles/fix.04 \
-	${WRKSRC}/doc/hf-examplefiles/fix.05 \
-	${WRKSRC}/doc/hf-examplefiles/fix.06 \
-	${WRKSRC}/doc/hf-examplefiles/fix.07 \
-	${WRKSRC}/doc/hf-examplefiles/fix.08 \
-	${WRKSRC}/doc/hf-examplefiles/fix.09 \
-	${WRKSRC}/doc/hf-examplefiles/fix.10 \
-	${WRKSRC}/doc/hf-examplefiles/fix.11 \
-	${WRKSRC}/doc/hf-examplefiles/fix.12 \
+	@${ECHO} ""
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for d in ${WRKSRC}/doc/hf-examplefiles/fix.[0-1]*[0-9]* \
 	${WRKSRC}/doc/hf-examplefiles/gag
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DATADIR}/hf-examplefiles
+	@${INSTALL_DATA} ${WRKSRC}/${d} ${EXAMPLESDIR}
 .endfor
+	@${ECHO} "hf examples installed in ${EXAMPLESDIR}"
+.endif
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for d in ${WRKSRC}/doc/AUTHORS ${WRKSRC}/doc/ChangeLog \
 	${WRKSRC}/doc/DE-HF-HOWTO.txt ${WRKSRC}/doc/HF-HOWTO.txt \
 	${WRKSRC}/doc/INSTALL ${WRKSRC}/doc/LIESMICH \
@@ -62,11 +54,10 @@ post-install:
 	${WRKSRC}/doc/lfconv.jpg ${WRKSRC}/doc/mt63.txt \
 	${WRKSRC}/doc/pactor.ps ${WRKSRC}/doc/pactor.txt \
 	${WRKSRC}/doc/pactor_statediag.fig
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
 .endfor
-	@${ECHO} ""
 	@${ECHO} "hf docs installed in ${DOCSDIR}"
-	@${ECHO} ""
 .endif
+	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/comms/hf/pkg-plist b/comms/hf/pkg-plist
index 0098a588f630..8e45558fb223 100644
--- a/comms/hf/pkg-plist
+++ b/comms/hf/pkg-plist
@@ -18,19 +18,19 @@ bin/ratecal1
 bin/ratetry
 bin/reffreq
 etc/calibrations.samp
-%%DATADIR%%/hf-examplefiles/fix.01
-%%DATADIR%%/hf-examplefiles/fix.02
-%%DATADIR%%/hf-examplefiles/fix.03
-%%DATADIR%%/hf-examplefiles/fix.04
-%%DATADIR%%/hf-examplefiles/fix.05
-%%DATADIR%%/hf-examplefiles/fix.06
-%%DATADIR%%/hf-examplefiles/fix.07
-%%DATADIR%%/hf-examplefiles/fix.08
-%%DATADIR%%/hf-examplefiles/fix.09
-%%DATADIR%%/hf-examplefiles/fix.10
-%%DATADIR%%/hf-examplefiles/fix.11
-%%DATADIR%%/hf-examplefiles/fix.12
-%%DATADIR%%/hf-examplefiles/gag
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.01
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.02
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.03
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.04
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.05
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.06
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.07
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.08
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.09
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.11
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.12
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gag
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/DE-HF-HOWTO.txt
@@ -48,6 +48,5 @@ etc/calibrations.samp
 %%PORTDOCS%%%%DOCSDIR%%/pactor.ps
 %%PORTDOCS%%%%DOCSDIR%%/pactor.txt
 %%PORTDOCS%%%%DOCSDIR%%/pactor_statediag.fig
-@dirrm %%DATADIR%%/hf-examplefiles
-@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%