From zeising@daemonic.se  Tue Jan 10 12:00:34 2012
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBF6B1065690
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 12:00:33 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BD7B8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 12:00:33 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 74EFC40005
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 13:00:32 +0100 (CET)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 690F240007; Tue, 10 Jan 2012 13:00:32 +0100 (CET)
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id 5B17F40005
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 13:00:31 +0100 (CET)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id B8CDF119D3D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 13:00:30 +0100 (CET)
Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [2001:470:dca9:0:1::6]) (amavisd-new, port 10025)
	with ESMTPS id ZLRs6kpjQ4JP for <FreeBSD-gnats-submit@freebsd.org>;
	Tue, 10 Jan 2012 13:00:24 +0100 (CET)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
	by mx.daemonic.se (Postfix) with ESMTPS id 4771B119D3C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 13:00:24 +0100 (CET)
Received: from vincent.daemonic.se (login.daemonic.se [IPv6:2001:470:dca9:0:1::10])
	by mail.daemonic.se (Postfix) with ESMTPS id 2DB7912B08A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jan 2012 13:00:24 +0100 (CET)
Received: (from zeising@localhost)
	by vincent.daemonic.se (8.14.5/8.14.5/Submit) id q0AC0NPg086451;
	Tue, 10 Jan 2012 13:00:23 +0100 (CET)
	(envelope-from zeising)
Message-Id: <201201101200.q0AC0NPg086451@vincent.daemonic.se>
Date: Tue, 10 Jan 2012 13:00:23 +0100 (CET)
From: Niclas Zeising <niclas.zeising@gmail.com>
Reply-To: Niclas Zeising <niclas.zeising@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] [PATCH] update to cad/gtkwave3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         163987
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] update to cad/gtkwave3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 10 12:10:11 UTC 2012
>Closed-Date:    Wed Jan 11 19:10:50 UTC 2012
>Last-Modified:  Wed Jan 11 19:20:09 UTC 2012
>Originator:     Niclas Zeising
>Release:        FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 9.0-BETA2 FreeBSD 9.0-BETA2 #0 r225368: Sat Sep 3 22:13:26 CEST 2011 root@vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64


	
>Description:
	Attached patch updated cad/gtkwave3 to the latest version. It also removes conflict with now non-existing cad/gtkwave.
>How-To-Repeat:
	
>Fix:

	

--- cad.gtkwave3.update.diff begins here ---
Index: cad/gtkwave3/Makefile
===================================================================
RCS file: /home/ncvs/ports/cad/gtkwave3/Makefile,v
retrieving revision 1.14
diff -u -d -r1.14 Makefile
--- cad/gtkwave3/Makefile	20 Nov 2011 16:33:40 -0000	1.14
+++ cad/gtkwave3/Makefile	10 Jan 2012 11:58:15 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkwave3
-PORTVERSION=	3.3.28
+PORTVERSION=	3.3.29
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
@@ -14,8 +14,6 @@
 MAINTAINER=	niclas.zeising@gmail.com
 COMMENT=	Electronic Waveform Viewer
 
-CONFLICTS=	gtkwave-[0-9]*
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
Index: cad/gtkwave3/distinfo
===================================================================
RCS file: /home/ncvs/ports/cad/gtkwave3/distinfo,v
retrieving revision 1.6
diff -u -d -r1.6 distinfo
--- cad/gtkwave3/distinfo	20 Nov 2011 16:33:40 -0000	1.6
+++ cad/gtkwave3/distinfo	10 Jan 2012 11:58:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (gtkwave-3.3.28.tar.gz) = e0b3f2091aaa5b8734b424a0a2d19cec76fcd2dd7d4aee86a883f19e46af6d78
-SIZE (gtkwave-3.3.28.tar.gz) = 3225502
+SHA256 (gtkwave-3.3.29.tar.gz) = 8319054d3ca3c8b5e909737ccba6763d76c052d9d6b564a0389aadd8c23ccc17
+SIZE (gtkwave-3.3.29.tar.gz) = 3745981
Index: cad/gtkwave3/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/cad/gtkwave3/pkg-plist,v
retrieving revision 1.3
diff -u -d -r1.3 pkg-plist
--- cad/gtkwave3/pkg-plist	11 Jan 2011 23:59:17 -0000	1.3
+++ cad/gtkwave3/pkg-plist	10 Jan 2012 11:58:15 -0000
@@ -14,13 +14,83 @@
 bin/vermin
 bin/vzt2vcd
 bin/vztminer
+share/mime/packages/x-gtkwave-extension-ae2.xml
+share/mime/packages/x-gtkwave-extension-aet.xml
+share/mime/packages/x-gtkwave-extension-evcd.xml
+share/mime/packages/x-gtkwave-extension-fst.xml
+share/mime/packages/x-gtkwave-extension-ghw.xml
+share/mime/packages/x-gtkwave-extension-gtkw.xml
+share/mime/packages/x-gtkwave-extension-lx2.xml
+share/mime/packages/x-gtkwave-extension-lxt2.xml
+share/mime/packages/x-gtkwave-extension-lxt.xml
+share/mime/packages/x-gtkwave-extension-vcd.xml
+share/mime/packages/x-gtkwave-extension-vzt.xml
+share/applications/x-gtkwave-extension-ae2.desktop
+share/applications/x-gtkwave-extension-aet.desktop
+share/applications/x-gtkwave-extension-evcd.desktop
+share/applications/x-gtkwave-extension-fst.desktop
+share/applications/x-gtkwave-extension-ghw.desktop
+share/applications/x-gtkwave-extension-gtkw.desktop
+share/applications/x-gtkwave-extension-lx2.desktop
+share/applications/x-gtkwave-extension-lxt2.desktop
+share/applications/x-gtkwave-extension-lxt.desktop
+share/applications/x-gtkwave-extension-vcd.desktop
+share/applications/x-gtkwave-extension-vzt.desktop
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gtkwave_256x256x32.png
+share/icons/gtkwave_files_256x256x32.png
+share/icons/gtkwave_savefiles_256x256x32.png
 %%DOCSDIR%%/gtkwave.odt
-%%EXAMPLESDIR%%/des.sav
+%%EXAMPLESDIR%%/des.gtkw
 %%EXAMPLESDIR%%/des.tcl
 %%EXAMPLESDIR%%/des.v
 %%EXAMPLESDIR%%/des.vzt
 %%EXAMPLESDIR%%/transaction.fst
-%%EXAMPLESDIR%%/transaction.sav
+%%EXAMPLESDIR%%/transaction.gtkw
 %%EXAMPLESDIR%%/transaction.c
+%%EXAMPLESDIR%%/.gtkwaverc
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrmtry share/applications
+@dirrmtry share/icons/gnome/16x16/mimetypes
+@dirrmtry share/icons/gnome/16x16
+@dirrmtry share/icons/gnome/32x32/mimetypes
+@dirrmtry share/icons/gnome/32x32
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrmtry share/icons/gnome
+@dirrmtry share/icons
Index: cad/gtkwave3/files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/cad/gtkwave3/files/patch-configure,v
retrieving revision 1.5
diff -u -d -r1.5 patch-configure
--- cad/gtkwave3/files/patch-configure	20 Nov 2011 16:33:40 -0000	1.5
+++ cad/gtkwave3/files/patch-configure	10 Jan 2012 11:58:15 -0000
@@ -7,15 +7,15 @@
 -PACKAGE_NAME='gtkwave'
 +PACKAGE_NAME='gtkwave3'
  PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.3.28'
- PACKAGE_STRING='gtkwave 3.3.28'
+ PACKAGE_VERSION='3.3.29'
+ PACKAGE_STRING='gtkwave 3.3.29'
 @@ -2417,7 +2417,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='gtkwave'
 + PACKAGE='gtkwave3'
-  VERSION='3.3.28'
+  VERSION='3.3.29'
  
  
 @@ -13096,6 +13096,7 @@
Index: cad/gtkwave3/files/patch-examples__Makefile.in
===================================================================
RCS file: /home/ncvs/ports/cad/gtkwave3/files/patch-examples__Makefile.in,v
retrieving revision 1.4
diff -u -d -r1.4 patch-examples__Makefile.in
--- cad/gtkwave3/files/patch-examples__Makefile.in	28 Oct 2011 20:27:36 -0000	1.4
+++ cad/gtkwave3/files/patch-examples__Makefile.in	10 Jan 2012 11:58:15 -0000
@@ -1,5 +1,5 @@
---- examples/Makefile.in.orig	2011-10-20 08:19:36.000000000 +0200
-+++ examples/Makefile.in	2011-10-28 09:59:56.000000000 +0200
+--- examples/Makefile.in.orig	2011-12-22 21:31:41.000000000 +0100
++++ examples/Makefile.in	2012-01-10 11:46:28.000000000 +0100
 @@ -16,7 +16,7 @@
  @SET_MAKE@
  
@@ -9,10 +9,10 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -194,7 +194,7 @@
+@@ -200,7 +200,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- dist_examples_DATA = des.sav des.tcl des.v des.vzt transaction.fst transaction.sav transaction.c
+ dist_examples_DATA = des.gtkw des.tcl des.v des.vzt transaction.fst transaction.gtkw transaction.c .gtkwaverc
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(pkgdatadir)/examples/@PACKAGE@
  all: all-am
--- cad.gtkwave3.update.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Tue Jan 10 22:34:48 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163987 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed Jan 11 19:10:48 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163987 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163987: commit references a PR
Date: Wed, 11 Jan 2012 19:10:24 +0000 (UTC)

 pawel       2012-01-11 19:10:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     cad/gtkwave3         Makefile distinfo pkg-plist 
     cad/gtkwave3/files   patch-configure 
                          patch-examples__Makefile.in 
   Log:
   - Update to version 3.3.29 [1]
   - Delete CONFLICTS, cad/gtkwave is no more [1]
   - Port installs icons now, use INSTALLS_ICONS
   - Use update-desktop-database to register filetype associations
   
   PR:             ports/163987 [1]
   Submitted by:   maintainer [1]
   
   Revision  Changes    Path
   1.15      +3 -4      ports/cad/gtkwave3/Makefile
   1.7       +2 -2      ports/cad/gtkwave3/distinfo
   1.6       +3 -3      ports/cad/gtkwave3/files/patch-configure
   1.5       +4 -4      ports/cad/gtkwave3/files/patch-examples__Makefile.in
   1.4       +87 -2     ports/cad/gtkwave3/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
