diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 59f0a1f77d3..5f031803f2c 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/10 23:04:45 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2013/04/18 18:10:30 bentley Exp $ COMMENT= GTK+-based electronic waveform viewer -DISTNAME= gtkwave-3.3.28 -REVISION= 0 +DISTNAME= gtkwave-3.3.45 CATEGORIES= cad HOMEPAGE= http://gtkwave.sourceforge.net/ @@ -11,19 +10,20 @@ HOMEPAGE= http://gtkwave.sourceforge.net/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= ${HOMEPAGE} +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gtkwave/} -WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo expat fontconfig +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo fontconfig WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 lzma -WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z +WANTLIB += gobject-2.0 gtk-x11-2.0 lzma +WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z MODULES= devel/gettext BUILD_DEPENDS= devel/gperf - +RUN_DEPENDS = devel/desktop-file-utils \ + misc/shared-mime-info \ + x11/gtk+2,-guic LIB_DEPENDS= archivers/bzip2 \ archivers/xz \ x11/gtk+2 diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo index a3119210f48..9a53c5dcc11 100644 --- a/cad/gtkwave/distinfo +++ b/cad/gtkwave/distinfo @@ -1,5 +1,2 @@ -MD5 (gtkwave-3.3.28.tar.gz) = OWzBXPwSgBya1q9QfuSg8Q== -RMD160 (gtkwave-3.3.28.tar.gz) = /w0qLaGLlnqm4l+67l8ImY9pK/0= -SHA1 (gtkwave-3.3.28.tar.gz) = BaUC2roFMkaK8xV23ReXGn8nYCc= -SHA256 (gtkwave-3.3.28.tar.gz) = 4LPyCRqqW4c0tCSgotGc7Hb80t19Su6GqIPxnkavbXg= -SIZE (gtkwave-3.3.28.tar.gz) = 3225502 +SHA256 (gtkwave-3.3.45.tar.gz) = qtJhm0EAkR0Fr5eiBG9sMR/i91/gNr0ZRpdNwu3Jp5E= +SIZE (gtkwave-3.3.45.tar.gz) = 3809190 diff --git a/cad/gtkwave/patches/patch-share_applications_Makefile_in b/cad/gtkwave/patches/patch-share_applications_Makefile_in new file mode 100644 index 00000000000..5fe8cebc5fd --- /dev/null +++ b/cad/gtkwave/patches/patch-share_applications_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-share_applications_Makefile_in,v 1.1 2013/04/18 18:10:30 bentley Exp $ +--- share/applications/Makefile.in.orig Fri Apr 12 17:26:53 2013 ++++ share/applications/Makefile.in Fri Apr 12 17:26:54 2013 +@@ -417,7 +417,7 @@ uninstall-am: uninstall-desktopDATA + + + @FDO_MIME_TRUE@install-data-hook: +-@FDO_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE) ++#@FDO_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE) + + @FDO_MIME_TRUE@uninstall-hook: + @FDO_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE) diff --git a/cad/gtkwave/pkg/PLIST b/cad/gtkwave/pkg/PLIST index da8a5f4d814..de14140d786 100644 --- a/cad/gtkwave/pkg/PLIST +++ b/cad/gtkwave/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/07/08 11:20:50 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.2 2013/04/18 18:10:30 bentley Exp $ @bin bin/evcd2vcd @bin bin/fst2vcd +@bin bin/fstminer @bin bin/ghwdump @bin bin/gtkwave @bin bin/lxt2miner @@ -17,6 +18,7 @@ @bin bin/vztminer @man man/man1/evcd2vcd.1 @man man/man1/fst2vcd.1 +@man man/man1/fstminer.1 @man man/man1/ghwdump.1 @man man/man1/gtkwave.1 @man man/man1/lxt2miner.1 @@ -32,13 +34,101 @@ @man man/man1/vzt2vcd.1 @man man/man1/vztminer.1 @man man/man5/gtkwaverc.5 +share/applications/gtkwave.desktop share/doc/gtkwave/ share/doc/gtkwave/gtkwave.odt share/examples/gtkwave/ -share/examples/gtkwave/des.sav +share/examples/gtkwave/des.gtkw share/examples/gtkwave/des.tcl share/examples/gtkwave/des.v share/examples/gtkwave/des.vzt +share/examples/gtkwave/gtkwaverc share/examples/gtkwave/transaction.c share/examples/gtkwave/transaction.fst -share/examples/gtkwave/transaction.sav +share/examples/gtkwave/transaction.gtkw +share/icons/gnome/ +share/icons/gnome/16x16/ +share/icons/gnome/16x16/mimetypes/ +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-lxt.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.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/16x16/mimetypes/gtkwave.png +share/icons/gnome/32x32/ +share/icons/gnome/32x32/mimetypes/ +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-lxt.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.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/32x32/mimetypes/gtkwave.png +share/icons/gnome/48x48/ +share/icons/gnome/48x48/mimetypes/ +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-lxt.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.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/gnome/48x48/mimetypes/gtkwave.png +share/icons/gtkwave_256x256x32.png +share/icons/gtkwave_files_256x256x32.png +share/icons/gtkwave_savefiles_256x256x32.png +@comment share/mime/XMLnamespaces +@comment share/mime/aliases +share/mime/application/vnd.gtkwave-ae2.xml +share/mime/application/vnd.gtkwave-aet.xml +share/mime/application/vnd.gtkwave-evcd.xml +share/mime/application/vnd.gtkwave-fst.xml +share/mime/application/vnd.gtkwave-ghw.xml +share/mime/application/vnd.gtkwave-gtkw.xml +share/mime/application/vnd.gtkwave-lx2.xml +share/mime/application/vnd.gtkwave-lxt.xml +share/mime/application/vnd.gtkwave-lxt2.xml +share/mime/application/vnd.gtkwave-vcd.xml +share/mime/application/vnd.gtkwave-vzt.xml +@comment share/mime/generic-icons +@comment share/mime/globs +@comment share/mime/globs2 +@comment share/mime/icons +@comment share/mime/magic +@comment share/mime/mime.cache +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-lxt.xml +share/mime/packages/x-gtkwave-extension-lxt2.xml +share/mime/packages/x-gtkwave-extension-vcd.xml +share/mime/packages/x-gtkwave-extension-vzt.xml +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database +@exec %D/bin/update-mime-database %D/share/mime +@unexec-delete %D/bin/update-mime-database %D/share/mime +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/gnome +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/gnome +@comment share/mime/subclasses +@comment share/mime/treemagic +@comment share/mime/types +@comment share/mime/version