summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/ethereal/Makefile9
-rw-r--r--net/ethereal/distinfo2
-rw-r--r--net/ethereal/pkg-comment1
-rw-r--r--net/ethereal/pkg-plist6
-rw-r--r--net/wireshark/Makefile9
-rw-r--r--net/wireshark/distinfo2
-rw-r--r--net/wireshark/pkg-comment1
-rw-r--r--net/wireshark/pkg-plist6
8 files changed, 26 insertions, 10 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index bc6d6b6313ef..50303fbc3249 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ethereal
-PORTVERSION= 0.9.7
+PORTVERSION= 0.9.9
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
ftp://gd.tuwien.ac.at/infosys/security/ethereal/%SUBDIR%/ \
@@ -16,12 +16,15 @@ MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
MASTER_SITE_SUBDIR= . old-versions
MAINTAINER= billf@FreeBSD.org
+COMMENT= An X11/GTK network analyzer/capture tool
.if !defined(WITHOUT_SNMP)
-LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
+LIB_DEPENDS= netsnmp.5:${PORTSDIR}/net/net-snmp
.endif
USE_GNOMENG= yes
+CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
.if !defined(WITHOUT_X11)
USE_X_PREFIX= yes
USE_GNOME= gtk12
@@ -40,7 +43,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}
.if !defined(WITHOUT_SNMP)
CONFIGURE_ARGS+= --enable-snmp=yes \
- --with-ucdsnmp=${LOCALBASE}/lib
+ --with-net-snmp=${LOCALBASE}/lib
.if exists(/usr/include/openssl/crypto.h)
CONFIGURE_ARGS+= --with-ssl=/usr
.endif
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index c4b7bdfd1fdd..4d674e470d69 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1 +1 @@
-MD5 (ethereal-0.9.7.tar.gz) = c5094063c332505dd65276cf05e12c85
+MD5 (ethereal-0.9.9.tar.gz) = 711007f6ae56ded4fe1062e4f9dcdba8
diff --git a/net/ethereal/pkg-comment b/net/ethereal/pkg-comment
deleted file mode 100644
index 798083f0bf7e..000000000000
--- a/net/ethereal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/GTK network analyzer/capture tool
diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist
index 97a97e866121..28fb9247658e 100644
--- a/net/ethereal/pkg-plist
+++ b/net/ethereal/pkg-plist
@@ -22,9 +22,15 @@ lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.a
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.a
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.a
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.a
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
@dirrm etc/diameter
@dirrm lib/ethereal/plugins/%%PORTVERSION%%
@dirrm lib/ethereal/plugins
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index bc6d6b6313ef..50303fbc3249 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ethereal
-PORTVERSION= 0.9.7
+PORTVERSION= 0.9.9
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
ftp://gd.tuwien.ac.at/infosys/security/ethereal/%SUBDIR%/ \
@@ -16,12 +16,15 @@ MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/%SUBDIR%/ \
MASTER_SITE_SUBDIR= . old-versions
MAINTAINER= billf@FreeBSD.org
+COMMENT= An X11/GTK network analyzer/capture tool
.if !defined(WITHOUT_SNMP)
-LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
+LIB_DEPENDS= netsnmp.5:${PORTSDIR}/net/net-snmp
.endif
USE_GNOMENG= yes
+CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
.if !defined(WITHOUT_X11)
USE_X_PREFIX= yes
USE_GNOME= gtk12
@@ -40,7 +43,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}
.if !defined(WITHOUT_SNMP)
CONFIGURE_ARGS+= --enable-snmp=yes \
- --with-ucdsnmp=${LOCALBASE}/lib
+ --with-net-snmp=${LOCALBASE}/lib
.if exists(/usr/include/openssl/crypto.h)
CONFIGURE_ARGS+= --with-ssl=/usr
.endif
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index c4b7bdfd1fdd..4d674e470d69 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1 +1 @@
-MD5 (ethereal-0.9.7.tar.gz) = c5094063c332505dd65276cf05e12c85
+MD5 (ethereal-0.9.9.tar.gz) = 711007f6ae56ded4fe1062e4f9dcdba8
diff --git a/net/wireshark/pkg-comment b/net/wireshark/pkg-comment
deleted file mode 100644
index 798083f0bf7e..000000000000
--- a/net/wireshark/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/GTK network analyzer/capture tool
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 97a97e866121..28fb9247658e 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -22,9 +22,15 @@ lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.a
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.a
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
+lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.a
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.a
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
+lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
@dirrm etc/diameter
@dirrm lib/ethereal/plugins/%%PORTVERSION%%
@dirrm lib/ethereal/plugins