net-im/gnomeicu2 -> net-im/gnomeicu

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for x11/gnome2-fifth-toe, chase the rename.

PR:		ports/97985
Repocopy by:	marcus

12 files changed, 5 insertions, 430 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index eb9b9cc8a75a..4b0f086671dc 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3310,7 +3310,7 @@ gnomechess	ports/games/gnomechess
 gnomefind	ports/sysutils/gnomefind
 gnomehier	ports/misc/gnomehier
 gnomeiconedit	ports/graphics/gnomeiconedit
-gnomeicu2	ports/net-im/gnomeicu2
+gnomeicu	ports/net-im/gnomeicu
 gnomekiss	ports/games/gnomekiss
 gnomelibs	ports/x11/gnomelibs
 gnomemeeting	ports/net/gnomemeeting
diff --git a/MOVED b/MOVED
index c401a7fa4fc4..23bca4ba32fe 100644
--- a/MOVED
+++ b/MOVED
@@ -2341,3 +2341,4 @@ devel/gnomevfs2|devel/gnome-vfs|2006-05-28|Renamed to use real vendor package na
 devel/gnomevfs2-reference|devel/gnome-vfs-reference|2006-05-28|Renamed to use real vendor package name
 x11/gnomedesktop|x11/gnome-desktop|2006-05-28|Renamed to use real vendor package name
 x11/gnomedesktop-reference|x11/gnome-desktop-reference|2006-05-28|Renamed to use real vendor package name
+net-im/gnomeicu2|net-im/gnomeicu|2006-05-28|Use unversioned name
diff --git a/net-im/Makefile b/net-im/Makefile
index 8b2ce937bf71..f2c4b346a62d 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -35,7 +35,7 @@
     SUBDIR += ginsu
     SUBDIR += gloox
     SUBDIR += gnome-jabber
-    SUBDIR += gnomeicu2
+    SUBDIR += gnomeicu
     SUBDIR += gossip
     SUBDIR += gtkyahoo
     SUBDIR += gyach
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 6cfdd08cde74..c4e2bfe1a95e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeicu2
+PORTNAME=	gnomeicu
 PORTVERSION=	0.99.10
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
-DISTNAME=	gnomeicu-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
deleted file mode 100644
index 6cfdd08cde74..000000000000
--- a/net-im/gnomeicu2/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Ports collection Makefile for:	GnomeICU
-# Date created:				03/16/1999
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeicu2
-PORTVERSION=	0.99.10
-CATEGORIES=	net-im gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnomeicu
-DISTNAME=	gnomeicu-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME2 ICQ client
-
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2 \
-		intlhack
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
-
-GCONF_SCHEMAS=	gnomeicu.schemas
-
-.if defined(WITH_DANTE)
-LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
-SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
-		-Dgetpeername=Rgetpeername -Daccept=Raccept \
-		-Drresvport=Rrresvport -Dbindresvport=Rbindresvport \
-		-Dgethostbyname=Rgethostbyname \
-		-Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto \
-		-Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite \
-		-Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg \
-		-Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg
-SOCKSLIBS=	-lsocks
-.elif defined(WITH_SOCKS5)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-SOCKSFLAGS=	-DSOCKS -include ${LOCALBASE}/include/socks.h
-SOCKSLIBS=	-lsocks5
-.endif
-
-CONFIGURE_ARGS=	--with-statusmenu
-CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
-		CFLAGS="${CFLAGS}"
-
-.ifndef(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=--enable-gtkspell
-.else
-CONFIGURE_ARGS+=--disable-gtkspell
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
-		${WRKSRC}/src/gnomeicu.c
-
-.include <bsd.port.mk>
diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo
deleted file mode 100644
index 22cd993f4f0e..000000000000
--- a/net-im/gnomeicu2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnomeicu-0.99.10.tar.bz2) = 849ac771e2df494fd0ab6af5c5646a96
-SHA256 (gnomeicu-0.99.10.tar.bz2) = 4682419cb5d0261d9c67c67ae8e302cc174d5027b39c6c317cfc406fc0843543
-SIZE (gnomeicu-0.99.10.tar.bz2) = 1658892
diff --git a/net-im/gnomeicu2/files/patch-src::icu_db.c b/net-im/gnomeicu2/files/patch-src::icu_db.c
deleted file mode 100644
index 3df66fcf8c50..000000000000
--- a/net-im/gnomeicu2/files/patch-src::icu_db.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
-+++ src/icu_db.c	Wed Sep 11 11:45:05 2002
-@@ -27,7 +27,11 @@
- 
- #include <fcntl.h>
- #include <errno.h>
-+#if defined(HAVE_STDLIB_H)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
diff --git a/net-im/gnomeicu2/files/patch-src_history.c b/net-im/gnomeicu2/files/patch-src_history.c
deleted file mode 100644
index b529bd13bda2..000000000000
--- a/net-im/gnomeicu2/files/patch-src_history.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/history.c.orig	Mon Nov 29 20:48:25 2004
-+++ src/history.c	Mon Nov 29 20:21:37 2004
-@@ -214,6 +214,11 @@
-     char direction;
-     time_t time;
- 
-+    if (! (ptr+4)) {
-+      g_free (hp->buffer);
-+      g_free (hp);
-+      return FALSE;
-+    }
-     /* read header info */
-     sscanf (ptr+4, "%c %d", &direction, (int *)&time);
-
diff --git a/net-im/gnomeicu2/files/patch-src_userserver.c b/net-im/gnomeicu2/files/patch-src_userserver.c
deleted file mode 100644
index 23e5ed601943..000000000000
--- a/net-im/gnomeicu2/files/patch-src_userserver.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
-+++ src/userserver.c	Fri Apr  2 15:20:54 2004
-@@ -6,12 +6,12 @@
- ***************************/
- 
- #include <errno.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <pwd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/un.h>
diff --git a/net-im/gnomeicu2/pkg-descr b/net-im/gnomeicu2/pkg-descr
deleted file mode 100644
index df8c0c64984b..000000000000
--- a/net-im/gnomeicu2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
- GnomeICU (previously GtkICQ) is an Internet based communications
- program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome2, a growingly popular desktop environment. GnomeICU is released
- under the GNU Public License, and is available free of charge.
-
-WWW: http://gnomeicu.sourceforge.net
-
-Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
deleted file mode 100644
index 5eabd1d7d089..000000000000
--- a/net-im/gnomeicu2/pkg-plist
+++ /dev/null
@@ -1,303 +0,0 @@
-bin/gnomeicu
-bin/gnomeicu-client
-etc/sound/events/GnomeICU.soundlist
-share/gnome/applications/GnomeICU.desktop
-share/gnome/gnomeicu/emoticons/AIM/angel.xpm
-share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
-share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
-share/gnome/gnomeicu/emoticons/AIM/cry.xpm
-share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
-share/gnome/gnomeicu/emoticons/AIM/emoticon-data
-share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
-share/gnome/gnomeicu/emoticons/AIM/sad.xpm
-share/gnome/gnomeicu/emoticons/AIM/scream.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
-share/gnome/gnomeicu/emoticons/AIM/think.xpm
-share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
-share/gnome/gnomeicu/emoticons/AIM/wink.xpm
-share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
-share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
-share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
-share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
-share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
-share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
-share/gnome/gnomeicu/emoticons/Always/Whining.bmp
-share/gnome/gnomeicu/emoticons/Always/asl.gif
-share/gnome/gnomeicu/emoticons/Always/bat.gif
-share/gnome/gnomeicu/emoticons/Always/beer.gif
-share/gnome/gnomeicu/emoticons/Always/boy.gif
-share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
-share/gnome/gnomeicu/emoticons/Always/cake.gif
-share/gnome/gnomeicu/emoticons/Always/camera.gif
-share/gnome/gnomeicu/emoticons/Always/cat.gif
-share/gnome/gnomeicu/emoticons/Always/clock.gif
-share/gnome/gnomeicu/emoticons/Always/coffee.gif
-share/gnome/gnomeicu/emoticons/Always/cuffs.gif
-share/gnome/gnomeicu/emoticons/Always/dog.gif
-share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
-share/gnome/gnomeicu/emoticons/Always/emoticon-data
-share/gnome/gnomeicu/emoticons/Always/envelope.gif
-share/gnome/gnomeicu/emoticons/Always/film.gif
-share/gnome/gnomeicu/emoticons/Always/girl.gif
-share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
-share/gnome/gnomeicu/emoticons/Always/heart.gif
-share/gnome/gnomeicu/emoticons/Always/martini.gif
-share/gnome/gnomeicu/emoticons/Always/messenger.gif
-share/gnome/gnomeicu/emoticons/Always/moon.gif
-share/gnome/gnomeicu/emoticons/Always/musical_note.gif
-share/gnome/gnomeicu/emoticons/Always/phone.gif
-share/gnome/gnomeicu/emoticons/Always/present.gif
-share/gnome/gnomeicu/emoticons/Always/rainbow.gif
-share/gnome/gnomeicu/emoticons/Always/rose.gif
-share/gnome/gnomeicu/emoticons/Always/star.gif
-share/gnome/gnomeicu/emoticons/Always/sun.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
-share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
-share/gnome/gnomeicu/emoticons/Default/bigsmile.png
-share/gnome/gnomeicu/emoticons/Default/cry.png
-share/gnome/gnomeicu/emoticons/Default/emoticon-data
-share/gnome/gnomeicu/emoticons/Default/glasses.png
-share/gnome/gnomeicu/emoticons/Default/sad.png
-share/gnome/gnomeicu/emoticons/Default/scream.png
-share/gnome/gnomeicu/emoticons/Default/smile.png
-share/gnome/gnomeicu/emoticons/Default/smile2.png
-share/gnome/gnomeicu/emoticons/Default/smile8.png
-share/gnome/gnomeicu/emoticons/Default/straight.png
-share/gnome/gnomeicu/emoticons/Default/tongue.png
-share/gnome/gnomeicu/emoticons/Default/unsure.png
-share/gnome/gnomeicu/emoticons/Default/wink.png
-share/gnome/gnomeicu/emoticons/MSN/angel.png
-share/gnome/gnomeicu/emoticons/MSN/angry.png
-share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
-share/gnome/gnomeicu/emoticons/MSN/confused.png
-share/gnome/gnomeicu/emoticons/MSN/cry.png
-share/gnome/gnomeicu/emoticons/MSN/devil.png
-share/gnome/gnomeicu/emoticons/MSN/embarassed.png
-share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.png
-share/gnome/gnomeicu/emoticons/MSN/light.gif
-share/gnome/gnomeicu/emoticons/MSN/sad.png
-share/gnome/gnomeicu/emoticons/MSN/shocked.png
-share/gnome/gnomeicu/emoticons/MSN/smile.png
-share/gnome/gnomeicu/emoticons/MSN/smile8.png
-share/gnome/gnomeicu/emoticons/MSN/straight.png
-share/gnome/gnomeicu/emoticons/MSN/tongue.png
-share/gnome/gnomeicu/emoticons/MSN/wink.png
-share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
-share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
-share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
-share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
-share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
-share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
-share/gnome/gnomeicu/emoticons/Yahoo/green.gif
-share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
-share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
-share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
-share/gnome/gnomeicu/emoticons/Yahoo/light.gif
-share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
-share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
-share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
-share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
-share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
-share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
-share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
-share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
-share/gnome/gnomeicu/glade/addcontact.glade
-share/gnome/gnomeicu/glade/auth.glade
-share/gnome/gnomeicu/glade/auto_respond.glade
-share/gnome/gnomeicu/glade/grpmgr.glade
-share/gnome/gnomeicu/glade/history.glade
-share/gnome/gnomeicu/glade/main.glade
-share/gnome/gnomeicu/glade/message.glade
-share/gnome/gnomeicu/glade/prefs.glade
-share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/glade/welcome.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-info
-share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-info
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-online.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-away.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-info
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-na.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
-share/gnome/gnomeicu/prefs_icon_gnomeicu.png
-share/gnome/gnomeicu/prefs_icon_icq.png
-share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
-share/gnome/help/gnomeicu/C/figures/mainwindow.png
-share/gnome/help/gnomeicu/C/figures/messagedialog.png
-share/gnome/help/gnomeicu/C/figures/notificationicon.png
-share/gnome/help/gnomeicu/C/figures/prefdialog.png
-share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
-share/gnome/help/gnomeicu/C/figures/sendfile.png
-share/gnome/help/gnomeicu/C/figures/sendurl.png
-share/gnome/help/gnomeicu/C/figures/userinfo.png
-share/gnome/help/gnomeicu/C/gnomeicu.xml
-share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
-share/gnome/help/gnomeicu/uk/figures/mainwindow.png
-share/gnome/help/gnomeicu/uk/figures/messagedialog.png
-share/gnome/help/gnomeicu/uk/figures/notificationicon.png
-share/gnome/help/gnomeicu/uk/figures/prefdialog.png
-share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
-share/gnome/help/gnomeicu/uk/figures/sendfile.png
-share/gnome/help/gnomeicu/uk/figures/sendurl.png
-share/gnome/help/gnomeicu/uk/figures/userinfo.png
-share/gnome/help/gnomeicu/uk/gnomeicu.xml
-share/gnome/omf/gnomeicu/gnomeicu-C.omf
-share/gnome/omf/gnomeicu/gnomeicu-uk.omf
-share/gnome/pixmaps/gnomeicu.png
-share/gnome/sounds/gnomeicu/Auth.wav
-share/gnome/sounds/gnomeicu/File.wav
-share/gnome/sounds/gnomeicu/Online.wav
-share/gnome/sounds/gnomeicu/URL.wav
-share/gnome/sounds/gnomeicu/contlist.wav
-share/gnome/sounds/gnomeicu/message.wav
-share/locale/am/LC_MESSAGES/gnomeicu.mo
-share/locale/az/LC_MESSAGES/gnomeicu.mo
-share/locale/be/LC_MESSAGES/gnomeicu.mo
-share/locale/bg/LC_MESSAGES/gnomeicu.mo
-share/locale/ca/LC_MESSAGES/gnomeicu.mo
-share/locale/cs/LC_MESSAGES/gnomeicu.mo
-share/locale/da/LC_MESSAGES/gnomeicu.mo
-share/locale/de/LC_MESSAGES/gnomeicu.mo
-share/locale/el/LC_MESSAGES/gnomeicu.mo
-share/locale/en_CA/LC_MESSAGES/gnomeicu.mo
-share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
-share/locale/es/LC_MESSAGES/gnomeicu.mo
-share/locale/eu/LC_MESSAGES/gnomeicu.mo
-share/locale/fi/LC_MESSAGES/gnomeicu.mo
-share/locale/fr/LC_MESSAGES/gnomeicu.mo
-share/locale/ga/LC_MESSAGES/gnomeicu.mo
-share/locale/gl/LC_MESSAGES/gnomeicu.mo
-share/locale/he/LC_MESSAGES/gnomeicu.mo
-share/locale/hr/LC_MESSAGES/gnomeicu.mo
-share/locale/hu/LC_MESSAGES/gnomeicu.mo
-share/locale/it/LC_MESSAGES/gnomeicu.mo
-share/locale/ja/LC_MESSAGES/gnomeicu.mo
-share/locale/ko/LC_MESSAGES/gnomeicu.mo
-share/locale/lt/LC_MESSAGES/gnomeicu.mo
-share/locale/lv/LC_MESSAGES/gnomeicu.mo
-share/locale/mk/LC_MESSAGES/gnomeicu.mo
-share/locale/ml/LC_MESSAGES/gnomeicu.mo
-share/locale/ms/LC_MESSAGES/gnomeicu.mo
-share/locale/nb/LC_MESSAGES/gnomeicu.mo
-share/locale/ne/LC_MESSAGES/gnomeicu.mo
-share/locale/nl/LC_MESSAGES/gnomeicu.mo
-share/locale/nn/LC_MESSAGES/gnomeicu.mo
-share/locale/no/LC_MESSAGES/gnomeicu.mo
-share/locale/pa/LC_MESSAGES/gnomeicu.mo
-share/locale/pl/LC_MESSAGES/gnomeicu.mo
-share/locale/pt/LC_MESSAGES/gnomeicu.mo
-share/locale/pt_BR/LC_MESSAGES/gnomeicu.mo
-share/locale/ro/LC_MESSAGES/gnomeicu.mo
-share/locale/ru/LC_MESSAGES/gnomeicu.mo
-share/locale/rw/LC_MESSAGES/gnomeicu.mo
-share/locale/sk/LC_MESSAGES/gnomeicu.mo
-share/locale/sl/LC_MESSAGES/gnomeicu.mo
-share/locale/sq/LC_MESSAGES/gnomeicu.mo
-share/locale/sr/LC_MESSAGES/gnomeicu.mo
-share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
-share/locale/sv/LC_MESSAGES/gnomeicu.mo
-share/locale/th/LC_MESSAGES/gnomeicu.mo
-share/locale/tr/LC_MESSAGES/gnomeicu.mo
-share/locale/uk/LC_MESSAGES/gnomeicu.mo
-share/locale/vi/LC_MESSAGES/gnomeicu.mo
-share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
-share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/sounds/gnomeicu
-@dirrm share/gnome/omf/gnomeicu
-@dirrm share/gnome/help/gnomeicu/uk/figures
-@dirrm share/gnome/help/gnomeicu/uk
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/gnomeicu/icons/reDubbed
-@dirrm share/gnome/gnomeicu/icons/Gradients
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/emoticons/Yahoo
-@dirrm share/gnome/gnomeicu/emoticons/MSN
-@dirrm share/gnome/gnomeicu/emoticons/Default
-@dirrm share/gnome/gnomeicu/emoticons/Always
-@dirrm share/gnome/gnomeicu/emoticons/AIM
-@dirrm share/gnome/gnomeicu/emoticons
-@dirrm share/gnome/gnomeicu
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 8784c4e622d3..09e76f03e4ca 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	pan:${PORTSDIR}/news/pan \
 		xchat:${PORTSDIR}/irc/xchat \
 		gimp-2.2:${PORTSDIR}/graphics/gimp \
 		sodipodi:${PORTSDIR}/graphics/sodipodi \
-		gnomeicu:${PORTSDIR}/net-im/gnomeicu2 \
+		gnomeicu:${PORTSDIR}/net-im/gnomeicu \
 		gthumb:${PORTSDIR}/graphics/gthumb \
 		${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \
 		tsclient:${PORTSDIR}/net/tsclient \