- Update to 9.4c

PR:		170135
Submitted by:	Ports Fury

4 files changed, 22 insertions, 33 deletions

diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 2431fdf6d412..fe4b410db81f 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dinotrace
-DISTVERSION=	9.3f
-PORTREVISION=	1
+PORTVERSION=	9.4c
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 EXTRACT_SUFX=	.tgz
@@ -19,36 +18,36 @@ OPTIONS_DEFINE=	EMACS
 OPTIONS_DEFAULT=	EMACS
 EMACS_DESC=	Install Emacs supplimentary files
 
-GNU_CONFIGURE=	yes
+USE_XORG=	x11 sm ice xmu xt
 USE_MOTIF=	yes
 USE_PERL5_BUILD=	yes
-USE_XORG=	x11 sm ice xmu xt
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 INFO=		dinotrace
-
-VERILOGEL_FILE=	${LOCALBASE}/share/verilog-mode.el/verilog-mode.el
-ELFILES=	dinotrace.el sim-log.el
-EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
-XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
+PLIST_FILES=	bin/dinotrace
 
 .include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MEMACS}
-RUN_DEPENDS+=	${VERILOGEL_FILE}:${PORTSDIR}/cad/verilog-mode.el
-PLIST_SUB+=	EMACS=""
-.else
-PLIST_SUB+=	EMACS="@comment "
+RUN_DEPENDS+=	verilog-mode.el>0:${PORTSDIR}/cad/verilog-mode.el
+USE_EMACS=	yes
+EMACS_NO_BUILD_DEPENDS=	yes
+.for F in dinotrace.el sim-log.el
+PLIST_FILES+=	${EMACS_SITE_LISPDIR}/${F}
+.endfor
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
+
 post-install:
 .if ${PORT_OPTIONS:MEMACS}
-	${MKDIR} ${DATADIR}/
-	${MKDIR} ${XEMACSLISPDIR}
-. for FILE in ${ELFILES}
-	${INSTALL_DATA} ${WRKSRC}/lisp/${FILE} ${DATADIR}/
-	${LN} -sf ${DATADIR}/${FILE} ${EMACSLISPDIR}/${FILE}
-	${LN} -sf ${DATADIR}/${FILE} ${XEMACSLISPDIR}/${FILE}
-. endfor
+	@${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}
+.for F in dinotrace.el sim-log.el
+	${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${PREFIX}/${EMACS_SITE_LISPDIR}
+.endfor
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/cad/dinotrace/distinfo b/cad/dinotrace/distinfo
index 931cdce0d17e..a8f7128f11a5 100644
--- a/cad/dinotrace/distinfo
+++ b/cad/dinotrace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dinotrace-9.3f.tgz) = ff312b240858e0544a9241be554d5bd98d1b80db68d8549107991131c1d934d9
-SIZE (dinotrace-9.3f.tgz) = 758390
+SHA256 (dinotrace-9.4c.tgz) = 039d97b50cfefb5a0b31b60e188ab068be7c8aa9cdf73c873a390ed2b7370499
+SIZE (dinotrace-9.4c.tgz) = 785793
diff --git a/cad/dinotrace/pkg-descr b/cad/dinotrace/pkg-descr
index 18007e49ecfa..d3b69784ed05 100644
--- a/cad/dinotrace/pkg-descr
+++ b/cad/dinotrace/pkg-descr
@@ -7,4 +7,4 @@ Equipment Corporation, who wrote the code and supported it through version 4.2.
 When created, it was the first graphical display tool for the simulators being
 designed at Digital.
 
-WWW: http://www.veripool.com/dinotrace/
+WWW: http://www.veripool.org/wiki/dinotrace
diff --git a/cad/dinotrace/pkg-plist b/cad/dinotrace/pkg-plist
index 222611c71ff8..e69de29bb2d1 100644
--- a/cad/dinotrace/pkg-plist
+++ b/cad/dinotrace/pkg-plist
@@ -1,10 +0,0 @@
-bin/dinotrace
-%%EMACS%%%%DATADIR%%/dinotrace.el
-%%EMACS%%%%DATADIR%%/sim-log.el
-%%EMACS%%share/emacs/site-lisp/dinotrace.el
-%%EMACS%%share/emacs/site-lisp/sim-log.el
-%%EMACS%%lib/xemacs/site-lisp/dinotrace.el
-%%EMACS%%lib/xemacs/site-lisp/sim-log.el
-%%EMACS%%@dirrmtry lib/xemacs/site-lisp
-%%EMACS%%@dirrmtry lib/xemacs
-%%EMACS%%@dirrm %%DATADIR%%