2 files changed, 123 insertions, 119 deletions

diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 2a1ed77f142f..b48fc3d29219 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -32,11 +32,15 @@ do-install:
 	@for i in ${MAN1}; do \
 		${INSTALL_MAN} ${WRKSRC}/docs/$$i ${PREFIX}/man/man1; \
 	done
-	@${MKDIR} ${PREFIX}/share/examples/golded+
-	@(cd ${WRKSRC}/cfgs && ${TAR} cf - --exclude CVS * | \
-	  ${TAR} xf - -C ${PREFIX}/share/examples/golded+)
-	@${MKDIR} ${PREFIX}/share/doc/golded+
-	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${PREFIX}/share/doc/golded+
-	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${PREFIX}/share/doc/golded+
+	@${MKDIR} ${EXAMPLESDIR}
+	@for i in charset colorset config template; do \
+		${MKDIR} ${EXAMPLESDIR}/$$i; \
+		${FIND} ${WRKSRC}/cfgs/$$i -maxdepth 1 -type f | ${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${EXAMPLESDIR}/$$i; \
+	done
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/news/golded+/pkg-plist b/news/golded+/pkg-plist
index e67f14e89d0f..f27ec41f772d 100644
--- a/news/golded+/pkg-plist
+++ b/news/golded+/pkg-plist
@@ -1,116 +1,116 @@
 bin/golded
 bin/goldnode
 bin/rddt
-share/doc/golded+/gold_ref.txt
-share/doc/golded+/gold_usr.txt
-share/examples/golded+/charset/850_850.chs
-share/examples/golded+/charset/850_asc.chs
-share/examples/golded+/charset/850_iqp.chs
-share/examples/golded+/charset/850_iso.chs
-share/examples/golded+/charset/865_iso.chs
-share/examples/golded+/charset/can_asc.chs
-share/examples/golded+/charset/can_ibm.chs
-share/examples/golded+/charset/cmp_ibm.esc
-share/examples/golded+/charset/dut_asc.chs
-share/examples/golded+/charset/dut_ibm.chs
-share/examples/golded+/charset/fin_asc.chs
-share/examples/golded+/charset/fin_ibm.chs
-share/examples/golded+/charset/frn_asc.chs
-share/examples/golded+/charset/frn_ibm.chs
-share/examples/golded+/charset/ger_asc.chs
-share/examples/golded+/charset/ger_ibm.chs
-share/examples/golded+/charset/i1m_ibm.chs
-share/examples/golded+/charset/i51_ibm.esc
-share/examples/golded+/charset/ibm_asc.chs
-share/examples/golded+/charset/ibm_cmp.chs
-share/examples/golded+/charset/ibm_i51.chs
-share/examples/golded+/charset/ibm_ibm.chs
-share/examples/golded+/charset/ibm_iqp.chs
-share/examples/golded+/charset/ibm_iso.chs
-share/examples/golded+/charset/ibm_mac.chs
-share/examples/golded+/charset/ibm_mne.chs
-share/examples/golded+/charset/ibm_swe.chs
-share/examples/golded+/charset/ibm_vt1.chs
-share/examples/golded+/charset/iqp_850.chs
-share/examples/golded+/charset/iqp_ibm.chs
-share/examples/golded+/charset/iso_850.chs
-share/examples/golded+/charset/iso_asc.chs
-share/examples/golded+/charset/iso_ibm.chs
-share/examples/golded+/charset/iso_iso.chs
-share/examples/golded+/charset/iso_mac.chs
-share/examples/golded+/charset/iso_vt1.chs
-share/examples/golded+/charset/ita_asc.chs
-share/examples/golded+/charset/itl_ibm.chs
-share/examples/golded+/charset/mac_850.chs
-share/examples/golded+/charset/mac_asc.chs
-share/examples/golded+/charset/mac_ibm.chs
-share/examples/golded+/charset/mac_iso.chs
-share/examples/golded+/charset/mac_vt1.chs
-share/examples/golded+/charset/mne_850.esc
-share/examples/golded+/charset/mne_ibm.esc
-share/examples/golded+/charset/nor_asc.chs
-share/examples/golded+/charset/nor_ibm.chs
-share/examples/golded+/charset/prt_asc.chs
-share/examples/golded+/charset/prt_ibm.chs
-share/examples/golded+/charset/spn_asc.chs
-share/examples/golded+/charset/spn_ibm.chs
-share/examples/golded+/charset/swe_asc.chs
-share/examples/golded+/charset/swe_ibm.chs
-share/examples/golded+/charset/swi_asc.chs
-share/examples/golded+/charset/swi_ibm.chs
-share/examples/golded+/charset/uk__asc.chs
-share/examples/golded+/charset/uk__ibm.chs
-share/examples/golded+/colorset/gedcol00.cfg
-share/examples/golded+/colorset/gedcol01.cfg
-share/examples/golded+/colorset/gedcol02.cfg
-share/examples/golded+/colorset/gedcol03.cfg
-share/examples/golded+/colorset/gedcol04.cfg
-share/examples/golded+/colorset/gedcol05.cfg
-share/examples/golded+/colorset/gedcol06.cfg
-share/examples/golded+/colorset/gedcol07.cfg
-share/examples/golded+/colorset/gedcol08.cfg
-share/examples/golded+/colorset/gedcol09.cfg
-share/examples/golded+/colorset/gedcol10.cfg
-share/examples/golded+/colorset/gedcol11.cfg
-share/examples/golded+/colorset/gedcol12.cfg
-share/examples/golded+/colorset/gedcol13.cfg
-share/examples/golded+/colorset/gedcol14.cfg
-share/examples/golded+/colorset/gedcol15.cfg
-share/examples/golded+/colorset/gedcol16.cfg
-share/examples/golded+/colorset/gedcol17.cfg
-share/examples/golded+/colorset/gedcol18.cfg
-share/examples/golded+/colorset/gedcol19.cfg
-share/examples/golded+/colorset/gedcol20.cfg
-share/examples/golded+/colorset/gedcol21.cfg
-share/examples/golded+/colorset/gedcol22.cfg
-share/examples/golded+/colorset/gedcol23.cfg
-share/examples/golded+/colorset/gedmon00.cfg
-share/examples/golded+/colorset/gedmon01.cfg
-share/examples/golded+/colorset/gedmon02.cfg
-share/examples/golded+/config/advanced.cfg
-share/examples/golded+/config/gedlngdk.cfg
-share/examples/golded+/config/gedlngit.cfg
-share/examples/golded+/config/gedlngnl.cfg
-share/examples/golded+/config/gedlngus.cfg
-share/examples/golded+/config/goldhelp.cfg
-share/examples/golded+/config/goldkeys.cfg
-share/examples/golded+/config/goldlang.cfg
-share/examples/golded+/config/goldlang.ger
-share/examples/golded+/config/goldlang.it
-share/examples/golded+/config/goldlang.nl
-share/examples/golded+/config/goldlang.ru2
-share/examples/golded+/config/goldlang.rus
-share/examples/golded+/config/goldlang.sv
-share/examples/golded+/config/simple.cfg
-share/examples/golded+/template/dansk.tpl
-share/examples/golded+/template/default.tpl
-share/examples/golded+/template/email.tpl
-share/examples/golded+/template/golded.cfm
-share/examples/golded+/template/golded.tpl
-share/examples/golded+/template/newsgrps.tpl
-@dirrm share/examples/golded+/charset
-@dirrm share/examples/golded+/config
-@dirrm share/examples/golded+/colorset
-@dirrm share/examples/golded+/template
-@dirrm share/examples/golded+
-@dirrm share/doc/golded+
+%%PORTDOCS%%%%DOCSDIR%%/gold_ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/gold_usr.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/charset/850_850.chs
+%%EXAMPLESDIR%%/charset/850_asc.chs
+%%EXAMPLESDIR%%/charset/850_iqp.chs
+%%EXAMPLESDIR%%/charset/850_iso.chs
+%%EXAMPLESDIR%%/charset/865_iso.chs
+%%EXAMPLESDIR%%/charset/can_asc.chs
+%%EXAMPLESDIR%%/charset/can_ibm.chs
+%%EXAMPLESDIR%%/charset/cmp_ibm.esc
+%%EXAMPLESDIR%%/charset/dut_asc.chs
+%%EXAMPLESDIR%%/charset/dut_ibm.chs
+%%EXAMPLESDIR%%/charset/fin_asc.chs
+%%EXAMPLESDIR%%/charset/fin_ibm.chs
+%%EXAMPLESDIR%%/charset/frn_asc.chs
+%%EXAMPLESDIR%%/charset/frn_ibm.chs
+%%EXAMPLESDIR%%/charset/ger_asc.chs
+%%EXAMPLESDIR%%/charset/ger_ibm.chs
+%%EXAMPLESDIR%%/charset/i1m_ibm.chs
+%%EXAMPLESDIR%%/charset/i51_ibm.esc
+%%EXAMPLESDIR%%/charset/ibm_asc.chs
+%%EXAMPLESDIR%%/charset/ibm_cmp.chs
+%%EXAMPLESDIR%%/charset/ibm_i51.chs
+%%EXAMPLESDIR%%/charset/ibm_ibm.chs
+%%EXAMPLESDIR%%/charset/ibm_iqp.chs
+%%EXAMPLESDIR%%/charset/ibm_iso.chs
+%%EXAMPLESDIR%%/charset/ibm_mac.chs
+%%EXAMPLESDIR%%/charset/ibm_mne.chs
+%%EXAMPLESDIR%%/charset/ibm_swe.chs
+%%EXAMPLESDIR%%/charset/ibm_vt1.chs
+%%EXAMPLESDIR%%/charset/iqp_850.chs
+%%EXAMPLESDIR%%/charset/iqp_ibm.chs
+%%EXAMPLESDIR%%/charset/iso_850.chs
+%%EXAMPLESDIR%%/charset/iso_asc.chs
+%%EXAMPLESDIR%%/charset/iso_ibm.chs
+%%EXAMPLESDIR%%/charset/iso_iso.chs
+%%EXAMPLESDIR%%/charset/iso_mac.chs
+%%EXAMPLESDIR%%/charset/iso_vt1.chs
+%%EXAMPLESDIR%%/charset/ita_asc.chs
+%%EXAMPLESDIR%%/charset/itl_ibm.chs
+%%EXAMPLESDIR%%/charset/mac_850.chs
+%%EXAMPLESDIR%%/charset/mac_asc.chs
+%%EXAMPLESDIR%%/charset/mac_ibm.chs
+%%EXAMPLESDIR%%/charset/mac_iso.chs
+%%EXAMPLESDIR%%/charset/mac_vt1.chs
+%%EXAMPLESDIR%%/charset/mne_850.esc
+%%EXAMPLESDIR%%/charset/mne_ibm.esc
+%%EXAMPLESDIR%%/charset/nor_asc.chs
+%%EXAMPLESDIR%%/charset/nor_ibm.chs
+%%EXAMPLESDIR%%/charset/prt_asc.chs
+%%EXAMPLESDIR%%/charset/prt_ibm.chs
+%%EXAMPLESDIR%%/charset/spn_asc.chs
+%%EXAMPLESDIR%%/charset/spn_ibm.chs
+%%EXAMPLESDIR%%/charset/swe_asc.chs
+%%EXAMPLESDIR%%/charset/swe_ibm.chs
+%%EXAMPLESDIR%%/charset/swi_asc.chs
+%%EXAMPLESDIR%%/charset/swi_ibm.chs
+%%EXAMPLESDIR%%/charset/uk__asc.chs
+%%EXAMPLESDIR%%/charset/uk__ibm.chs
+%%EXAMPLESDIR%%/colorset/gedcol00.cfg
+%%EXAMPLESDIR%%/colorset/gedcol01.cfg
+%%EXAMPLESDIR%%/colorset/gedcol02.cfg
+%%EXAMPLESDIR%%/colorset/gedcol03.cfg
+%%EXAMPLESDIR%%/colorset/gedcol04.cfg
+%%EXAMPLESDIR%%/colorset/gedcol05.cfg
+%%EXAMPLESDIR%%/colorset/gedcol06.cfg
+%%EXAMPLESDIR%%/colorset/gedcol07.cfg
+%%EXAMPLESDIR%%/colorset/gedcol08.cfg
+%%EXAMPLESDIR%%/colorset/gedcol09.cfg
+%%EXAMPLESDIR%%/colorset/gedcol10.cfg
+%%EXAMPLESDIR%%/colorset/gedcol11.cfg
+%%EXAMPLESDIR%%/colorset/gedcol12.cfg
+%%EXAMPLESDIR%%/colorset/gedcol13.cfg
+%%EXAMPLESDIR%%/colorset/gedcol14.cfg
+%%EXAMPLESDIR%%/colorset/gedcol15.cfg
+%%EXAMPLESDIR%%/colorset/gedcol16.cfg
+%%EXAMPLESDIR%%/colorset/gedcol17.cfg
+%%EXAMPLESDIR%%/colorset/gedcol18.cfg
+%%EXAMPLESDIR%%/colorset/gedcol19.cfg
+%%EXAMPLESDIR%%/colorset/gedcol20.cfg
+%%EXAMPLESDIR%%/colorset/gedcol21.cfg
+%%EXAMPLESDIR%%/colorset/gedcol22.cfg
+%%EXAMPLESDIR%%/colorset/gedcol23.cfg
+%%EXAMPLESDIR%%/colorset/gedmon00.cfg
+%%EXAMPLESDIR%%/colorset/gedmon01.cfg
+%%EXAMPLESDIR%%/colorset/gedmon02.cfg
+%%EXAMPLESDIR%%/config/advanced.cfg
+%%EXAMPLESDIR%%/config/gedlngdk.cfg
+%%EXAMPLESDIR%%/config/gedlngit.cfg
+%%EXAMPLESDIR%%/config/gedlngnl.cfg
+%%EXAMPLESDIR%%/config/gedlngus.cfg
+%%EXAMPLESDIR%%/config/goldhelp.cfg
+%%EXAMPLESDIR%%/config/goldkeys.cfg
+%%EXAMPLESDIR%%/config/goldlang.cfg
+%%EXAMPLESDIR%%/config/goldlang.ger
+%%EXAMPLESDIR%%/config/goldlang.it
+%%EXAMPLESDIR%%/config/goldlang.nl
+%%EXAMPLESDIR%%/config/goldlang.ru2
+%%EXAMPLESDIR%%/config/goldlang.rus
+%%EXAMPLESDIR%%/config/goldlang.sv
+%%EXAMPLESDIR%%/config/simple.cfg
+%%EXAMPLESDIR%%/template/dansk.tpl
+%%EXAMPLESDIR%%/template/default.tpl
+%%EXAMPLESDIR%%/template/email.tpl
+%%EXAMPLESDIR%%/template/golded.cfm
+%%EXAMPLESDIR%%/template/golded.tpl
+%%EXAMPLESDIR%%/template/newsgrps.tpl
+@dirrm %%EXAMPLESDIR%%/charset
+@dirrm %%EXAMPLESDIR%%/config
+@dirrm %%EXAMPLESDIR%%/colorset
+@dirrm %%EXAMPLESDIR%%/template
+@dirrm %%EXAMPLESDIR%%