CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug  1 09:48:02 UTC 2016

Modified Files:
        pkgsrc/doc: CHANGES-2016
        pkgsrc/net: Makefile
Removed Files:
        pkgsrc/net/wireshark1: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/net/wireshark1/patches: patch-aa patch-ac patch-ba patch-bb
            patch-bc patch-ca patch-help_Makefile.in patch-ui_qt_Makefile.in

Log Message:
Remove net/wireshark1, eol'd on 2016-07-31. Use net/wireshark instead.


To generate a diff of this commit:
cvs rdiff -u -r1.3153 -r1.3154 pkgsrc/doc/CHANGES-2016
cvs rdiff -u -r1.1126 -r1.1127 pkgsrc/net/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/wireshark1/DESCR \
    pkgsrc/net/wireshark1/PLIST pkgsrc/net/wireshark1/options.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/net/wireshark1/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/net/wireshark1/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/wireshark1/patches/patch-aa \
    pkgsrc/net/wireshark1/patches/patch-ac \
    pkgsrc/net/wireshark1/patches/patch-ba \
    pkgsrc/net/wireshark1/patches/patch-bb \
    pkgsrc/net/wireshark1/patches/patch-bc \
    pkgsrc/net/wireshark1/patches/patch-ca \
    pkgsrc/net/wireshark1/patches/patch-help_Makefile.in \
    pkgsrc/net/wireshark1/patches/patch-ui_qt_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2016
diff -u pkgsrc/doc/CHANGES-2016:1.3153 pkgsrc/doc/CHANGES-2016:1.3154
--- pkgsrc/doc/CHANGES-2016:1.3153      Mon Aug  1 09:43:09 2016
+++ pkgsrc/doc/CHANGES-2016     Mon Aug  1 09:48:02 2016
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2016,v 1.3153 2016/08/01 09:43:09 wiz Exp $
+$NetBSD: CHANGES-2016,v 1.3154 2016/08/01 09:48:02 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2016:
 
@@ -4463,3 +4463,4 @@ Changes to the packages collection and i
        Updated graphics/extrema to 4.4.5 [mef 2016-08-01]
        Updated www/lighttpd to 1.4.41 [wiz 2016-08-01]
        Updated graphics/ImageMagick to 7.0.2.6 [wiz 2016-08-01]
+       Removed net/wireshark1 successor net/wireshark [wiz 2016-08-01]

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1126 pkgsrc/net/Makefile:1.1127
--- pkgsrc/net/Makefile:1.1126  Sat Jul 16 13:31:20 2016
+++ pkgsrc/net/Makefile Mon Aug  1 09:48:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1126 2016/07/16 13:31:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.1127 2016/08/01 09:48:02 wiz Exp $
 #
 
 COMMENT=       Networking tools
@@ -825,7 +825,6 @@ SUBDIR+=    whoson
 SUBDIR+=       wide-dhcpv6
 SUBDIR+=       wimon
 SUBDIR+=       wireshark
-SUBDIR+=       wireshark1
 SUBDIR+=       wistumbler
 SUBDIR+=       wistumbler2
 SUBDIR+=       wistumbler2-gtk