summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/gaim/Makefile137
-rw-r--r--net/gaim/distinfo2
-rw-r--r--net/gaim/files/patch-configure26
-rw-r--r--net/gaim/files/patch-plugins_perl_Makefile.in10
-rw-r--r--net/gaim/files/patch-src_gtkimhtml.c22
-rw-r--r--net/gaim/files/patch-src_protocols_oscar_ft.c10
-rw-r--r--net/gaim/files/patch-src_protocols_oscar_oscar.c11
-rw-r--r--net/gaim/pkg-descr21
-rw-r--r--net/gaim/pkg-plist433
-rw-r--r--net/gnome-netstatus/Makefile31
-rw-r--r--net/gnome-netstatus/distinfo2
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-iface.c18
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c252
-rw-r--r--net/gnome-netstatus/pkg-descr2
-rw-r--r--net/gnome-netstatus/pkg-plist193
-rw-r--r--net/gnome-nettool/Makefile34
-rw-r--r--net/gnome-nettool/distinfo2
-rw-r--r--net/gnome-nettool/files/patch-src_info.c253
-rw-r--r--net/gnome-nettool/files/patch-src_netstat.c20
-rw-r--r--net/gnome-nettool/files/patch-src_nettool.c37
-rw-r--r--net/gnome-nettool/files/patch-src_utils.c11
-rw-r--r--net/gnome-nettool/pkg-descr3
-rw-r--r--net/gnome-nettool/pkg-plist70
-rw-r--r--net/gnomenetstatus/Makefile31
-rw-r--r--net/gnomenetstatus/distinfo2
-rw-r--r--net/gnomenetstatus/files/patch-src_netstatus-iface.c18
-rw-r--r--net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c252
-rw-r--r--net/gnomenetstatus/pkg-descr2
-rw-r--r--net/gnomenetstatus/pkg-plist193
-rw-r--r--net/gnomenettool/Makefile34
-rw-r--r--net/gnomenettool/distinfo2
-rw-r--r--net/gnomenettool/files/patch-src_info.c253
-rw-r--r--net/gnomenettool/files/patch-src_netstat.c20
-rw-r--r--net/gnomenettool/files/patch-src_nettool.c37
-rw-r--r--net/gnomenettool/files/patch-src_utils.c11
-rw-r--r--net/gnomenettool/pkg-descr3
-rw-r--r--net/gnomenettool/pkg-plist70
-rw-r--r--net/vino/Makefile31
-rw-r--r--net/vino/distinfo2
-rw-r--r--net/vino/files/patch-server_libvncserver_rfb_rfbproto.h12
-rw-r--r--net/vino/files/patch-server_vino-fb.c10
-rw-r--r--net/vino/pkg-descr4
-rw-r--r--net/vino/pkg-plist61
43 files changed, 0 insertions, 2648 deletions
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
deleted file mode 100644
index 5e1dec4ac..000000000
--- a/net/gaim/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# New ports collection makefile for: gaim
-# Date created: 26 Mar 1999
-# Whom: Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gaim
-PORTVERSION= 1.1.4
-PORTREVISION= 1
-CATEGORIES?= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-
-MAINTAINER?= marcus@FreeBSD.org
-COMMENT= Multi-protocol instant messaging client
-
-LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-
-CONFLICTS?= ja-gaim-[0-9]*
-
-USE_X_PREFIX= yes
-USE_GMAKE= yes
-USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack gtk20
-WANT_GNOME= yes
-USE_PERL5= yes
-USE_BZIP2= yes
-INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
-CONFIGURE_ARGS= --enable-static=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
- PTHREAD_LIB="${PTHREAD_LIBS}"
-
-MAN1= gaim.1 gaim-remote.1
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libgnutls.so) && !defined(WITHOUT_GNUTLS)
-WITH_GNUTLS= yes
-.endif
-
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
-USE_GNOME+= evolutiondataserver
-PLIST_SUB+= EVO=""
-.else
-CONFIGURE_ARGS+=--disable-gevolution
-PLIST_SUB+= EVO="@comment "
-.endif
-
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
-.else
-CONFIGURE_ARGS+= --disable-gnutls
-.endif
-
-.if defined(WITH_SILC)
-LIB_DEPENDS+= silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
-CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc
-PLIST_SUB+= SILC=""
-.else
-PLIST_SUB+= SILC="@comment "
-.endif
-
-.if !defined(WITHOUT_NSS)
-LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
-CONFIGURE_ARGS+= --with-nspr-includes=${LOCALBASE}/include/nspr \
- --with-nspr-libs=${LOCALBASE}/lib \
- --with-nss-includes=${LOCALBASE}/include/nss/nss \
- --with-nss-libs=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+= --enable-nss=no
-.endif
-
-.if ${PERL_LEVEL} < 500800
-CONFIGURE_ARGS+= --disable-perl
-PLIST_SUB+= PERL:="@comment "
-.else
-CONFIGURE_ARGS+= --with-perl-lib=site
-PLIST_SUB+= PERL:=""
-.endif
-
-.ifndef(WITHOUT_GTKSPELL)
-LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2
-.else
-CONFIGURE_ARGS+= --disable-gtkspell
-.endif
-
-.if defined(TCL_VER)
-_TCL_DVER= ${TCL_VER:S/.//}
-_TCL_VER= ${_TCL_DVER:C/(.)/\1./}
-.if ${_TCL_VER} != 8.3 && ${_TCL_VER} != 8.4
-. error Currently GAIM can only use Tcl/Tk 8.3 or 8.4
-.endif
-LIB_DEPENDS+= tk${_TCL_DVER}:${PORTSDIR}/x11-toolkits/tk${_TCL_DVER}
-CONFIGURE_ARGS+=--with-tclconfig=${LOCALBASE}/lib/tcl${_TCL_VER} \
- --with-tkconfig=${LOCALBASE}/lib/tk${_TCL_VER}
-CFLAGS+= -I${LOCALBASE}/include/tk${_TCL_VER} -I${LOCALBASE}/include/tcl${_TCL_VER}
-PLIST_SUB+= TCL:=""
-.else
-PLIST_SUB+= TCL:="@comment "
-.endif
-
-.ifndef(WITHOUT_AUDIO)
-LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao \
- audiofile.0:${PORTSDIR}/audio/libaudiofile
-.else
-CONFIGURE_ARGS+= --disable-audio
-.endif
-
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} "Gaim has the following tunable option(s):"
- @${ECHO_MSG} " WITH_SILC Build with Secure Internet Live Conferencing (SILC)"
- @${ECHO_MSG} " WITHOUT_GTKSPELL Turns off spell checking"
- @${ECHO_MSG} " WITHOUT_AUDIO Disable audio support"
- @${ECHO_MSG} " WITH_GNUTLS Enable GNUTLS encryption support"
- @${ECHO_MSG} " WITHOUT_GNUTLS Disable GNUTLS encryption support"
- @${ECHO_MSG} " WITHOUT_NSS Disable Mozilla NSS encryption support"
- @${ECHO_MSG} " TCL_VER Use Tcl/Tk (version)"
- @${ECHO_MSG} ""
-.if !defined(WITH_GNUTLS) && defined(WITHOUT_NSS)
- @${ECHO_MSG} "WARNING: In order to use MSN, you must define WITH_GNUTLS and/or WITH_NSS."
- @${ECHO_MSG} ""
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
- -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
- -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${_TCL_VER} required|g' \
- -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${_TCL_VER:E}|' \
- ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
deleted file mode 100644
index 06c0cd99c..000000000
--- a/net/gaim/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gaim-1.1.4.tar.bz2) = bef100062823ae1a10d041b022e05d9c
-SIZE (gaim-1.1.4.tar.bz2) = 5195580
diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure
deleted file mode 100644
index a21e2b844..000000000
--- a/net/gaim/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig Thu Dec 2 20:24:48 2004
-+++ configure Sun Dec 26 10:49:39 2004
-@@ -30860,3 +30860,3 @@
- if test "x$enable_gevolution" = "xyes"; then
-- evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
-+ evo_deps="libxml-2.0 libebook-1.2 libedata-book-1.2"
-
-@@ -30963,3 +30963,3 @@
- echo $ECHO_N "checking libebook version... $ECHO_C" >&6
-- LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.0`
-+ LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.2`
- LIBEBOOK_MAJOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-@@ -31908,3 +31908,3 @@
- prefix=`eval echo $prefix`
-- PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix"
-+ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=%%LOCALBASE%%"
- fi
-@@ -32685,6 +32685,6 @@
- else
-- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
- fi
- else
-- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
- fi
diff --git a/net/gaim/files/patch-plugins_perl_Makefile.in b/net/gaim/files/patch-plugins_perl_Makefile.in
deleted file mode 100644
index bb6daa393..000000000
--- a/net/gaim/files/patch-plugins_perl_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/perl/Makefile.in.orig Sun Feb 20 15:39:08 2005
-+++ plugins/perl/Makefile.in Sun Feb 20 15:40:16 2005
-@@ -680,6 +680,7 @@
- done; \
- fi
- @cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
-+ @cd common && $(perlpath) -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
-
- common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
diff --git a/net/gaim/files/patch-src_gtkimhtml.c b/net/gaim/files/patch-src_gtkimhtml.c
deleted file mode 100644
index 9430baae1..000000000
--- a/net/gaim/files/patch-src_gtkimhtml.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gtkimhtml.c.orig Sun May 30 18:17:14 2004
-+++ src/gtkimhtml.c Sun May 30 18:19:47 2004
-@@ -782,7 +782,7 @@
- if (selection_data->length >= 2 &&
- (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
- /* This is UCS-2 */
-- char *tmp;
-+ /*char *tmp;*/
- char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
- g_free(text);
- text = utf8;
-@@ -790,8 +790,8 @@
- gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n");
- return;
- }
-- tmp = g_utf8_next_char(text);
-- memmove(text, tmp, strlen(tmp) + 1);
-+ /*tmp = g_utf8_next_char(text);*/
-+ /*memmove(text, tmp, strlen(tmp) + 1);*/
- }
-
- if (!(*text) || !g_utf8_validate(text, -1, NULL)) {
diff --git a/net/gaim/files/patch-src_protocols_oscar_ft.c b/net/gaim/files/patch-src_protocols_oscar_ft.c
deleted file mode 100644
index 926db5f44..000000000
--- a/net/gaim/files/patch-src_protocols_oscar_ft.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/protocols/oscar/ft.c.orig Sat Jan 10 14:05:46 2004
-+++ src/protocols/oscar/ft.c Sat Jan 10 14:07:58 2004
-@@ -49,6 +49,7 @@
- #ifndef _WIN32
- #include <stdio.h>
- #include <netdb.h>
-+#include <limits.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <sys/utsname.h> /* for aim_odc_initiate */
diff --git a/net/gaim/files/patch-src_protocols_oscar_oscar.c b/net/gaim/files/patch-src_protocols_oscar_oscar.c
deleted file mode 100644
index 43a291b29..000000000
--- a/net/gaim/files/patch-src_protocols_oscar_oscar.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/protocols/oscar/oscar.c.orig Wed Aug 25 21:29:00 2004
-+++ src/protocols/oscar/oscar.c Thu Aug 26 21:55:32 2004
-@@ -3247,7 +3247,7 @@
- * Note: There *may* be some clients which send messages as HTML formatted -
- * they need to be special-cased somehow.
- */
-- if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0])) {
-+ if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0]) && g_strncasecmp(tmp, "<HTML>", 6)) {
- /* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
- gchar *tmp2 = gaim_escape_html(tmp);
- g_free(tmp);
diff --git a/net/gaim/pkg-descr b/net/gaim/pkg-descr
deleted file mode 100644
index d4901fdf0..000000000
--- a/net/gaim/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Gaim is a multi-protocol instant messaging client. It is compatible with AIM
-(Oscar and TOC protocols), ICQ, MSN Messenger, Yahoo, IRC, Jabber, Gadu-Gadu,
-and Zephyr networks.
-
-Gaim users can log in to multiple accounts on multiple IM networks
-simultaneously. This means that you can be chatting with friends on AOL
-Instant Messenger, talking to a friend on Yahoo Messenger, and sitting in an
-IRC channel all at the same time.
-
-Gaim supports many features of the various networks, such as file transfer
-(coming soon), away messages, typing notification, and MSN window closing
-notification. It also goes beyond that and provides many unique features. A
-few popular features are Buddy Pounces, which give the ability to notify you,
-send a message, play a sound, or run a program when a specific buddy goes away,
-signs online, or returns from idle; and plugins, consisting of text
-replacement, a buddy ticker, extended message notification, iconify on away,
-and more.
-
-(Adapted from the About Gaim page.)
-
-WWW: http://gaim.sourceforge.net/
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
deleted file mode 100644
index a654c1e38..000000000
--- a/net/gaim/pkg-plist
+++ /dev/null
@@ -1,433 +0,0 @@
-bin/gaim
-bin/gaim-remote
-include/gaim/account.h
-include/gaim/accountopt.h
-include/gaim/away.h
-include/gaim/blist.h
-include/gaim/buddyicon.h
-include/gaim/cmds.h
-include/gaim/config.h
-include/gaim/connection.h
-include/gaim/conversation.h
-include/gaim/core.h
-include/gaim/debug.h
-include/gaim/dnd-hints.h
-include/gaim/eventloop.h
-include/gaim/ft.h
-include/gaim/gaim-disclosure.h
-include/gaim/gaim.h
-include/gaim/gtkaccount.h
-include/gaim/gtkblist.h
-include/gaim/gtkcellrendererprogress.h
-include/gaim/gtkconn.h
-include/gaim/gtkconv.h
-include/gaim/gtkdebug.h
-include/gaim/gtkdialogs.h
-include/gaim/gtkeventloop.h
-include/gaim/gtkft.h
-include/gaim/gtkgaim.h
-include/gaim/gtkimhtml.h
-include/gaim/gtkimhtmltoolbar.h
-include/gaim/gtklog.h
-include/gaim/gtknotify.h
-include/gaim/gtkplugin.h
-include/gaim/gtkpluginpref.h
-include/gaim/gtkpounce.h
-include/gaim/gtkprefs.h
-include/gaim/gtkprivacy.h
-include/gaim/gtkrequest.h
-include/gaim/gtkroomlist.h
-include/gaim/gtksound.h
-include/gaim/gtksourceiter.h
-include/gaim/gtkutils.h
-include/gaim/imgstore.h
-include/gaim/internal.h
-include/gaim/log.h
-include/gaim/md5.h
-include/gaim/network.h
-include/gaim/notify.h
-include/gaim/plugin.h
-include/gaim/pluginpref.h
-include/gaim/pounce.h
-include/gaim/prefix.h
-include/gaim/prefs.h
-include/gaim/privacy.h
-include/gaim/proxy.h
-include/gaim/prpl.h
-include/gaim/remote-socket.h
-include/gaim/remote.h
-include/gaim/request.h
-include/gaim/roomlist.h
-include/gaim/server.h
-include/gaim/sha.h
-include/gaim/signals.h
-include/gaim/sound.h
-include/gaim/sslconn.h
-include/gaim/status.h
-include/gaim/stock.h
-include/gaim/stringref.h
-include/gaim/util.h
-include/gaim/value.h
-include/gaim/version.h
-include/gaim/xmlnode.h
-lib/gaim/autorecon.so
-lib/gaim/docklet.so
-lib/gaim/extplacement.so
-lib/gaim/gaim-remote.so
-lib/gaim/gestures.so
-%%EVO%%lib/gaim/gevolution.so
-lib/gaim/history.so
-lib/gaim/iconaway.so
-lib/gaim/idle.so
-lib/gaim/libgg.so
-lib/gaim/libirc.so
-lib/gaim/libjabber.so
-lib/gaim/libmsn.so
-lib/gaim/libnapster.so
-lib/gaim/libnovell.so
-lib/gaim/liboscar.so
-%%SILC%%lib/gaim/libsilcgaim.so
-lib/gaim/libyahoo.so
-lib/gaim/libzephyr.so
-lib/gaim/notify.so
-%%PERL:%%lib/gaim/perl.so
-lib/gaim/spellchk.so
-lib/gaim/relnot.so
-lib/gaim/ssl-gnutls.so
-lib/gaim/ssl-nss.so
-lib/gaim/ssl.so
-lib/gaim/statenotify.so
-%%TCL:%%lib/gaim/tcl.so
-lib/gaim/ticker.so
-lib/gaim/timestamp.so
-lib/libgaim-remote.a
-lib/libgaim-remote.so
-lib/libgaim-remote.so.0
-libdata/pkgconfig/gaim.pc
-share/gnome/applications/gaim.desktop
-share/gnome/pixmaps/gaim.png
-share/gnome/pixmaps/gaim/buttons/about_menu.png
-share/gnome/pixmaps/gaim/buttons/accounts.png
-share/gnome/pixmaps/gaim/buttons/change-bgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/change-fgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/edit.png
-share/gnome/pixmaps/gaim/buttons/insert-image-small.png
-share/gnome/pixmaps/gaim/buttons/insert-link-small.png
-share/gnome/pixmaps/gaim/buttons/insert-smiley-small.png
-share/gnome/pixmaps/gaim/buttons/pause.png
-share/gnome/pixmaps/gaim/buttons/send-im.png
-share/gnome/pixmaps/gaim/buttons/text_bigger.png
-share/gnome/pixmaps/gaim/buttons/text_normal.png
-share/gnome/pixmaps/gaim/buttons/text_smaller.png
-share/gnome/pixmaps/gaim/dialogs/gaim_auth.png
-share/gnome/pixmaps/gaim/dialogs/gaim_cool.png
-share/gnome/pixmaps/gaim/dialogs/gaim_error.png
-share/gnome/pixmaps/gaim/dialogs/gaim_info.png
-share/gnome/pixmaps/gaim/dialogs/gaim_question.png
-share/gnome/pixmaps/gaim/dialogs/gaim_warning.png
-share/gnome/pixmaps/gaim/icons/away.png
-share/gnome/pixmaps/gaim/icons/connect.png
-share/gnome/pixmaps/gaim/icons/info.png
-share/gnome/pixmaps/gaim/icons/msgpend.png
-share/gnome/pixmaps/gaim/icons/msgunread.png
-share/gnome/pixmaps/gaim/icons/offline.png
-share/gnome/pixmaps/gaim/icons/online.png
-share/gnome/pixmaps/gaim/logo.png
-share/gnome/pixmaps/gaim/smileys/default/angel.png
-share/gnome/pixmaps/gaim/smileys/default/bigsmile.png
-share/gnome/pixmaps/gaim/smileys/default/burp.png
-share/gnome/pixmaps/gaim/smileys/default/cool.png
-share/gnome/pixmaps/gaim/smileys/default/crazy.png
-share/gnome/pixmaps/gaim/smileys/default/crossedlips.png
-share/gnome/pixmaps/gaim/smileys/default/cry.png
-share/gnome/pixmaps/gaim/smileys/default/download.png
-share/gnome/pixmaps/gaim/smileys/default/embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/farted.png
-share/gnome/pixmaps/gaim/smileys/default/kiss.png
-share/gnome/pixmaps/gaim/smileys/default/luke.png
-share/gnome/pixmaps/gaim/smileys/default/moneymouth.png
-share/gnome/pixmaps/gaim/smileys/default/mrt.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angel.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angry.png
-share/gnome/pixmaps/gaim/smileys/default/msn_away.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bat.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_beer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bowl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_boy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brb.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brheart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cake.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_car.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cat.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cellphone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cigarette.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_clock.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coffee.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coins.png
-share/gnome/pixmaps/gaim/smileys/default/msn_computer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_deadflower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_devil.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dog.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dontknow.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_donttell.png
-share/gnome/pixmaps/gaim/smileys/default/msn_drink.png
-share/gnome/pixmaps/gaim/smileys/default/msn_email.png
-share/gnome/pixmaps/gaim/smileys/default/msn_embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_film.png
-share/gnome/pixmaps/gaim/smileys/default/msn_fingerscrossed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_flower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_gift.png
-share/gnome/pixmaps/gaim/smileys/default/msn_girl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_handcuffs.png
-share/gnome/pixmaps/gaim/smileys/default/msn_heart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_highfive.png
-share/gnome/pixmaps/gaim/smileys/default/msn_hot.png
-share/gnome/pixmaps/gaim/smileys/default/msn_icon.png
-share/gnome/pixmaps/gaim/smileys/default/msn_idea.png
-share/gnome/pixmaps/gaim/smileys/default/msn_island.png
-share/gnome/pixmaps/gaim/smileys/default/msn_kiss.png
-share/gnome/pixmaps/gaim/smileys/default/msn_laugh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_lightning.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_nerd.png
-share/gnome/pixmaps/gaim/smileys/default/msn_neutral.png
-share/gnome/pixmaps/gaim/smileys/default/msn_note.png
-share/gnome/pixmaps/gaim/smileys/default/msn_occ.png
-share/gnome/pixmaps/gaim/smileys/default/msn_online.png
-share/gnome/pixmaps/gaim/smileys/default/msn_ooooh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_party.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_phone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_photo.png
-share/gnome/pixmaps/gaim/smileys/default/msn_pizza.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plane.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plate.png
-share/gnome/pixmaps/gaim/smileys/default/msn_question.png
-share/gnome/pixmaps/gaim/smileys/default/msn_rainbow.png
-share/gnome/pixmaps/gaim/smileys/default/msn_run.png
-share/gnome/pixmaps/gaim/smileys/default/msn_runback.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sad.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sarcastic.png
-share/gnome/pixmaps/gaim/smileys/default/msn_secret.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sheep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sick.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleepy.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_smiley.png
-share/gnome/pixmaps/gaim/smileys/default/msn_snail.png
-share/gnome/pixmaps/gaim/smileys/default/msn_soccer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_star.png
-share/gnome/pixmaps/gaim/smileys/default/msn_stormy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sun.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sunglasses.png
-share/gnome/pixmaps/gaim/smileys/default/msn_teeth.png
-share/gnome/pixmaps/gaim/smileys/default/msn_think.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbdown.png
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbup.png
-share/gnome/pixmaps/gaim/smileys/default/msn_tongue.png
-share/gnome/pixmaps/gaim/smileys/default/msn_turtle.png
-share/gnome/pixmaps/gaim/smileys/default/msn_umbrella.png
-share/gnome/pixmaps/gaim/smileys/default/msn_weird.png
-share/gnome/pixmaps/gaim/smileys/default/msn_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_xbox.png
-share/gnome/pixmaps/gaim/smileys/default/oneeye.png
-share/gnome/pixmaps/gaim/smileys/default/sad.png
-share/gnome/pixmaps/gaim/smileys/default/scream.png
-share/gnome/pixmaps/gaim/smileys/default/smile.png
-share/gnome/pixmaps/gaim/smileys/default/theme
-share/gnome/pixmaps/gaim/smileys/default/think.png
-share/gnome/pixmaps/gaim/smileys/default/tongue.png
-share/gnome/pixmaps/gaim/smileys/default/wink.png
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angel.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_batting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_beatup.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_blush.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bye.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_chicken.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clap.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clown.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_coffee.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cowboy.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_dance.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_devil.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_doh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_drool.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flag.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flower.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ghost.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_giggle.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_glasses.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_huggs.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_idea.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_kiss.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_liar.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_loser.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_love.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_madtongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_mean.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_monkey.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_neutral.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_party.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_peace.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pig.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pray.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_question.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_rotfl.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sad.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shame.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sick.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sighing.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silent.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silly.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sleep.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_smiley.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_star.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sweating.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_talktohand.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_think.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tired.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waving.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_whistling.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worried.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worship.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_yingyang.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif
-share/gnome/pixmaps/gaim/smileys/default/yell.png
-share/gnome/pixmaps/gaim/smileys/none/theme
-share/gnome/pixmaps/gaim/status/default/activebuddy.png
-share/gnome/pixmaps/gaim/status/default/admin.png
-share/gnome/pixmaps/gaim/status/default/aim.png
-share/gnome/pixmaps/gaim/status/default/aol.png
-share/gnome/pixmaps/gaim/status/default/away.png
-share/gnome/pixmaps/gaim/status/default/blocked.png
-share/gnome/pixmaps/gaim/status/default/dnd.png
-share/gnome/pixmaps/gaim/status/default/extendedaway.png
-share/gnome/pixmaps/gaim/status/default/female.png
-share/gnome/pixmaps/gaim/status/default/founder.png
-share/gnome/pixmaps/gaim/status/default/freeforchat.png
-share/gnome/pixmaps/gaim/status/default/gadu-gadu.png
-share/gnome/pixmaps/gaim/status/default/game.png
-share/gnome/pixmaps/gaim/status/default/halfop.png
-share/gnome/pixmaps/gaim/status/default/hiptop.png
-share/gnome/pixmaps/gaim/status/default/icq.png
-share/gnome/pixmaps/gaim/status/default/ignored.png
-share/gnome/pixmaps/gaim/status/default/invisible.png
-share/gnome/pixmaps/gaim/status/default/irc.png
-share/gnome/pixmaps/gaim/status/default/jabber.png
-share/gnome/pixmaps/gaim/status/default/login.png
-share/gnome/pixmaps/gaim/status/default/logout.png
-share/gnome/pixmaps/gaim/status/default/male.png
-share/gnome/pixmaps/gaim/status/default/msn.png
-share/gnome/pixmaps/gaim/status/default/na.png
-share/gnome/pixmaps/gaim/status/default/napster.png
-share/gnome/pixmaps/gaim/status/default/notauthorized.png
-share/gnome/pixmaps/gaim/status/default/novell.png
-share/gnome/pixmaps/gaim/status/default/nr.png
-share/gnome/pixmaps/gaim/status/default/occupied.png
-share/gnome/pixmaps/gaim/status/default/offline.png
-share/gnome/pixmaps/gaim/status/default/op.png
-share/gnome/pixmaps/gaim/status/default/rendezvous.png
-share/gnome/pixmaps/gaim/status/default/secure.png
-share/gnome/pixmaps/gaim/status/default/silc.png
-share/gnome/pixmaps/gaim/status/default/trepia.png
-share/gnome/pixmaps/gaim/status/default/voice.png
-share/gnome/pixmaps/gaim/status/default/wireless.png
-share/gnome/pixmaps/gaim/status/default/yahoo.png
-share/gnome/pixmaps/gaim/status/default/zephyr.png
-share/gnome/pixmaps/gaim/tb_drag_arrow_down.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_left.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_right.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_up.xpm
-share/gnome/pixmaps/gaim/typed.png
-share/gnome/pixmaps/gaim/typing.png
-share/gnome/sounds/gaim/arrive.wav
-share/gnome/sounds/gaim/leave.wav
-share/gnome/sounds/gaim/receive.wav
-share/gnome/sounds/gaim/redalert.wav
-share/gnome/sounds/gaim/send.wav
-share/locale/am/LC_MESSAGES/gaim.mo
-share/locale/bg/LC_MESSAGES/gaim.mo
-share/locale/ca/LC_MESSAGES/gaim.mo
-share/locale/cs/LC_MESSAGES/gaim.mo
-share/locale/da/LC_MESSAGES/gaim.mo
-share/locale/de/LC_MESSAGES/gaim.mo
-share/locale/en_AU/LC_MESSAGES/gaim.mo
-share/locale/en_CA/LC_MESSAGES/gaim.mo
-share/locale/en_GB/LC_MESSAGES/gaim.mo
-share/locale/es/LC_MESSAGES/gaim.mo
-share/locale/fi/LC_MESSAGES/gaim.mo
-share/locale/fr/LC_MESSAGES/gaim.mo
-share/locale/he/LC_MESSAGES/gaim.mo
-share/locale/hi/LC_MESSAGES/gaim.mo
-share/locale/hu/LC_MESSAGES/gaim.mo
-share/locale/it/LC_MESSAGES/gaim.mo
-share/locale/ja/LC_MESSAGES/gaim.mo
-share/locale/ko/LC_MESSAGES/gaim.mo
-share/locale/lt/LC_MESSAGES/gaim.mo
-share/locale/mk/LC_MESSAGES/gaim.mo
-share/locale/my_MM/LC_MESSAGES/gaim.mo
-share/locale/nl/LC_MESSAGES/gaim.mo
-share/locale/no/LC_MESSAGES/gaim.mo
-share/locale/pl/LC_MESSAGES/gaim.mo
-share/locale/pt/LC_MESSAGES/gaim.mo
-share/locale/pt_BR/LC_MESSAGES/gaim.mo
-share/locale/ro/LC_MESSAGES/gaim.mo
-share/locale/ru/LC_MESSAGES/gaim.mo
-share/locale/sk/LC_MESSAGES/gaim.mo
-share/locale/sl/LC_MESSAGES/gaim.mo
-share/locale/sq/LC_MESSAGES/gaim.mo
-share/locale/sr/LC_MESSAGES/gaim.mo
-share/locale/sr@Latn/LC_MESSAGES/gaim.mo
-share/locale/sv/LC_MESSAGES/gaim.mo
-share/locale/tr/LC_MESSAGES/gaim.mo
-share/locale/uk/LC_MESSAGES/gaim.mo
-share/locale/vi/LC_MESSAGES/gaim.mo
-share/locale/zh_CN/LC_MESSAGES/gaim.mo
-share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@unexec /bin/rmdir %D/share/locale/my_MM/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/my_MM 2>/dev/null || /usr/bin/true
-@dirrm share/gnome/sounds/gaim
-@dirrm share/gnome/pixmaps/gaim/status/default
-@dirrm share/gnome/pixmaps/gaim/status
-@dirrm share/gnome/pixmaps/gaim/smileys/none
-@dirrm share/gnome/pixmaps/gaim/smileys/default
-@dirrm share/gnome/pixmaps/gaim/smileys
-@dirrm share/gnome/pixmaps/gaim/icons
-@dirrm share/gnome/pixmaps/gaim/dialogs
-@dirrm share/gnome/pixmaps/gaim/buttons
-@dirrm share/gnome/pixmaps/gaim
-@dirrm lib/gaim
-@dirrm include/gaim
-%%PERL:%%@cwd %%LOCALBASE%%
-%%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
deleted file mode 100644
index 169dbc318..000000000
--- a/net/gnome-netstatus/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: gnomenetstatus
-# Date Created: 05 December 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnomenetstatus
-PORTVERSION= 2.10.0
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10
-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
-USE_BZIP2= yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2
-USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS= netstatus.schemas
-
-.include <bsd.port.mk>
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
deleted file mode 100644
index 48e9fbf2c..000000000
--- a/net/gnome-netstatus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8
-SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
deleted file mode 100644
index 64c9ad52f..000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004
-+++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004
-@@ -33,6 +33,7 @@
-
- #include <libgnome/gnome-i18n.h>
-
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
-@@ -41,6 +42,7 @@
- #include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <unistd.h>
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
deleted file mode 100644
index 03e1d89c1..000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,252 +0,0 @@
---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004
-+++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005
-@@ -35,6 +35,16 @@
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/ioctl.h>
-+#include <net/if.h>
-+#include <net/if_var.h>
-+#include <dev/an/if_aironet_ieee.h>
-+#include <dev/wi/if_wavelan_ieee.h>
-+#endif
-+
- static inline gboolean
- parse_stats (char *buf,
- int prx_idx,
-@@ -384,6 +394,173 @@
- }
- }
-
-+static inline gboolean
-+wireless_getval (const char *iface,
-+ gpointer req,
-+ unsigned long req_type,
-+ char **error)
-+{
-+ struct ifreq ifr;
-+ int s;
-+
-+ memset (&ifr, 0, sizeof (ifr));
-+
-+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name));
-+ ifr.ifr_data = (caddr_t) req;
-+
-+ s = socket (AF_INET, SOCK_DGRAM, 0);
-+
-+ if (s == -1)
-+ {
-+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface);
-+ return FALSE;
-+ }
-+
-+ if (ioctl (s, req_type, &ifr) == -1)
-+ {
-+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface);
-+ close (s);
-+ return FALSE;
-+ }
-+
-+ close (s);
-+ return TRUE;
-+}
-+
-+static inline char*
-+get_an_data (const char *iface,
-+ int *signal_strength)
-+{
-+ struct an_req areq;
-+ struct an_ltv_status *sts;
-+#ifdef AN_RID_RSSI_MAP
-+ struct an_ltv_rssi_map an_rssimap;
-+#endif
-+ int level;
-+ char *error = NULL;
-+ gboolean rssimap_valid = FALSE;
-+
-+#ifdef AN_RID_RSSI_MAP
-+ an_rssimap.an_len = sizeof (an_rssimap);
-+ an_rssimap.an_type = AN_RID_RSSI_MAP;
-+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error);
-+#endif
-+
-+ areq.an_len = sizeof (areq);
-+ areq.an_type = AN_RID_STATUS;
-+
-+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error))
-+ return error;
-+
-+ sts = (struct an_ltv_status *)&areq;
-+#ifdef AN_RID_RSSI_MAP
-+ if (rssimap_valid)
-+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct);
-+ else
-+ level = (int) (sts->an_normalized_strength);
-+#else
-+ level = (int) (sts->an_normalized_rssi);
-+#endif
-+ memcpy (signal_strength, &level, sizeof (signal_strength));
-+
-+ return error;
-+}
-+
-+static inline char*
-+get_wi_data (const char *iface,
-+ int *signal_strength)
-+{
-+ struct wi_req wreq;
-+ int level;
-+ char *error = NULL;
-+
-+ memset (&wreq, 0, sizeof (wreq));
-+
-+ wreq.wi_len = WI_MAX_DATALEN;
-+ wreq.wi_type = WI_RID_COMMS_QUALITY;
-+
-+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
-+ return error;
-+
-+ level = (int) (wreq.wi_val[1]);
-+
-+#ifdef WI_RID_READ_APS
-+ if (signal_strength <= 0)
-+ {
-+ /* we fail to get signal strength by usual means, try another way */
-+ static time_t last_scan;
-+ static long int cached;
-+ time_t now = time (NULL);
-+
-+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */
-+ if (now > last_scan + 5)
-+ {
-+ struct wi_apinfo *w;
-+ int nstations;
-+
-+ bzero ((char *)&wreq, sizeof(wreq));
-+ wreq.wi_len = WI_MAX_DATALEN;
-+ wreq.wi_type = WI_RID_READ_APS;
-+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
-+ return error;
-+ nstations = *(int *)wreq.wi_val;
-+ if (nstations > 0)
-+ {
-+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
-+ signal_strength = (long int)w->signal;
-+ }
-+
-+ cached = signal_strength;
-+ last_scan = now;
-+ }
-+ else
-+ {
-+ signal_strength = cached;
-+ }
-+ }
-+#endif
-+
-+ memcpy (signal_strength, &level, sizeof (signal_strength));
-+
-+ return error;
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_wireless_details (const char *iface,
-+ gboolean *is_wireless,
-+ int *signal_strength)
-+{
-+ char *error_message = NULL;
-+
-+ g_return_val_if_fail (iface != NULL, NULL);
-+ g_return_val_if_fail (is_wireless != NULL, NULL);
-+ g_return_val_if_fail (signal_strength != NULL, NULL);
-+
-+ if (is_wireless)
-+ *is_wireless = FALSE;
-+ if (signal_strength)
-+ *signal_strength = 0;
-+
-+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) &&
-+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) &&
-+ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) &&
-+ g_strncasecmp (iface, "acx", 3))
-+ return error_message;
-+
-+ if (g_strncasecmp (iface, "an", 2) == 0)
-+ {
-+ error_message = get_an_data (iface, signal_strength);
-+ *is_wireless = TRUE;
-+ }
-+ else
-+ {
-+ error_message = get_wi_data (iface, signal_strength);
-+ *is_wireless = TRUE;
-+ }
-+
-+ return error_message;
-+}
-+
- char *
- netstatus_sysdeps_read_iface_statistics (const char *iface,
- gulong *in_packets,
-@@ -413,11 +590,11 @@
- if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
- {
- error_message = g_strdup_printf (_("Could not parse command line '%s': %s"),
-- command_line,
-- error->message);
-+ command_line,
-+ error->message);
- g_error_free (error);
- g_free (command_line);
--
-+
- return error_message;
- }
- g_free (command_line);
-@@ -456,8 +633,8 @@
- g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-
- if (!parse_stats (buf,
-- prx_idx, ptx_idx, in_packets, out_packets,
-- brx_idx, btx_idx, in_bytes, out_bytes))
-+ prx_idx, ptx_idx, in_packets, out_packets,
-+ brx_idx, btx_idx, in_bytes, out_bytes))
- {
- error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
- "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-@@ -477,7 +654,7 @@
- }
- else
- {
-- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
-+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
- iface, error->message);
- g_error_free (error);
- }
-@@ -485,23 +662,6 @@
- g_strfreev (argv);
-
- return error_message;
--}
--
--char *
--netstatus_sysdeps_read_iface_wireless_details (const char *iface,
-- gboolean *is_wireless,
-- int *signal_strength)
--{
-- g_return_val_if_fail (iface != NULL, NULL);
-- g_return_val_if_fail (is_wireless != NULL, NULL);
-- g_return_val_if_fail (signal_strength_wireless != NULL, NULL);
--
-- if (is_wireless)
-- *is_wireless = FALSE;
-- if (signal_strength)
-- *signal_strength = 0;
--
-- return NULL;
- }
-
- #endif /* !defined(__FreeBSD__) */
diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr
deleted file mode 100644
index 0848cf01f..000000000
--- a/net/gnome-netstatus/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Gnome-netstatus is a panel applet which provides information about
-network interfaces.
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
deleted file mode 100644
index bf881c64c..000000000
--- a/net/gnome-netstatus/pkg-plist
+++ /dev/null
@@ -1,193 +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/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
-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/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/es/legal.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/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-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/eu/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/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/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/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/figures
-@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/figures
-@dirrm share/gnome/help/gnome-netstatus/C
-@dirrm share/gnome/help/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
deleted file mode 100644
index 354f8005f..000000000
--- a/net/gnome-nettool/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for: gnomenetwork
-# Date Created: 03 June 2003
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnomenettool
-PORTVERSION= 1.2.0
-PORTEPOCH= 1
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2
-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 libgnomeui
-USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-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/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
deleted file mode 100644
index 9606b0ac5..000000000
--- a/net/gnome-nettool/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a
-SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
deleted file mode 100644
index 2d95d2620..000000000
--- a/net/gnome-nettool/files/patch-src_info.c
+++ /dev/null
@@ -1,253 +0,0 @@
---- src/info.c.orig Tue Feb 1 06:05:58 2005
-+++ src/info.c Thu Mar 3 23:39:57 2005
-@@ -20,6 +20,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-+#include <sys/types.h>
-
- #ifdef HAVE_CONFIG_H
- # include <config.h>
-@@ -38,6 +39,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 +64,7 @@
- { 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 +135,42 @@
- {
- 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 +257,87 @@
- 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 +365,9 @@
- }
-
- g_io_channel_unref (io);
--#endif /* defined(__linux__) */
-+#if defined(__FreeBSD__)
-+ close (pipe_out);
-+#endif /* defined(__FreeBSD__) */
-
- return TRUE;
- }
-@@ -405,8 +496,16 @@
- InfoIpAddr *ip;
- gint flags;
- mii_data_result data;
-+#ifdef __FreeBSD__
-+ gint hwmib[6], hwlen;
-+ gchar *hwbuf;
-+ guchar *hwptr;
-+ struct if_msghdr *hwifm;
-+ struct sockaddr_dl *hwsinptr;
-+#endif
-
- getifaddrs (&ifa0);
-+ memset (&data, 0, sizeof (data));
-
- for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
- if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -452,7 +551,9 @@
- 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 +584,45 @@
- (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 */
diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c
deleted file mode 100644
index 1eec84927..000000000
--- a/net/gnome-nettool/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/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
deleted file mode 100644
index cae4f648f..000000000
--- a/net/gnome-nettool/files/patch-src_nettool.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/nettool.c.orig Fri Jan 7 23:13:56 2005
-+++ src/nettool.c Mon Jan 24 21:03:48 2005
-@@ -22,6 +22,7 @@
- #include <glib/gi18n.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-@@ -357,6 +358,10 @@
- len, NULL);
- }
-
-+ g_free (text);
-+
-+ return TRUE;
-+
- } else if (status == G_IO_STATUS_AGAIN) {
- char buf[1];
-
-@@ -368,12 +373,13 @@
- }
- 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/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c
deleted file mode 100644
index 0c8111ade..000000000
--- a/net/gnome-nettool/files/patch-src_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils.c.orig Sun Jul 4 20:11:49 2004
-+++ src/utils.c Sun Jul 4 20:12:14 2004
-@@ -240,7 +240,7 @@
- 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/gnome-nettool/pkg-descr b/net/gnome-nettool/pkg-descr
deleted file mode 100644
index 5619126fe..000000000
--- a/net/gnome-nettool/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/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
deleted file mode 100644
index b1f5ab614..000000000
--- a/net/gnome-nettool/pkg-plist
+++ /dev/null
@@ -1,70 +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/bs/LC_MESSAGES/gnome-nettool.mo
-share/locale/ca/LC_MESSAGES/gnome-nettool.mo
-share/locale/cs/LC_MESSAGES/gnome-nettool.mo
-share/locale/da/LC_MESSAGES/gnome-nettool.mo
-share/locale/de/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/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/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/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/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/zh_CN/LC_MESSAGES/gnome-nettool.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@dirrm share/gnome/gnome-nettool/pixmaps
-@dirrm share/gnome/gnome-nettool/dialogs
-@dirrm share/gnome/gnome-nettool
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
deleted file mode 100644
index 169dbc318..000000000
--- a/net/gnomenetstatus/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: gnomenetstatus
-# Date Created: 05 December 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnomenetstatus
-PORTVERSION= 2.10.0
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10
-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
-USE_BZIP2= yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2
-USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-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 48e9fbf2c..000000000
--- a/net/gnomenetstatus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8
-SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
deleted file mode 100644
index 64c9ad52f..000000000
--- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004
-+++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004
-@@ -33,6 +33,7 @@
-
- #include <libgnome/gnome-i18n.h>
-
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
-@@ -41,6 +42,7 @@
- #include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <unistd.h>
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 03e1d89c1..000000000
--- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,252 +0,0 @@
---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004
-+++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005
-@@ -35,6 +35,16 @@
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/ioctl.h>
-+#include <net/if.h>
-+#include <net/if_var.h>
-+#include <dev/an/if_aironet_ieee.h>
-+#include <dev/wi/if_wavelan_ieee.h>
-+#endif
-+
- static inline gboolean
- parse_stats (char *buf,
- int prx_idx,
-@@ -384,6 +394,173 @@
- }
- }
-
-+static inline gboolean
-+wireless_getval (const char *iface,
-+ gpointer req,
-+ unsigned long req_type,
-+ char **error)
-+{
-+ struct ifreq ifr;
-+ int s;
-+
-+ memset (&ifr, 0, sizeof (ifr));
-+
-+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name));
-+ ifr.ifr_data = (caddr_t) req;
-+
-+ s = socket (AF_INET, SOCK_DGRAM, 0);
-+
-+ if (s == -1)
-+ {
-+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface);
-+ return FALSE;
-+ }
-+
-+ if (ioctl (s, req_type, &ifr) == -1)
-+ {
-+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface);
-+ close (s);
-+ return FALSE;
-+ }
-+
-+ close (s);
-+ return TRUE;
-+}
-+
-+static inline char*
-+get_an_data (const char *iface,
-+ int *signal_strength)
-+{
-+ struct an_req areq;
-+ struct an_ltv_status *sts;
-+#ifdef AN_RID_RSSI_MAP
-+ struct an_ltv_rssi_map an_rssimap;
-+#endif
-+ int level;
-+ char *error = NULL;
-+ gboolean rssimap_valid = FALSE;
-+
-+#ifdef AN_RID_RSSI_MAP
-+ an_rssimap.an_len = sizeof (an_rssimap);
-+ an_rssimap.an_type = AN_RID_RSSI_MAP;
-+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error);
-+#endif
-+
-+ areq.an_len = sizeof (areq);
-+ areq.an_type = AN_RID_STATUS;
-+
-+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error))
-+ return error;
-+
-+ sts = (struct an_ltv_status *)&areq;
-+#ifdef AN_RID_RSSI_MAP
-+ if (rssimap_valid)
-+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct);
-+ else
-+ level = (int) (sts->an_normalized_strength);
-+#else
-+ level = (int) (sts->an_normalized_rssi);
-+#endif
-+ memcpy (signal_strength, &level, sizeof (signal_strength));
-+
-+ return error;
-+}
-+
-+static inline char*
-+get_wi_data (const char *iface,
-+ int *signal_strength)
-+{
-+ struct wi_req wreq;
-+ int level;
-+ char *error = NULL;
-+
-+ memset (&wreq, 0, sizeof (wreq));
-+
-+ wreq.wi_len = WI_MAX_DATALEN;
-+ wreq.wi_type = WI_RID_COMMS_QUALITY;
-+
-+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
-+ return error;
-+
-+ level = (int) (wreq.wi_val[1]);
-+
-+#ifdef WI_RID_READ_APS
-+ if (signal_strength <= 0)
-+ {
-+ /* we fail to get signal strength by usual means, try another way */
-+ static time_t last_scan;
-+ static long int cached;
-+ time_t now = time (NULL);
-+
-+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */
-+ if (now > last_scan + 5)
-+ {
-+ struct wi_apinfo *w;
-+ int nstations;
-+
-+ bzero ((char *)&wreq, sizeof(wreq));
-+ wreq.wi_len = WI_MAX_DATALEN;
-+ wreq.wi_type = WI_RID_READ_APS;
-+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
-+ return error;
-+ nstations = *(int *)wreq.wi_val;
-+ if (nstations > 0)
-+ {
-+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
-+ signal_strength = (long int)w->signal;
-+ }
-+
-+ cached = signal_strength;
-+ last_scan = now;
-+ }
-+ else
-+ {
-+ signal_strength = cached;
-+ }
-+ }
-+#endif
-+
-+ memcpy (signal_strength, &level, sizeof (signal_strength));
-+
-+ return error;
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_wireless_details (const char *iface,
-+ gboolean *is_wireless,
-+ int *signal_strength)
-+{
-+ char *error_message = NULL;
-+
-+ g_return_val_if_fail (iface != NULL, NULL);
-+ g_return_val_if_fail (is_wireless != NULL, NULL);
-+ g_return_val_if_fail (signal_strength != NULL, NULL);
-+
-+ if (is_wireless)
-+ *is_wireless = FALSE;
-+ if (signal_strength)
-+ *signal_strength = 0;
-+
-+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) &&
-+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) &&
-+ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) &&
-+ g_strncasecmp (iface, "acx", 3))
-+ return error_message;
-+
-+ if (g_strncasecmp (iface, "an", 2) == 0)
-+ {
-+ error_message = get_an_data (iface, signal_strength);
-+ *is_wireless = TRUE;
-+ }
-+ else
-+ {
-+ error_message = get_wi_data (iface, signal_strength);
-+ *is_wireless = TRUE;
-+ }
-+
-+ return error_message;
-+}
-+
- char *
- netstatus_sysdeps_read_iface_statistics (const char *iface,
- gulong *in_packets,
-@@ -413,11 +590,11 @@
- if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
- {
- error_message = g_strdup_printf (_("Could not parse command line '%s': %s"),
-- command_line,
-- error->message);
-+ command_line,
-+ error->message);
- g_error_free (error);
- g_free (command_line);
--
-+
- return error_message;
- }
- g_free (command_line);
-@@ -456,8 +633,8 @@
- g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-
- if (!parse_stats (buf,
-- prx_idx, ptx_idx, in_packets, out_packets,
-- brx_idx, btx_idx, in_bytes, out_bytes))
-+ prx_idx, ptx_idx, in_packets, out_packets,
-+ brx_idx, btx_idx, in_bytes, out_bytes))
- {
- error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
- "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-@@ -477,7 +654,7 @@
- }
- else
- {
-- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
-+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
- iface, error->message);
- g_error_free (error);
- }
-@@ -485,23 +662,6 @@
- g_strfreev (argv);
-
- return error_message;
--}
--
--char *
--netstatus_sysdeps_read_iface_wireless_details (const char *iface,
-- gboolean *is_wireless,
-- int *signal_strength)
--{
-- g_return_val_if_fail (iface != NULL, NULL);
-- g_return_val_if_fail (is_wireless != NULL, NULL);
-- g_return_val_if_fail (signal_strength_wireless != NULL, NULL);
--
-- if (is_wireless)
-- *is_wireless = FALSE;
-- if (signal_strength)
-- *signal_strength = 0;
--
-- return NULL;
- }
-
- #endif /* !defined(__FreeBSD__) */
diff --git a/net/gnomenetstatus/pkg-descr b/net/gnomenetstatus/pkg-descr
deleted file mode 100644
index 0848cf01f..000000000
--- 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 bf881c64c..000000000
--- a/net/gnomenetstatus/pkg-plist
+++ /dev/null
@@ -1,193 +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/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
-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/figures/gnome-netstatus-disconn.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png
-share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png
-share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/es/legal.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/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-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/eu/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/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/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/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/figures
-@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/figures
-@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 354f8005f..000000000
--- a/net/gnomenettool/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for: gnomenetwork
-# Date Created: 03 June 2003
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnomenettool
-PORTVERSION= 1.2.0
-PORTEPOCH= 1
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2
-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 libgnomeui
-USE_GMAKE= yes
-USE_LIBTOOL_VER=15
-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 9606b0ac5..000000000
--- a/net/gnomenettool/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a
-SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511
diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c
deleted file mode 100644
index 2d95d2620..000000000
--- a/net/gnomenettool/files/patch-src_info.c
+++ /dev/null
@@ -1,253 +0,0 @@
---- src/info.c.orig Tue Feb 1 06:05:58 2005
-+++ src/info.c Thu Mar 3 23:39:57 2005
-@@ -20,6 +20,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-+#include <sys/types.h>
-
- #ifdef HAVE_CONFIG_H
- # include <config.h>
-@@ -38,6 +39,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 +64,7 @@
- { 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 +135,42 @@
- {
- 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 +257,87 @@
- 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 +365,9 @@
- }
-
- g_io_channel_unref (io);
--#endif /* defined(__linux__) */
-+#if defined(__FreeBSD__)
-+ close (pipe_out);
-+#endif /* defined(__FreeBSD__) */
-
- return TRUE;
- }
-@@ -405,8 +496,16 @@
- InfoIpAddr *ip;
- gint flags;
- mii_data_result data;
-+#ifdef __FreeBSD__
-+ gint hwmib[6], hwlen;
-+ gchar *hwbuf;
-+ guchar *hwptr;
-+ struct if_msghdr *hwifm;
-+ struct sockaddr_dl *hwsinptr;
-+#endif
-
- getifaddrs (&ifa0);
-+ memset (&data, 0, sizeof (data));
-
- for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
- if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -452,7 +551,9 @@
- 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 +584,45 @@
- (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 */
diff --git a/net/gnomenettool/files/patch-src_netstat.c b/net/gnomenettool/files/patch-src_netstat.c
deleted file mode 100644
index 1eec84927..000000000
--- 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 cae4f648f..000000000
--- a/net/gnomenettool/files/patch-src_nettool.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/nettool.c.orig Fri Jan 7 23:13:56 2005
-+++ src/nettool.c Mon Jan 24 21:03:48 2005
-@@ -22,6 +22,7 @@
- #include <glib/gi18n.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-@@ -357,6 +358,10 @@
- len, NULL);
- }
-
-+ g_free (text);
-+
-+ return TRUE;
-+
- } else if (status == G_IO_STATUS_AGAIN) {
- char buf[1];
-
-@@ -368,12 +373,13 @@
- }
- 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 0c8111ade..000000000
--- a/net/gnomenettool/files/patch-src_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils.c.orig Sun Jul 4 20:11:49 2004
-+++ src/utils.c Sun Jul 4 20:12:14 2004
-@@ -240,7 +240,7 @@
- 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 5619126fe..000000000
--- 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 b1f5ab614..000000000
--- a/net/gnomenettool/pkg-plist
+++ /dev/null
@@ -1,70 +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/bs/LC_MESSAGES/gnome-nettool.mo
-share/locale/ca/LC_MESSAGES/gnome-nettool.mo
-share/locale/cs/LC_MESSAGES/gnome-nettool.mo
-share/locale/da/LC_MESSAGES/gnome-nettool.mo
-share/locale/de/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/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/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/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/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/zh_CN/LC_MESSAGES/gnome-nettool.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@dirrm share/gnome/gnome-nettool/pixmaps
-@dirrm share/gnome/gnome-nettool/dialogs
-@dirrm share/gnome/gnome-nettool
diff --git a/net/vino/Makefile b/net/vino/Makefile
deleted file mode 100644
index fbe9e90e8..000000000
--- a/net/vino/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: vino
-# Date created: 16 July 2004
-# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= vino
-PORTVERSION= 2.10.0
-CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= VNC server that allows for remote access to your GNOME desktop
-
-LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel
-USE_GMAKE= yes
-GNOME_DESKTOP_VERSION=2
-USE_LIBTOOL_VER=15
-CONFIGURE_ARGS= --enable-session-support
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS= vino-server.schemas
-
-.include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
deleted file mode 100644
index b7aee1de5..000000000
--- a/net/vino/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (vino-2.10.0.tar.bz2) = a9b5c811807e01e7fb420f52820f0150
-SIZE (vino-2.10.0.tar.bz2) = 581602
diff --git a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h b/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
deleted file mode 100644
index 04d7fa7b5..000000000
--- a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/libvncserver/rfb/rfbproto.h.orig Fri Jul 16 18:16:16 2004
-+++ server/libvncserver/rfb/rfbproto.h Fri Jul 16 18:16:39 2004
-@@ -60,7 +60,9 @@
- #include <rfb/rfbint.h>
- #else
- #include <config.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #endif
- #endif
- #include <rfb/keysym.h>
diff --git a/net/vino/files/patch-server_vino-fb.c b/net/vino/files/patch-server_vino-fb.c
deleted file mode 100644
index 56dbb89dc..000000000
--- a/net/vino/files/patch-server_vino-fb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- server/vino-fb.c.orig Mon Jul 12 06:22:08 2004
-+++ server/vino-fb.c Wed Jul 14 22:15:44 2004
-@@ -37,6 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <gdk/gdkx.h>
- #include <X11/Xlib.h>
diff --git a/net/vino/pkg-descr b/net/vino/pkg-descr
deleted file mode 100644
index f56a27700..000000000
--- a/net/vino/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Vino is a VNC server for GNOME - it allows someone to remotely connect
-to your desktop session using the RFB protocol.
-
-WWW: http://www.gnome.org
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
deleted file mode 100644
index 9d7a4550c..000000000
--- a/net/vino/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/vino-preferences
-bin/vino-session
-libdata/bonobo/servers/GNOME_RemoteDesktop.server
-libexec/vino-server
-share/gnome/applications/vino-preferences.desktop
-share/gnome/vino/vino-preferences.glade
-share/gnome/vino/vino-prompt.glade
-share/icons/hicolor/48x48/apps/gnome-remote-desktop.png
-share/locale/ar/LC_MESSAGES/vino.mo
-share/locale/az/LC_MESSAGES/vino.mo
-share/locale/bg/LC_MESSAGES/vino.mo
-share/locale/bn/LC_MESSAGES/vino.mo
-share/locale/bs/LC_MESSAGES/vino.mo
-share/locale/ca/LC_MESSAGES/vino.mo
-share/locale/cs/LC_MESSAGES/vino.mo
-share/locale/cy/LC_MESSAGES/vino.mo
-share/locale/da/LC_MESSAGES/vino.mo
-share/locale/de/LC_MESSAGES/vino.mo
-share/locale/el/LC_MESSAGES/vino.mo
-share/locale/en_CA/LC_MESSAGES/vino.mo
-share/locale/en_GB/LC_MESSAGES/vino.mo
-share/locale/es/LC_MESSAGES/vino.mo
-share/locale/et/LC_MESSAGES/vino.mo
-share/locale/eu/LC_MESSAGES/vino.mo
-share/locale/fi/LC_MESSAGES/vino.mo
-share/locale/fr/LC_MESSAGES/vino.mo
-share/locale/gu/LC_MESSAGES/vino.mo
-share/locale/hi/LC_MESSAGES/vino.mo
-share/locale/hu/LC_MESSAGES/vino.mo
-share/locale/id/LC_MESSAGES/vino.mo
-share/locale/it/LC_MESSAGES/vino.mo
-share/locale/ja/LC_MESSAGES/vino.mo
-share/locale/ko/LC_MESSAGES/vino.mo
-share/locale/lt/LC_MESSAGES/vino.mo
-share/locale/mk/LC_MESSAGES/vino.mo
-share/locale/mn/LC_MESSAGES/vino.mo
-share/locale/ms/LC_MESSAGES/vino.mo
-share/locale/nb/LC_MESSAGES/vino.mo
-share/locale/ne/LC_MESSAGES/vino.mo
-share/locale/nl/LC_MESSAGES/vino.mo
-share/locale/nn/LC_MESSAGES/vino.mo
-share/locale/no/LC_MESSAGES/vino.mo
-share/locale/or/LC_MESSAGES/vino.mo
-share/locale/pa/LC_MESSAGES/vino.mo
-share/locale/pl/LC_MESSAGES/vino.mo
-share/locale/pt/LC_MESSAGES/vino.mo
-share/locale/pt_BR/LC_MESSAGES/vino.mo
-share/locale/ro/LC_MESSAGES/vino.mo
-share/locale/ru/LC_MESSAGES/vino.mo
-share/locale/sk/LC_MESSAGES/vino.mo
-share/locale/sq/LC_MESSAGES/vino.mo
-share/locale/sr/LC_MESSAGES/vino.mo
-share/locale/sr@Latn/LC_MESSAGES/vino.mo
-share/locale/sv/LC_MESSAGES/vino.mo
-share/locale/ta/LC_MESSAGES/vino.mo
-share/locale/tr/LC_MESSAGES/vino.mo
-share/locale/uk/LC_MESSAGES/vino.mo
-share/locale/vi/LC_MESSAGES/vino.mo
-share/locale/zh_CN/LC_MESSAGES/vino.mo
-share/locale/zh_TW/LC_MESSAGES/vino.mo
-@dirrm share/gnome/vino