diff options
| -rw-r--r-- | MOVED | 2 | ||||
| -rw-r--r-- | net/Makefile | 4 | ||||
| -rw-r--r-- | net/gnome-netstatus/Makefile | 3 | ||||
| -rw-r--r-- | net/gnome-nettool/Makefile | 3 | ||||
| -rw-r--r-- | net/gnomenetstatus/Makefile | 36 | ||||
| -rw-r--r-- | net/gnomenetstatus/distinfo | 3 | ||||
| -rw-r--r-- | net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c | 25 | ||||
| -rw-r--r-- | net/gnomenetstatus/pkg-descr | 2 | ||||
| -rw-r--r-- | net/gnomenetstatus/pkg-plist | 185 | ||||
| -rw-r--r-- | net/gnomenettool/Makefile | 36 | ||||
| -rw-r--r-- | net/gnomenettool/distinfo | 3 | ||||
| -rw-r--r-- | net/gnomenettool/files/patch-src_info.c | 270 | ||||
| -rw-r--r-- | net/gnomenettool/files/patch-src_lookup.c | 10 | ||||
| -rw-r--r-- | net/gnomenettool/files/patch-src_netstat.c | 20 | ||||
| -rw-r--r-- | net/gnomenettool/files/patch-src_nettool.c | 37 | ||||
| -rw-r--r-- | net/gnomenettool/files/patch-src_utils.c | 20 | ||||
| -rw-r--r-- | net/gnomenettool/pkg-descr | 3 | ||||
| -rw-r--r-- | net/gnomenettool/pkg-plist | 80 | ||||
| -rw-r--r-- | x11/gnome2/Makefile | 4 |
19 files changed, 8 insertions, 738 deletions
@@ -2323,3 +2323,5 @@ palm/gnomepilot2|palm/gnome-pilot|2006-05-28|Renamed to use real vendor package palm/gnomepilot-conduits2|palm/gnome-pilot-conduits|2006-05-28|Renamed to use real vendor package name print/gnomeprint|print/gnome-print|2006-05-28|Renamed to use real vendor package name graphics/libart_lgpl2|graphics/libart_lgpl|2006-05-28|Renamed to use real vendor package name +net/gnomenetstatus|net/gnome-netstatus|2006-05-28|Renamed to use real vendor package name +net/gnomenettool|net/gnome-nettool|2006-05-28|Renamed to use real vendor package name diff --git a/net/Makefile b/net/Makefile index 9e12e4c291b1..a7008a2ee438 100644 --- a/net/Makefile +++ b/net/Makefile @@ -152,10 +152,10 @@ SUBDIR += gnetcat SUBDIR += gnoemoe SUBDIR += gnome-mud + SUBDIR += gnome-netstatus + SUBDIR += gnome-nettool SUBDIR += gnome-vnc SUBDIR += gnomemeeting - SUBDIR += gnomenetstatus - SUBDIR += gnomenettool SUBDIR += gnometelnet SUBDIR += gnosamba SUBDIR += gnu-finger diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index f757f8143c2f..79c1bf979594 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -3,10 +3,9 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ # -PORTNAME= gnomenetstatus +PORTNAME= gnome-netstatus PORTVERSION= 2.12.0 PORTREVISION= 2 CATEGORIES= net gnome diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index fc337a6c8a12..faace0d0fd5d 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,10 +3,9 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnomenettool/Makefile,v 1.23 2006/04/24 02:02:46 marcus Exp $ # -PORTNAME= gnomenettool +PORTNAME= gnome-nettool PORTVERSION= 2.14.2 PORTEPOCH= 1 CATEGORIES= net gnome diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile deleted file mode 100644 index f757f8143c2f..000000000000 --- a/net/gnomenetstatus/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: gnomenetstatus -# Date Created: 05 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ -# - -PORTNAME= gnomenetstatus -PORTVERSION= 2.12.0 -PORTREVISION= 2 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 -DISTNAME= gnome-netstatus-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME applet that shows network status - -USE_X_PREFIX= yes -INSTALLS_OMF= yes -INSTALLS_ICONS= yes -USE_BZIP2= yes -GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ - gnomedocutils -USE_GMAKE= yes -USE_GETTEXT= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -GCONF_SCHEMAS= netstatus.schemas - -.include <bsd.port.mk> diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo deleted file mode 100644 index e35e5f4c0ae4..000000000000 --- a/net/gnomenetstatus/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 -SHA256 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 14118e71b852a77b9cb8cfe290598afb4d267cac4f6606c99b16b0b2fa807dc9 -SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c deleted file mode 100644 index b674048d5ef2..000000000000 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/netstatus-sysdeps.c.orig Mon Mar 14 09:34:06 2005 -+++ src/netstatus-sysdeps.c Mon Jan 30 21:44:49 2006 -@@ -430,11 +430,11 @@ static inline char * - get_an_data (const char *iface, - int *signal_strength) - { -+ struct an_ltv_status *sts; -+ struct an_req areq; - #ifdef AN_RID_RSSI_MAP - struct an_ltv_rssi_map an_rssimap; - #endif -- struct an_req areq; -- struct an_ltv_status *sts; - int level; - char *error = NULL; - gboolean rssimap_valid = FALSE; -@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de - g_strncasecmp (iface, "wi", 2) && - g_strncasecmp (iface, "ath", 3) && - g_strncasecmp (iface, "ndis", 4) && -+ g_strncasecmp (iface, "ural", 4) && -+ g_strncasecmp (iface, "ral", 3) && - g_strncasecmp (iface, "ipw", 3) && - g_strncasecmp (iface, "iwi", 3) && - g_strncasecmp (iface, "acx", 3)) diff --git a/net/gnomenetstatus/pkg-descr b/net/gnomenetstatus/pkg-descr deleted file mode 100644 index 0848cf01ffc2..000000000000 --- a/net/gnomenetstatus/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Gnome-netstatus is a panel applet which provides information about -network interfaces. diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist deleted file mode 100644 index 266c5b3ad9be..000000000000 --- a/net/gnomenetstatus/pkg-plist +++ /dev/null @@ -1,185 +0,0 @@ -libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server -libexec/gnome-netstatus-applet -share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml -share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/C/legal.xml -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/de/legal.xml -share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/fr/legal.xml -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/it/legal.xml -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/ja/legal.xml -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/ko/legal.xml -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/sv/legal.xml -share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_CN/legal.xml -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_HK/legal.xml -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_TW/legal.xml -share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf -share/gnome/pixmaps/gnome-netstatus-tx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png -share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png -share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png -share/icons/hicolor/48x48/apps/gnome-netstatus-75-100.png -share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png -share/icons/hicolor/48x48/apps/gnome-netstatus-error.png -share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png -share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png -share/locale/ar/LC_MESSAGES/gnome-netstatus.mo -share/locale/az/LC_MESSAGES/gnome-netstatus.mo -share/locale/bg/LC_MESSAGES/gnome-netstatus.mo -share/locale/bn/LC_MESSAGES/gnome-netstatus.mo -share/locale/bs/LC_MESSAGES/gnome-netstatus.mo -share/locale/ca/LC_MESSAGES/gnome-netstatus.mo -share/locale/cs/LC_MESSAGES/gnome-netstatus.mo -share/locale/cy/LC_MESSAGES/gnome-netstatus.mo -share/locale/da/LC_MESSAGES/gnome-netstatus.mo -share/locale/de/LC_MESSAGES/gnome-netstatus.mo -share/locale/el/LC_MESSAGES/gnome-netstatus.mo -share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo -share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo -share/locale/es/LC_MESSAGES/gnome-netstatus.mo -share/locale/et/LC_MESSAGES/gnome-netstatus.mo -share/locale/eu/LC_MESSAGES/gnome-netstatus.mo -share/locale/fa/LC_MESSAGES/gnome-netstatus.mo -share/locale/fi/LC_MESSAGES/gnome-netstatus.mo -share/locale/fr/LC_MESSAGES/gnome-netstatus.mo -share/locale/ga/LC_MESSAGES/gnome-netstatus.mo -share/locale/gl/LC_MESSAGES/gnome-netstatus.mo -share/locale/gu/LC_MESSAGES/gnome-netstatus.mo -share/locale/hi/LC_MESSAGES/gnome-netstatus.mo -share/locale/hr/LC_MESSAGES/gnome-netstatus.mo -share/locale/hu/LC_MESSAGES/gnome-netstatus.mo -share/locale/id/LC_MESSAGES/gnome-netstatus.mo -share/locale/it/LC_MESSAGES/gnome-netstatus.mo -share/locale/ja/LC_MESSAGES/gnome-netstatus.mo -share/locale/ko/LC_MESSAGES/gnome-netstatus.mo -share/locale/lt/LC_MESSAGES/gnome-netstatus.mo -share/locale/mn/LC_MESSAGES/gnome-netstatus.mo -share/locale/ms/LC_MESSAGES/gnome-netstatus.mo -share/locale/nb/LC_MESSAGES/gnome-netstatus.mo -share/locale/ne/LC_MESSAGES/gnome-netstatus.mo -share/locale/nl/LC_MESSAGES/gnome-netstatus.mo -share/locale/nn/LC_MESSAGES/gnome-netstatus.mo -share/locale/no/LC_MESSAGES/gnome-netstatus.mo -share/locale/pa/LC_MESSAGES/gnome-netstatus.mo -share/locale/pl/LC_MESSAGES/gnome-netstatus.mo -share/locale/pt/LC_MESSAGES/gnome-netstatus.mo -share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo -share/locale/ro/LC_MESSAGES/gnome-netstatus.mo -share/locale/ru/LC_MESSAGES/gnome-netstatus.mo -share/locale/rw/LC_MESSAGES/gnome-netstatus.mo -share/locale/sk/LC_MESSAGES/gnome-netstatus.mo -share/locale/sq/LC_MESSAGES/gnome-netstatus.mo -share/locale/sr/LC_MESSAGES/gnome-netstatus.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo -share/locale/sv/LC_MESSAGES/gnome-netstatus.mo -share/locale/ta/LC_MESSAGES/gnome-netstatus.mo -share/locale/th/LC_MESSAGES/gnome-netstatus.mo -share/locale/tr/LC_MESSAGES/gnome-netstatus.mo -share/locale/uk/LC_MESSAGES/gnome-netstatus.mo -share/locale/vi/LC_MESSAGES/gnome-netstatus.mo -share/locale/wa/LC_MESSAGES/gnome-netstatus.mo -share/locale/xh/LC_MESSAGES/gnome-netstatus.mo -share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo -share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo -@dirrm share/gnome/omf/gnome-netstatus -@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures -@dirrm share/gnome/help/gnome-netstatus/zh_TW -@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures -@dirrm share/gnome/help/gnome-netstatus/zh_HK -@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures -@dirrm share/gnome/help/gnome-netstatus/zh_CN -@dirrm share/gnome/help/gnome-netstatus/uk -@dirrm share/gnome/help/gnome-netstatus/sv/figures -@dirrm share/gnome/help/gnome-netstatus/sv -@dirrm share/gnome/help/gnome-netstatus/ko/figures -@dirrm share/gnome/help/gnome-netstatus/ko -@dirrm share/gnome/help/gnome-netstatus/ja/figures -@dirrm share/gnome/help/gnome-netstatus/ja -@dirrm share/gnome/help/gnome-netstatus/it/figures -@dirrm share/gnome/help/gnome-netstatus/it -@dirrm share/gnome/help/gnome-netstatus/fr/figures -@dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es -@dirrm share/gnome/help/gnome-netstatus/de/figures -@dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C -@dirrm share/gnome/help/gnome-netstatus -@dirrm share/gnome/gnome-netstatus diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile deleted file mode 100644 index fc337a6c8a12..000000000000 --- a/net/gnomenettool/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: gnomenetwork -# Date Created: 03 June 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/net/gnomenettool/Makefile,v 1.23 2006/04/24 02:02:46 marcus Exp $ -# - -PORTNAME= gnomenettool -PORTVERSION= 2.14.2 -PORTEPOCH= 1 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= gnome-nettool-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME utility that provides network information statistics - -USE_X_PREFIX= yes -USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 -USE_GMAKE= yes -USE_GETTEXT= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CFLAGS+= -DHAVE_SOCKADDR_SA_LEN - -post-install: - ${MKDIR} ${PREFIX}/share/gnome/pixmaps - ${LN} -sf ${PREFIX}/share/gnome/gnome-nettool/pixmaps/gnome-nettool.png \ - ${PREFIX}/share/gnome/pixmaps/gnome-nettool.png - -.include <bsd.port.mk> diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo deleted file mode 100644 index 37c59cd66676..000000000000 --- a/net/gnomenettool/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 0efb13f0145abe46b26a00c75473a00f -SHA256 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 95f3f298598d8a038a04987d43d9e8e452948e8813a706c31389fd5e30cd1778 -SIZE (gnome2/gnome-nettool-2.14.2.tar.bz2) = 484715 diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c deleted file mode 100644 index 7faf5e433c9b..000000000000 --- a/net/gnomenettool/files/patch-src_info.c +++ /dev/null @@ -1,270 +0,0 @@ ---- src/info.c.orig Mon Apr 3 15:41:33 2006 -+++ src/info.c Sun Apr 23 21:57:39 2006 -@@ -20,6 +20,10 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - #include <glib/gprintf.h> -+#include <sys/types.h> -+#include <string.h> -+#include <errno.h> -+#include <unistd.h> - - #ifdef HAVE_CONFIG_H - # include <config.h> -@@ -38,6 +42,11 @@ - #include <sys/ioctl.h> - #include <stdlib.h> - #include <net/if.h> -+#ifdef __FreeBSD__ -+#include <sys/sysctl.h> -+#include <net/if_dl.h> -+#include <net/if_media.h> -+#endif - - #include "info.h" - #include "utils.h" -@@ -58,6 +67,7 @@ static InfoInterfaceDescription info_ifa - { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, - { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, - { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, -+ { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "tun", NULL }, - { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, - { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, - { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -128,9 +138,42 @@ info_get_interface_from_dev_name (const - { - gint i; - gchar *path; -- -+ gchar *dev_type = NULL; -+#if defined(__FreeBSD__) -+ int s; -+ struct ifmediareq ifmr; -+ -+ if ((s = socket (AF_INET, SOCK_DGRAM, 0)) > -1) { -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, dev_name, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (s, SIOCGIFMEDIA, (caddr_t) &ifmr) > -1) { -+ switch (IFM_TYPE (ifmr.ifm_active)) { -+ case IFM_ETHER: -+ dev_type = "eth"; -+ break; -+ case IFM_FDDI: -+ case IFM_TOKEN: -+#ifdef IFM_ATM -+ case IFM_ATM: -+#endif -+ dev_type = "other_type"; -+ break; -+ case IFM_IEEE80211: -+ dev_type = "wlan"; -+ break; -+ } -+ } -+ close (s); -+ } -+#endif /* defined(__FreeBSD__) */ -+ -+ if (!dev_type) -+ dev_type = (gchar *) dev_name; -+ - for (i = 0; info_iface_desc[i].name; i++) -- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) { -+ if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) { - (*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name); - if (info_iface_desc[i].pixbuf == NULL) { - path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -217,38 +260,87 @@ info_nic_update_stats (gpointer data) - gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; - */ - gchar iface[30]; /*, flags[30]; */ -- gchar rx_bytes[16], rx_pkt[10], rx_error[10], rx_drop[10], rx_fifo[10]; -- gchar frame[10], compressed[10], multicast[10]; -- gchar tx_bytes[16], tx_pkt[10], tx_error[10], tx_drop[10], tx_fifo[10]; -+ gchar rx_bytes[16], rx_pkt[10], rx_error[10]; -+ gchar tx_bytes[16], tx_pkt[10], tx_error[10]; - gchar collissions[10]; -+#if defined(__linux__) -+ gchar rx_drop[10], rx_fifo[10]; -+ gchar frame[10], compressed[10], multicast[10]; -+ gchar tx_drop[10], tx_fifo[10]; -+#elif defined(__FreeBSD__) -+ char *p; -+ gchar **tokens, **argv; -+ int i; -+ int pipe_out; -+#endif - - GIOChannel *io = NULL; - gchar *line; - gboolean title = TRUE; - const gchar *text; - gchar *text_tx_bytes, *text_rx_bytes; -- -+ - g_return_val_if_fail (info != NULL, FALSE); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); - text = info_get_nic (info); - if (!text) - return FALSE; -- -+ - #if defined(__linux__) - io = g_io_channel_new_file ("/proc/net/dev", "r", NULL); -- -+#elif defined(__FreeBSD__) -+ if (!g_shell_parse_argv ("/usr/bin/netstat -in -b -f link", NULL, &argv, NULL)) { -+ return FALSE; -+ } -+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &pipe_out, NULL, NULL)) { -+ g_strfreev (argv); -+ return FALSE; -+ } -+ -+ g_strfreev (argv); -+ -+ io = g_io_channel_unix_new (pipe_out); -+#endif /* defined(__linux__) */ -+ - while (g_io_channel_read_line (io, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { - if (title) { - title = FALSE; - g_free (line); - continue; - } -+#if defined(__linux__) - line = g_strdelimit (line, ":", ' '); - sscanf (line, "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", iface, - rx_bytes, rx_pkt, rx_error, rx_drop, rx_fifo, frame, - compressed, multicast, - tx_bytes, tx_pkt, tx_error, tx_drop, tx_fifo, collissions); -+#elif defined(__FreeBSD__) -+ tokens = (gchar **) g_malloc0 (sizeof (gchar *) * 12); -+ p = strtok (line, " \t\n"); -+ /* We only care about 11 fields for now */ -+ for (i = 0; i < 11 && p; i++, p = strtok (NULL, " \t\n")) { -+ tokens[i] = g_strdup (p); -+ } -+ -+ if (i == 0 || i < 10) { -+ g_free (line); -+ g_strfreev (tokens); -+ continue; -+ } -+ -+ g_strlcpy (iface, tokens[0], sizeof (iface)); -+ -+ g_strlcpy (collissions, tokens[--i], sizeof (collissions)); -+ g_strlcpy (tx_bytes, tokens[--i], sizeof (tx_bytes)); -+ g_strlcpy (tx_error, tokens[--i], sizeof (tx_error)); -+ g_strlcpy (tx_pkt, tokens[--i], sizeof (tx_pkt)); -+ g_strlcpy (rx_bytes, tokens[--i], sizeof (rx_bytes)); -+ g_strlcpy (rx_error, tokens[--i], sizeof (rx_error)); -+ g_strlcpy (rx_pkt, tokens[--i], sizeof (rx_pkt)); -+ -+ g_strfreev (tokens); -+#endif /* defined(__linux__) */ - - if (g_ascii_strcasecmp (iface, text) == 0) { - /* -@@ -276,7 +368,9 @@ info_nic_update_stats (gpointer data) - } - - g_io_channel_unref (io); --#endif /* defined(__linux__) */ -+#if defined(__FreeBSD__) -+ close (pipe_out); -+#endif /* defined(__FreeBSD__) */ - - return TRUE; - } -@@ -405,8 +499,20 @@ info_get_nic_information (const gchar *n - InfoIpAddr *ip; - gint flags; - mii_data_result data; -+#ifdef __FreeBSD__ -+ gint hwmib[6]; -+ size_t hwlen; -+ gchar *hwbuf; -+ guchar *hwptr; -+ struct if_msghdr *hwifm; -+ struct sockaddr_dl *hwsinptr; -+#endif - -- getifaddrs (&ifa0); -+ if (getifaddrs (&ifa0) != 0) { -+ g_warning ("getifaddrs failed: %s", g_strerror (errno)); -+ goto fail; -+ } -+ memset (&data, 0, sizeof (data)); - - for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { - if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +558,9 @@ info_get_nic_information (const gchar *n - ifc.ifc_req = (struct ifreq *) buf; - ioctl (sockfd, SIOCGIFCONF, &ifc); - -+#if defined(__linux__) - data = mii_get_basic (nic); -+#endif /* defined(__linux__) */ - - for (ptr = buf; ptr < buf + ifc.ifc_len;) { - ifr = (struct ifreq *) ptr; -@@ -483,6 +591,45 @@ info_get_nic_information (const gchar *n - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); -+#elif defined(__FreeBSD__) -+ hwmib[0] = CTL_NET; -+ hwmib[1] = AF_ROUTE; -+ hwmib[2] = 0; -+ hwmib[3] = AF_LINK; -+ hwmib[4] = NET_RT_IFLIST; -+ if ((hwmib[5] = if_nametoindex (nic)) == 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, NULL, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if ((hwbuf = g_malloc (hwlen)) == NULL) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, hwbuf, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ -+ hwifm = (struct if_msghdr *) hwbuf; -+ hwsinptr = (struct sockaddr_dl *) (hwifm + 1); -+ hwptr = (guchar *) LLADDR (hwsinptr); -+ if (*hwptr != 0 || *(hwptr + 1) != 0 || -+ *(hwptr + 2) != 0 || *(hwptr + 3) != 0 || -+ *(hwptr + 4) != 0 || *(hwptr + 5) != 0) { -+ g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x", -+ *hwptr, *(hwptr + 1), *(hwptr + 2), -+ *(hwptr + 3), *(hwptr + 4), *(hwptr + 5)); -+ } -+ else { -+ g_sprintf (dst, NOT_AVAILABLE); -+ } -+ g_free (hwbuf); -+ -+hwfail: - #else - g_sprintf (dst, NOT_AVAILABLE); - #endif /* SIOCGIFHWADDR */ -@@ -595,6 +742,8 @@ info_get_nic_information (const gchar *n - } - - freeifaddrs (ifa0); -+fail: -+ ; - } - - static gint * diff --git a/net/gnomenettool/files/patch-src_lookup.c b/net/gnomenettool/files/patch-src_lookup.c deleted file mode 100644 index 9744c13973da..000000000000 --- a/net/gnomenettool/files/patch-src_lookup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lookup.c.orig Sun Jul 3 17:47:02 2005 -+++ src/lookup.c Sun Jul 3 17:47:20 2005 -@@ -21,6 +21,7 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - #include <glib/gprintf.h> -+#include <sys/types.h> - - #include "lookup.h" - #include "utils.h" diff --git a/net/gnomenettool/files/patch-src_netstat.c b/net/gnomenettool/files/patch-src_netstat.c deleted file mode 100644 index 1eec8492793a..000000000000 --- a/net/gnomenettool/files/patch-src_netstat.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/netstat.c.orig Tue Jul 6 13:55:25 2004 -+++ src/netstat.c Fri Aug 20 15:55:40 2004 -@@ -108,12 +108,17 @@ - g_return_val_if_fail (netinfo != NULL, NULL); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { -+#ifdef __FreeBSD__ -+ /* XXX We only support ipv4 now */ -+ option = g_strdup ("-rn -f inet"); -+#else - /* Works for Solaris and Linux */ - if (netinfo_is_ipv6_enable ()) { - option = g_strdup ("-rn -A inet -A inet6"); - } else { - option = g_strdup ("-rn -A inet"); - } -+#endif - - if (netinfo->stbar_text) - g_free (netinfo->stbar_text); diff --git a/net/gnomenettool/files/patch-src_nettool.c b/net/gnomenettool/files/patch-src_nettool.c deleted file mode 100644 index 1009298e6f59..000000000000 --- a/net/gnomenettool/files/patch-src_nettool.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/nettool.c.orig Fri Apr 14 08:36:08 2006 -+++ src/nettool.c Fri May 12 15:54:15 2006 -@@ -24,6 +24,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <signal.h> - #include <errno.h> - #include <sys/wait.h> -@@ -360,6 +361,10 @@ netinfo_io_text_buffer_dialog (GIOChanne - len, NULL); - } - -+ g_free (text); -+ -+ return TRUE; -+ - } else if (status == G_IO_STATUS_AGAIN) { - char buf[1]; - -@@ -371,12 +376,13 @@ netinfo_io_text_buffer_dialog (GIOChanne - } - g_string_append_c (netinfo->command_output, buf[0]); - } -+ -+ g_free (text); -+ return TRUE; - } else if (status == G_IO_STATUS_EOF) { - } - - g_free (text); -- -- return TRUE; - } - - /* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so diff --git a/net/gnomenettool/files/patch-src_utils.c b/net/gnomenettool/files/patch-src_utils.c deleted file mode 100644 index 921c780498c1..000000000000 --- a/net/gnomenettool/files/patch-src_utils.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/utils.c.orig Fri May 6 16:10:28 2005 -+++ src/utils.c Sun Jul 3 17:48:12 2005 -@@ -24,6 +24,8 @@ - on GNOME 2.0 */ - - #include "utils.h" -+#include <stdlib.h> -+#include <limits.h> - #include <string.h> - #include <glib/gi18n.h> - -@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes) - const gchar *unit = "B"; - gchar *result; - -- sscanf (bytes, "%lld", &rx); -+ rx = strtoull (bytes, (char **)NULL, 10); - short_rx = rx * 10; - - if (rx > 1125899906842624ull) { diff --git a/net/gnomenettool/pkg-descr b/net/gnomenettool/pkg-descr deleted file mode 100644 index 5619126feab9..000000000000 --- a/net/gnomenettool/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Gnome-nettool is a utility for getting network information such as interface -statistics, and for front-ending commands like ping and traceroute. It -is very similar to the MacOS X Network Utility. diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist deleted file mode 100644 index a2b66ceaf221..000000000000 --- a/net/gnomenettool/pkg-plist +++ /dev/null @@ -1,80 +0,0 @@ -bin/gnome-nettool -share/gnome/applications/gnome-nettool.desktop -share/gnome/gnome-nettool/dialogs/gnome-nettool.glade -share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm -share/gnome/gnome-nettool/pixmaps/16_loopback.xpm -share/gnome/gnome-nettool/pixmaps/16_plip.xpm -share/gnome/gnome-nettool/pixmaps/16_ppp.xpm -share/gnome/gnome-nettool/pixmaps/gnome-nettool.png -share/gnome/gnome-nettool/pixmaps/irda-16.png -share/gnome/gnome-nettool/pixmaps/network.png -share/gnome/gnome-nettool/pixmaps/wavelan-16.png -share/gnome/pixmaps/gnome-nettool.png -share/locale/ar/LC_MESSAGES/gnome-nettool.mo -share/locale/az/LC_MESSAGES/gnome-nettool.mo -share/locale/bg/LC_MESSAGES/gnome-nettool.mo -share/locale/bn/LC_MESSAGES/gnome-nettool.mo -share/locale/br/LC_MESSAGES/gnome-nettool.mo -share/locale/bs/LC_MESSAGES/gnome-nettool.mo -share/locale/ca/LC_MESSAGES/gnome-nettool.mo -share/locale/cs/LC_MESSAGES/gnome-nettool.mo -share/locale/cy/LC_MESSAGES/gnome-nettool.mo -share/locale/da/LC_MESSAGES/gnome-nettool.mo -share/locale/de/LC_MESSAGES/gnome-nettool.mo -share/locale/dz/LC_MESSAGES/gnome-nettool.mo -share/locale/el/LC_MESSAGES/gnome-nettool.mo -share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo -share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo -share/locale/es/LC_MESSAGES/gnome-nettool.mo -share/locale/et/LC_MESSAGES/gnome-nettool.mo -share/locale/eu/LC_MESSAGES/gnome-nettool.mo -share/locale/fa/LC_MESSAGES/gnome-nettool.mo -share/locale/fi/LC_MESSAGES/gnome-nettool.mo -share/locale/fr/LC_MESSAGES/gnome-nettool.mo -share/locale/ga/LC_MESSAGES/gnome-nettool.mo -share/locale/gl/LC_MESSAGES/gnome-nettool.mo -share/locale/gu/LC_MESSAGES/gnome-nettool.mo -share/locale/he/LC_MESSAGES/gnome-nettool.mo -share/locale/hi/LC_MESSAGES/gnome-nettool.mo -share/locale/hr/LC_MESSAGES/gnome-nettool.mo -share/locale/hu/LC_MESSAGES/gnome-nettool.mo -share/locale/id/LC_MESSAGES/gnome-nettool.mo -share/locale/it/LC_MESSAGES/gnome-nettool.mo -share/locale/ja/LC_MESSAGES/gnome-nettool.mo -share/locale/ka/LC_MESSAGES/gnome-nettool.mo -share/locale/ko/LC_MESSAGES/gnome-nettool.mo -share/locale/lt/LC_MESSAGES/gnome-nettool.mo -share/locale/mk/LC_MESSAGES/gnome-nettool.mo -share/locale/ml/LC_MESSAGES/gnome-nettool.mo -share/locale/mn/LC_MESSAGES/gnome-nettool.mo -share/locale/ms/LC_MESSAGES/gnome-nettool.mo -share/locale/nb/LC_MESSAGES/gnome-nettool.mo -share/locale/ne/LC_MESSAGES/gnome-nettool.mo -share/locale/nl/LC_MESSAGES/gnome-nettool.mo -share/locale/no/LC_MESSAGES/gnome-nettool.mo -share/locale/pa/LC_MESSAGES/gnome-nettool.mo -share/locale/pl/LC_MESSAGES/gnome-nettool.mo -share/locale/pt/LC_MESSAGES/gnome-nettool.mo -share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo -share/locale/ro/LC_MESSAGES/gnome-nettool.mo -share/locale/ru/LC_MESSAGES/gnome-nettool.mo -share/locale/rw/LC_MESSAGES/gnome-nettool.mo -share/locale/sk/LC_MESSAGES/gnome-nettool.mo -share/locale/sq/LC_MESSAGES/gnome-nettool.mo -share/locale/sr/LC_MESSAGES/gnome-nettool.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo -share/locale/sv/LC_MESSAGES/gnome-nettool.mo -share/locale/ta/LC_MESSAGES/gnome-nettool.mo -share/locale/th/LC_MESSAGES/gnome-nettool.mo -share/locale/tr/LC_MESSAGES/gnome-nettool.mo -share/locale/uk/LC_MESSAGES/gnome-nettool.mo -share/locale/vi/LC_MESSAGES/gnome-nettool.mo -share/locale/wa/LC_MESSAGES/gnome-nettool.mo -share/locale/xh/LC_MESSAGES/gnome-nettool.mo -share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo -share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrm share/gnome/gnome-nettool/pixmaps -@dirrm share/gnome/gnome-nettool/dialogs -@dirrm share/gnome/gnome-nettool diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index c7147419dda6..a7150771e172 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -43,12 +43,12 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 zenity:${PORTSDIR}/x11/zenity \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ - ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ + ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ dasher:${PORTSDIR}/accessibility/dasher \ evolution-2.6:${PORTSDIR}/mail/evolution \ ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ - gnome-nettool:${PORTSDIR}/net/gnomenettool \ + gnome-nettool:${PORTSDIR}/net/gnome-nettool \ vino-session:${PORTSDIR}/net/vino \ ximian-connector-setup-2.6:${PORTSDIR}/mail/evolution-exchange \ ${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ |