3 files changed, 41 insertions, 35 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 09e036f8cef2..19095f199656 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	gtkwave
-PORTVERSION=	2.0.0.p3
+PORTVERSION=	2.0.0.p4
 PORTEPOCH=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	watchman@ludd.luth.se
 COMMENT=	Electronic Waveform Viewer
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
@@ -28,16 +28,19 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${PREFIX}/lib/gtkwave
 
+DOCS=		doc/*.html doc/*.png doc/*.ps
+EXAMPLES=	examples/*.gz examples/*.vcd
+
 post-patch:
 	@${GREP} -lR "heapsort" ${WRKSRC}/src | ${XARGS} \
 		${REINPLACE_CMD} -e "s/heapsort/hsort/g"
 
 post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/doc ; ${INSTALL_DATA} *.png *.ps *.html ${DOCSDIR})
-	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples ; ${INSTALL_DATA} *.gz *.vcd ${EXAMPLESDIR})
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index 6122c1bd3eea..3d23f508dc4d 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1 +1 @@
-MD5 (gtkwave-2.0.0pre3.tar.gz) = 09df5138841a962cd0b4e8c3a57967f3
+MD5 (gtkwave-2.0.0pre4.tar.gz) = 49574831a039f8cf0cfceeb7886e6a97
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index d7779af461a4..9f04accbf6f3 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -1,6 +1,9 @@
 @comment $FreeBSD$
 bin/gtkwave
 bin/vcd2lxt
+lib/gtkwave/reader_hhh.a
+lib/gtkwave/reader_hhh.so
+lib/gtkwave/reader_hhh.so.0
 lib/gtkwave/reader_lxt.a
 lib/gtkwave/reader_lxt.so
 lib/gtkwave/reader_lxt.so.0
@@ -10,6 +13,7 @@ lib/gtkwave/reader_out.so.0
 lib/gtkwave/reader_vcd.a
 lib/gtkwave/reader_vcd.so
 lib/gtkwave/reader_vcd.so.0
+@dirrm lib/gtkwave
 %%PORTDOCS%%%%DOCSDIR%%/data_format.png
 %%PORTDOCS%%%%DOCSDIR%%/edit_menu.png
 %%PORTDOCS%%%%DOCSDIR%%/file_menu.png
@@ -35,33 +39,32 @@ lib/gtkwave/reader_vcd.so.0
 %%PORTDOCS%%%%DOCSDIR%%/w9.png
 %%PORTDOCS%%%%DOCSDIR%%/wps.png
 %%PORTDOCS%%%%DOCSDIR%%/zoom_submenu.png
-%%PORTDOCS%%share/examples/gtkwave/agonynan_bccom.vcd.gz
-%%PORTDOCS%%share/examples/gtkwave/pci.vcd.gz
-%%PORTDOCS%%share/examples/gtkwave/simple.vcd
-%%PORTDOCS%%share/examples/gtkwave/sram.vcd.gz
-share/gtkwave/pixmaps/add_signals.xpm
-share/gtkwave/pixmaps/insert_trace.xpm
-share/gtkwave/pixmaps/menu_16.xpm
-share/gtkwave/pixmaps/next_page.xpm
-share/gtkwave/pixmaps/prev_page.xpm
-share/gtkwave/pixmaps/stock_cut.xpm
-share/gtkwave/pixmaps/stock_first.xpm
-share/gtkwave/pixmaps/stock_last.xpm
-share/gtkwave/pixmaps/stock_left.xpm
-share/gtkwave/pixmaps/stock_open_16.xpm
-share/gtkwave/pixmaps/stock_paste.xpm
-share/gtkwave/pixmaps/stock_redo.xpm
-share/gtkwave/pixmaps/stock_redo_16.xpm
-share/gtkwave/pixmaps/stock_right.xpm
-share/gtkwave/pixmaps/stock_undo.xpm
-share/gtkwave/pixmaps/stock_zoom_1.xpm
-share/gtkwave/pixmaps/stock_zoom_fit.xpm
-share/gtkwave/pixmaps/stock_zoom_in.xpm
-share/gtkwave/pixmaps/stock_zoom_out.xpm
-share/gtkwave/pixmaps/time_16.xpm
-share/gtkwave/pixmaps/vcd_mime.xpm
-@dirrm share/gtkwave/pixmaps
-@dirrm share/gtkwave
-%%PORTDOCS%%@dirrm share/examples/gtkwave
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gtkwave
+%%EXAMPLESDIR%%/agonynan_bccom.vcd.gz
+%%EXAMPLESDIR%%/pci.vcd.gz
+%%EXAMPLESDIR%%/simple.vcd
+%%EXAMPLESDIR%%/sram.vcd.gz
+@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/pixmaps/insert_trace.xpm
+%%DATADIR%%/pixmaps/menu_16.xpm
+%%DATADIR%%/pixmaps/next_page.xpm
+%%DATADIR%%/pixmaps/prev_page.xpm
+%%DATADIR%%/pixmaps/stock_cut.xpm
+%%DATADIR%%/pixmaps/stock_first.xpm
+%%DATADIR%%/pixmaps/stock_last.xpm
+%%DATADIR%%/pixmaps/stock_left.xpm
+%%DATADIR%%/pixmaps/stock_open_16.xpm
+%%DATADIR%%/pixmaps/stock_paste.xpm
+%%DATADIR%%/pixmaps/stock_redo.xpm
+%%DATADIR%%/pixmaps/stock_redo_16.xpm
+%%DATADIR%%/pixmaps/stock_right.xpm
+%%DATADIR%%/pixmaps/stock_undo.xpm
+%%DATADIR%%/pixmaps/stock_zoom_1.xpm
+%%DATADIR%%/pixmaps/stock_zoom_fit.xpm
+%%DATADIR%%/pixmaps/stock_zoom_in.xpm
+%%DATADIR%%/pixmaps/stock_zoom_out.xpm
+%%DATADIR%%/pixmaps/time_16.xpm
+%%DATADIR%%/pixmaps/vcd_mime.xpm
+%%DATADIR%%/pixmaps/wave_alert.xpm
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%