11 files changed, 6 insertions, 23 deletions
diff --git a/MOVED b/MOVED
index 5cc292c3d86f..1477fefbc23a 100644
--- a/MOVED
+++ b/MOVED
@@ -3662,3 +3662,4 @@ x11-wm/e17-module-notification||2012-08-26|Has expired: Merged into x11-wm/enlig
 www/py-django12||2012-08-31|Has expired: Unsupported version
 www/p5-Xango||2012-08-31|Has expired: Removed from CPAN
 lang/spidermonkey|lang/spidermonkey17|2012-09-01|Moved to allow for addition of the 1.8 development line.
+cad/gtkwave3|cad/gtkwave|2012-09-04|There is only one version of this now
diff --git a/cad/Makefile b/cad/Makefile
index dc36e4858796..c2948fbe9f4f 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -41,7 +41,7 @@
     SUBDIR += gnucap
     SUBDIR += gplcver
     SUBDIR += gspiceui
-    SUBDIR += gtkwave3
+    SUBDIR += gtkwave
     SUBDIR += gwave
     SUBDIR += impact
     SUBDIR += irsim
diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave/Makefile
index 734bf11fafd5..82ee22b86f81 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtkwave3
-PORTVERSION=	3.3.38
+PORTNAME=	gtkwave
+PORTVERSION=	3.3.39
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
new file mode 100644
index 000000000000..3ef3d0e34a8c
--- /dev/null
+++ b/cad/gtkwave/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gtkwave-3.3.39.tar.gz) = 6f8d11f1a8052e62b94ec2ec280464c637d909d12441438f82eb2e6a950145ed
+SIZE (gtkwave-3.3.39.tar.gz) = 3799499
diff --git a/cad/gtkwave3/files/patch-Makefile.in b/cad/gtkwave/files/patch-Makefile.in
index 3f38adbd4b29..3f38adbd4b29 100644
--- a/cad/gtkwave3/files/patch-Makefile.in
+++ b/cad/gtkwave/files/patch-Makefile.in
diff --git a/cad/gtkwave3/files/patch-configure b/cad/gtkwave/files/patch-configure
index 68a2eac0b0f4..05c8c2e344bb 100644
--- a/cad/gtkwave3/files/patch-configure
+++ b/cad/gtkwave/files/patch-configure
@@ -1,23 +1,5 @@
 --- configure.orig	2012-04-19 14:52:53.532889214 +0600
 +++ configure	2012-04-19 14:52:32.373895264 +0600
-@@ -558,7 +558,7 @@
- MAKEFLAGS=
- 
- # Identity of this package.
--PACKAGE_NAME='gtkwave'
-+PACKAGE_NAME='gtkwave3'
- PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.3.38'
- PACKAGE_STRING='gtkwave 3.3.38'
-@@ -2972,7 +2972,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE='gtkwave'
-+ PACKAGE='gtkwave3'
-  VERSION='3.3.38'
- 
- 
 @@ -9212,6 +9212,7 @@
  TCLSPEC_LHS="${TCL_LIB_SPEC% *}"
  TKLSPEC_LHS="${TK_LIB_SPEC% *}"
diff --git a/cad/gtkwave3/files/patch-doc__Makefile.in b/cad/gtkwave/files/patch-doc__Makefile.in
index be411ba3b3e3..be411ba3b3e3 100644
--- a/cad/gtkwave3/files/patch-doc__Makefile.in
+++ b/cad/gtkwave/files/patch-doc__Makefile.in
diff --git a/cad/gtkwave3/files/patch-examples__Makefile.in b/cad/gtkwave/files/patch-examples__Makefile.in
index 744de76fb454..744de76fb454 100644
--- a/cad/gtkwave3/files/patch-examples__Makefile.in
+++ b/cad/gtkwave/files/patch-examples__Makefile.in
diff --git a/cad/gtkwave3/pkg-descr b/cad/gtkwave/pkg-descr
index f08efac53f38..f08efac53f38 100644
--- a/cad/gtkwave3/pkg-descr
+++ b/cad/gtkwave/pkg-descr
diff --git a/cad/gtkwave3/pkg-plist b/cad/gtkwave/pkg-plist
index 09e90e5c9b98..09e90e5c9b98 100644
--- a/cad/gtkwave3/pkg-plist
+++ b/cad/gtkwave/pkg-plist
diff --git a/cad/gtkwave3/distinfo b/cad/gtkwave3/distinfo
deleted file mode 100644
index fd5e03c073bf..000000000000
--- a/cad/gtkwave3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gtkwave-3.3.38.tar.gz) = e72792e2ea7f5107d7be4aa57918c9c9f2483ae5a92c98890f16afcc33b8094d
-SIZE (gtkwave-3.3.38.tar.gz) = 3796897