Fix the plist target.

PR:		105454
Submitted by:	Dominic Fandrey (maintainer)

2 files changed, 88 insertions, 80 deletions

diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 49315ae1a392..4e26f99f3604 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -34,6 +34,8 @@ MANCOMPRESSED=	no
 
 PLIST_TMP=	${WRKDIR}/plist_tmp/
 
+PLIST_REPL=	${SED} "s|share/${PORTNAME}|%%DATADIR%%|1"
+
 plist: build
 	@${ECHO} "===>  Rebuilding PLIST."
 	@${TOUCH} ${PLIST}
@@ -41,13 +43,19 @@ plist: build
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
 		prefix=${PLIST_TMP} ${INSTALL_TARGET}
-	@${RM} -rf ${PLIST_TMP}/man
-	@${FIND} -d ${PLIST_TMP} -type f \
+	@${RM} -rf ${PLIST_TMP}/man ${PLIST_TMP}/info
+	@${FIND} -d ${PLIST_TMP} -not -type d \
 		| ${SED} "s|${PLIST_TMP}||1" \
-		>> ${PLIST}
-	@${FIND} -d ${PLIST_TMP}/*/* -type d \
+		| ${PLIST_REPL} >> ${PLIST}
+	@${FIND} -d ${PLIST_TMP} -type d -mindepth 2 \
 		| ${SED} "s|${PLIST_TMP}|@dirrm |1" \
-		>> ${PLIST}
+		| ${PLIST_REPL} >> ${PLIST}
 	@${RM} -rf ${PLIST_TMP}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=	doesn't link
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/cad/freehdl/pkg-plist b/cad/freehdl/pkg-plist
index cced8d0f6042..a9906640029f 100644
--- a/cad/freehdl/pkg-plist
+++ b/cad/freehdl/pkg-plist
@@ -1,26 +1,32 @@
-bin/freehdl-config
-bin/freehdl-gennodes
-bin/freehdl-libtool
-bin/freehdl-v2cc
-bin/gvhdl
-include/freehdl/FlexLexer.h
-include/freehdl/cdfggen-chunk.h
-include/freehdl/cdfggen-chunk.t
-include/freehdl/fire-chunk.h
-include/freehdl/fire-chunk.t
 include/freehdl/fire-types.h
+include/freehdl/fire-chunk.t
+include/freehdl/fire-chunk.h
+include/freehdl/tree-supp.h
 include/freehdl/fire.h
-include/freehdl/kernel-Xinfo-data-descriptor.hh
-include/freehdl/kernel-Xinfo-kind.hh
+include/freehdl/vaul-creator-base.h
+include/freehdl/vaul-dfile.h
+include/freehdl/vaul-dunit.h
+include/freehdl/vaul-dynarray.h
+include/freehdl/vaul-errors.h
+include/freehdl/vaul-lexer.h
+include/freehdl/vaul-list.h
+include/freehdl/vaul-mempool.h
+include/freehdl/vaul-parser.h
+include/freehdl/vaul-pool.h
+include/freehdl/vaul-printer.h
+include/freehdl/vaul-ref.h
+include/freehdl/vaul-types.h
+include/freehdl/vaul-util.h
+include/freehdl/vaul-chunk.t
+include/freehdl/vaul-chunk.h
+include/freehdl/vaul.h
+include/freehdl/FlexLexer.h
+include/freehdl/cdfggen-chunk.t
+include/freehdl/cdfggen-chunk.h
 include/freehdl/kernel-acl.hh
-include/freehdl/kernel-attributes.hh
 include/freehdl/kernel-classes.hh
-include/freehdl/kernel-db.hh
-include/freehdl/kernel-delayed-procedure-base.hh
 include/freehdl/kernel-driver-info.hh
-include/freehdl/kernel-dump.hh
 include/freehdl/kernel-error.hh
-include/freehdl/kernel-fhdl-stream.hh
 include/freehdl/kernel-flags.hh
 include/freehdl/kernel-global-event-queue.hh
 include/freehdl/kernel-handle-info.hh
@@ -30,80 +36,74 @@ include/freehdl/kernel-list.hh
 include/freehdl/kernel-map-list.hh
 include/freehdl/kernel-name-stack.hh
 include/freehdl/kernel-pcounter.hh
-include/freehdl/kernel-persistent-cdfg-dump.hh
-include/freehdl/kernel-persistent-dump.hh
 include/freehdl/kernel-process-base.hh
+include/freehdl/kernel.h
+include/freehdl/kernel-delayed-procedure-base.hh
 include/freehdl/kernel-reader-info.hh
-include/freehdl/kernel-register.hh
-include/freehdl/kernel-resolver-descriptor.hh
-include/freehdl/kernel-resolver-process.hh
 include/freehdl/kernel-sig-info.hh
 include/freehdl/kernel-sigacl-list.hh
-include/freehdl/kernel-signal-source-list-array.hh
-include/freehdl/kernel-source-descriptor.hh
-include/freehdl/kernel-stack-trace.hh
-include/freehdl/kernel-util.hh
 include/freehdl/kernel-wait-info.hh
 include/freehdl/kernel-winfo-item.hh
-include/freehdl/kernel.h
+include/freehdl/kernel-attributes.hh
+include/freehdl/kernel-dump.hh
+include/freehdl/kernel-util.hh
+include/freehdl/kernel-fhdl-stream.hh
+include/freehdl/kernel-register.hh
+include/freehdl/kernel-resolver-process.hh
+include/freehdl/kernel-resolver-descriptor.hh
+include/freehdl/kernel-source-descriptor.hh
+include/freehdl/kernel-signal-source-list-array.hh
+include/freehdl/std.h
+include/freehdl/kernel-persistent-dump.hh
+include/freehdl/kernel-persistent-cdfg-dump.hh
+include/freehdl/kernel-Xinfo-kind.hh
+include/freehdl/kernel-Xinfo-data-descriptor.hh
+include/freehdl/kernel-stack-trace.hh
+include/freehdl/kernel-db.hh
 include/freehdl/std-memory.hh
 include/freehdl/std-standard.hh
 include/freehdl/std-vhdl-types.hh
-include/freehdl/std.h
-include/freehdl/tree-supp.h
-include/freehdl/vaul-chunk.h
-include/freehdl/vaul-chunk.t
-include/freehdl/vaul-creator-base.h
-include/freehdl/vaul-dfile.h
-include/freehdl/vaul-dunit.h
-include/freehdl/vaul-dynarray.h
-include/freehdl/vaul-errors.h
-include/freehdl/vaul-lexer.h
-include/freehdl/vaul-list.h
-include/freehdl/vaul-mempool.h
-include/freehdl/vaul-parser.h
-include/freehdl/vaul-pool.h
-include/freehdl/vaul-printer.h
-include/freehdl/vaul-ref.h
-include/freehdl/vaul-types.h
-include/freehdl/vaul-util.h
-include/freehdl/vaul.h
-lib/freehdl/libieee.a
-lib/freehdl/libieee.la
-lib/freehdl/libieee.so
-lib/freehdl/libieee.so.0
-lib/libfreehdl-cdfggen.a
-lib/libfreehdl-cdfggen.la
-lib/libfreehdl-cdfggen.so
-lib/libfreehdl-cdfggen.so.0
-lib/libfreehdl-fire.a
-lib/libfreehdl-fire.la
-lib/libfreehdl-fire.so
+bin/freehdl-config
+bin/freehdl-gennodes
+bin/gvhdl
+bin/freehdl-v2cc
+bin/freehdl-libtool
 lib/libfreehdl-fire.so.0
-lib/libfreehdl-kernel.a
-lib/libfreehdl-kernel.la
-lib/libfreehdl-kernel.so
+lib/libfreehdl-fire.so
+lib/libfreehdl-fire.la
+lib/libfreehdl-fire.a
+lib/libfreehdl-vaul.so.0
+lib/libfreehdl-vaul.so
+lib/libfreehdl-vaul.la
+lib/libfreehdl-vaul.a
 lib/libfreehdl-kernel.so.0
-lib/libfreehdl-std.a
-lib/libfreehdl-std.la
-lib/libfreehdl-std.so
+lib/libfreehdl-kernel.so
+lib/libfreehdl-kernel.la
+lib/libfreehdl-kernel.a
 lib/libfreehdl-std.so.0
-lib/libfreehdl-vaul.a
-lib/libfreehdl-vaul.la
-lib/libfreehdl-vaul.so
-lib/libfreehdl-vaul.so.0
-%%DATADIR%%/lib/ieee/math_real.vhdl
-%%DATADIR%%/lib/ieee/numeric_bit.vhdl
-%%DATADIR%%/lib/ieee/numeric_std.vhdl
+lib/libfreehdl-std.so
+lib/libfreehdl-std.la
+lib/libfreehdl-std.a
+lib/freehdl/libieee.so.0
+lib/freehdl/libieee.so
+lib/freehdl/libieee.la
+lib/freehdl/libieee.a
+lib/libfreehdl-cdfggen.so.0
+lib/libfreehdl-cdfggen.so
+lib/libfreehdl-cdfggen.la
+lib/libfreehdl-cdfggen.a
+%%DATADIR%%/lib/std/standard.vhdl
+%%DATADIR%%/lib/std/textio.vhdl
 %%DATADIR%%/lib/ieee/std_logic_1164.vhdl
-%%DATADIR%%/lib/ieee/std_logic_arith.vhdl
+%%DATADIR%%/lib/ieee/numeric_std.vhdl
+%%DATADIR%%/lib/ieee/numeric_bit.vhdl
 %%DATADIR%%/lib/ieee/std_logic_signed.vhdl
 %%DATADIR%%/lib/ieee/std_logic_unsigned.vhdl
+%%DATADIR%%/lib/ieee/std_logic_arith.vhdl
+%%DATADIR%%/lib/ieee/math_real.vhdl
 %%DATADIR%%/lib/ieee/vital_timing.vhdl
-%%DATADIR%%/lib/std/standard.vhdl
-%%DATADIR%%/lib/std/textio.vhdl
-@dirrm lib/freehdl
 @dirrm include/freehdl
+@dirrm lib/freehdl
 @dirrm %%DATADIR%%/lib/std
 @dirrm %%DATADIR%%/lib/ieee
 @dirrm %%DATADIR%%/lib