diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index a3206e761b7..360e1ab0017 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2014/07/21 22:19:06 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2014/08/10 19:23:00 sthen Exp $ COMMENT-main = graphical network protocol analyzer COMMENT-text = network protocol analyzer -WVER = 1.10.8 -REVISION = 2 +# XXX "cvs rm -f patches/patch-Makefile_in" when trees are fully unlocked + +WVER = 1.10.9 DISTNAME = wireshark-${WVER} PKGNAME-main = wireshark-${WVER} PKGNAME-text = tshark-${WVER} diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 5f25f4b7f80..e8a99d270ab 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.10.8.tar.bz2) = J9nPTwyhrENhBLfyfK+K1l9z2wntyN8HQs6WiMfTh2M= -SIZE (wireshark-1.10.8.tar.bz2) = 26715025 +SHA256 (wireshark-1.10.9.tar.bz2) = f5hdteqZ9LKFri7Oq0IycFj3ulJy0iM4FS3XnnYBRBw= +SIZE (wireshark-1.10.9.tar.bz2) = 26769965 diff --git a/net/wireshark/patches/patch-Makefile_in b/net/wireshark/patches/patch-Makefile_in index 718fffcbd70..e69de29bb2d 100644 --- a/net/wireshark/patches/patch-Makefile_in +++ b/net/wireshark/patches/patch-Makefile_in @@ -1,45 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2014/07/18 21:17:31 sthen Exp $ - -From 4b720691c45e1a803bdcc01567ac1ec52da62740 Mon Sep 17 00:00:00 2001 -From: Fabian Raetz -Date: Fri, 18 Jul 2014 13:50:05 -0700 -Subject: [PATCH] Fix install_desktop_files non-portability and add - out-of-tree support. - -Prepend $(srcdir)/ to the sources in install commands, and get rid of -the -T flag, as it's GNU coreutils install-specific; some versions of -install don't support -T at all, and FreeBSD's install has a -T flag -that takes an argument and has a completely different meaning. - ---- Makefile.in.orig Thu Jun 12 22:08:29 2014 -+++ Makefile.in Fri Jul 18 22:17:04 2014 -@@ -4205,19 +4205,24 @@ patch-bzip2: distdir - # Yes, that violate's autofoo's principle of relocatability. - # What we (probably) should do is check `pkg-config --variable=prefix gtk+-2.0` to know where - # to install this stuff... -+# -+# Do not use the -T flag to the install command, as it's not portable. -+# Some versions of install don't support a -T flag at all, and the -+# FreeBSD install command has a -T flag that takes an argument and -+# that has completely different semantics. - install_desktop_files: - mkdir -p $(DESTDIR)/usr/share/{mime/packages,applications} -- install -m 644 -T wireshark-mime-package.xml $(DESTDIR)/usr/share/mime/packages/wireshark.xml -+ install -m 644 $(srcdir)/wireshark-mime-package.xml $(DESTDIR)/usr/share/mime/packages/wireshark.xml - if test x$(DESKTOP_FILE_INSTALL) != x ; then \ -- $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)/usr/share/applications wireshark.desktop; \ -+ $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)/usr/share/applications $(srcdir)/wireshark.desktop; \ - else \ -- install -m 644 -T wireshark.desktop $(DESTDIR)/usr/share/applications/wireshark.desktop; \ -+ install -m 644 $(srcdir)/wireshark.desktop $(DESTDIR)/usr/share/applications/wireshark.desktop; \ - fi - for size in 16 24 32 48 64 128 256; \ - do \ - mkdir -p $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/{apps,mimetypes} ; \ -- install -m 644 image/wsicon$${size}.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \ -- install -m 644 -T image/WiresharkDoc-$${size}.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \ -+ install -m 644 $(srcdir)/image/wsicon$${size}.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \ -+ install -m 644 $(srcdir)/image/WiresharkDoc-$${size}.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \ - done - @echo "Don't forget to run \"update-desktop-database\" and \"update-mime-database /usr/share/mime\"" -