gnomeicu is actually the new name for gtkicq. Fix mistake of

importing gnomeicu as a new port:

* repository copy of ports/net/gtkicq to ports/net/gnome-icu [asami]
* update ports/net/gnome-icu to 0.62a
* remove ports/net/gtkicq
* remove ports/net/gnomeicu

PKGNAME remains gnomeicu-0.62a.  It is expected that after some
time has passed, that we can rename the port directory from
gnome-icu to gnomeicu.

12 files changed, 88 insertions, 150 deletions

diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index f1a521e614e6..0ef5f23d8700 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -1,32 +1,24 @@
-# New ports collection makefile for:	gtkicq
-# Version required:		0.56
-# Date created:			Oct 15 1998
-# Whom:				Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Ports collection Makefile for:	GnomeICU
+# Version required:			0.62a
+# Date created:				03/16/1999
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1999/01/12 16:50:45 vanilla Exp $
+# $Id: Makefile,v 1.1.1.1 1999/03/16 08:59:57 nectar Exp $
 #
 
-DISTNAME=	gtkicq-0.56
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.bse.bg/pub/Unix/icq/ \
-		ftp://ftp.infodrom.north.de/pub/unix/gtk-etc/apps/gtkicq/ \
-		ftp://ftp.rnd.runnet.ru/pub/unix/GUI_Toolkits/gtk/
+DISTNAME=		gnomeicu-0.62a
+CATEGORIES=		net gnome
+MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/          \
+			http://www.nectar.com/distfiles/
 
-MAINTAINER=	nacai@iname.com
+LIB_DEPENDS=		gnome.1:${PORTSDIR}/x11/gnomelibs              \
+			gdk_imlib.3:${PORTSDIR}/graphics/imlib
 
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.0:${PORTSDIR}/x11/gnomecore
+MAINTAINER=		nectar@FreeBSD.ORG
 
-BROKEN=		"gtkicq 0.58 is out"
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+USE_X_PREFIX=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ENV=		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ARGS=		--datadir=${PREFIX}/share/gnome
 
 .include <bsd.port.mk>
diff --git a/net/gnomeicu/distinfo b/net/gnomeicu/distinfo
index 3a1081ddf626..6f83f368f497 100644
--- a/net/gnomeicu/distinfo
+++ b/net/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gtkicq-0.56.tar.gz) = bbf3a3da24113d5f934f8bb23e134987
+MD5 (gnomeicu-0.62a.tar.gz) = 7630c7c1e3d1f34c654514faacae9b4c
diff --git a/net/gnomeicu/files/patch-ac b/net/gnomeicu/files/patch-ac
deleted file mode 100644
index b9bdb32e673f..000000000000
--- a/net/gnomeicu/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Thu Oct 15 05:37:39 1998
-+++ src/Makefile.in	Wed Oct 21 01:03:09 1998
-@@ -69,7 +69,7 @@
- AWK = @AWK@
- CC = @CC@
- CPP = @CPP@
--GNOMEUI_LIBS = @GNOMEUI_LIBS@
-+GNOMEUI_LIBS = @GNOMEUI_LIBS@ -lintl
- GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
- GNOME_LIBDIR = @GNOME_LIBDIR@
- GNOME_LIBS = @GNOME_LIBS@
-@@ -89,7 +89,7 @@
- SUBDIRS = xpms
- 
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = gtkicq
-@@ -495,7 +495,7 @@
- CFLAGS += -DUSE_XSCREENSAVER
- 
- CFLAGS += -Wall -DUNIX -DGNOME
--CFLAGS += -DINTEL_END -UMOTOR_END `gtk-config --cflags`
-+CFLAGS += -DINTEL_END -UMOTOR_END `gtk11-config --cflags`
- 
- CFLAGS += -DSOUND
- 
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index f1a521e614e6..0ef5f23d8700 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -1,32 +1,24 @@
-# New ports collection makefile for:	gtkicq
-# Version required:		0.56
-# Date created:			Oct 15 1998
-# Whom:				Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Ports collection Makefile for:	GnomeICU
+# Version required:			0.62a
+# Date created:				03/16/1999
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1999/01/12 16:50:45 vanilla Exp $
+# $Id: Makefile,v 1.1.1.1 1999/03/16 08:59:57 nectar Exp $
 #
 
-DISTNAME=	gtkicq-0.56
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.bse.bg/pub/Unix/icq/ \
-		ftp://ftp.infodrom.north.de/pub/unix/gtk-etc/apps/gtkicq/ \
-		ftp://ftp.rnd.runnet.ru/pub/unix/GUI_Toolkits/gtk/
+DISTNAME=		gnomeicu-0.62a
+CATEGORIES=		net gnome
+MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/          \
+			http://www.nectar.com/distfiles/
 
-MAINTAINER=	nacai@iname.com
+LIB_DEPENDS=		gnome.1:${PORTSDIR}/x11/gnomelibs              \
+			gdk_imlib.3:${PORTSDIR}/graphics/imlib
 
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.0:${PORTSDIR}/x11/gnomecore
+MAINTAINER=		nectar@FreeBSD.ORG
 
-BROKEN=		"gtkicq 0.58 is out"
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+USE_X_PREFIX=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ENV=		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ARGS=		--datadir=${PREFIX}/share/gnome
 
 .include <bsd.port.mk>
diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo
index 3a1081ddf626..6f83f368f497 100644
--- a/net/gnomeicu/gnomeicu/distinfo
+++ b/net/gnomeicu/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gtkicq-0.56.tar.gz) = bbf3a3da24113d5f934f8bb23e134987
+MD5 (gnomeicu-0.62a.tar.gz) = 7630c7c1e3d1f34c654514faacae9b4c
diff --git a/net/gnomeicu/gnomeicu/files/patch-ac b/net/gnomeicu/gnomeicu/files/patch-ac
deleted file mode 100644
index b9bdb32e673f..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Thu Oct 15 05:37:39 1998
-+++ src/Makefile.in	Wed Oct 21 01:03:09 1998
-@@ -69,7 +69,7 @@
- AWK = @AWK@
- CC = @CC@
- CPP = @CPP@
--GNOMEUI_LIBS = @GNOMEUI_LIBS@
-+GNOMEUI_LIBS = @GNOMEUI_LIBS@ -lintl
- GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
- GNOME_LIBDIR = @GNOME_LIBDIR@
- GNOME_LIBS = @GNOME_LIBS@
-@@ -89,7 +89,7 @@
- SUBDIRS = xpms
- 
- INCLUDES = 			\
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- 	-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- bin_PROGRAMS = gtkicq
-@@ -495,7 +495,7 @@
- CFLAGS += -DUSE_XSCREENSAVER
- 
- CFLAGS += -Wall -DUNIX -DGNOME
--CFLAGS += -DINTEL_END -UMOTOR_END `gtk-config --cflags`
-+CFLAGS += -DINTEL_END -UMOTOR_END `gtk11-config --cflags`
- 
- CFLAGS += -DSOUND
- 
diff --git a/net/gnomeicu/gnomeicu/pkg-comment b/net/gnomeicu/gnomeicu/pkg-comment
index 816318198026..6fd7247d057d 100644
--- a/net/gnomeicu/gnomeicu/pkg-comment
+++ b/net/gnomeicu/gnomeicu/pkg-comment
@@ -1 +1 @@
-X11 and Gtk-based ICQ-compatible program.
+GNOME ICQ client.
diff --git a/net/gnomeicu/gnomeicu/pkg-descr b/net/gnomeicu/gnomeicu/pkg-descr
index a47edd9ae6eb..70cd93d1b3be 100644
--- a/net/gnomeicu/gnomeicu/pkg-descr
+++ b/net/gnomeicu/gnomeicu/pkg-descr
@@ -1,10 +1,8 @@
-	GtkICQ is a clone of Mirabilis' popular ICQ written with GTK.
-The original source was taken from Matt Smith's mICQ.  This is ment as
-a replacement for the JavaICQ, which is slow and buggy.  If you would
-like to contribute, please contact Jeremy Wise ( jwise@pathwaynet.com ).
-You may also want to visit The ICQ Protocol Site at:
-[ http://www.student.nada.kth.se/~d95-mih/icq/ ] for information about
-the ICQ protocol and mailing list.
+ GnomeICU (previously GtkICQ) is an Internet based communications
+ program which makes use of ICQ protocol. GnomeICU also makes use of
+ Gnome, a growingly popular desktop environment.GnomeICU is released
+ under the GNU Public License, and is available free of charge.
 
-- Vanilla
-vanilla@FreeBSD.ORG
+See also http://gnomeicu.gdev.net/
+
+Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
index bac94fffe832..ad098656fae4 100644
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ b/net/gnomeicu/gnomeicu/pkg-plist
@@ -1,11 +1,19 @@
-bin/gtkicq
-share/gnome/applets/Network/GtkICQ.desktop
-share/gnome/pixmaps/gnome-gtkicq.xpm
-share/gnome/pixmaps/gtkicq-away.xpm
-share/gnome/pixmaps/gtkicq-dnd.xpm
-share/gnome/pixmaps/gtkicq-ffc.xpm
-share/gnome/pixmaps/gtkicq-inv.xpm
-share/gnome/pixmaps/gtkicq-na.xpm
-share/gnome/pixmaps/gtkicq-occ.xpm
-share/gnome/pixmaps/gtkicq-offline.xpm
-share/gnome/pixmaps/gtkicq-online.xpm
+bin/gnomeicu
+share/gnome/pixmaps/gnomeicu-auth.xpm
+share/gnome/pixmaps/gnomeicu-away.xpm
+share/gnome/pixmaps/gnomeicu-blank.xpm
+share/gnome/pixmaps/gnomeicu-chat.xpm
+share/gnome/pixmaps/gnomeicu-chat2.xpm
+share/gnome/pixmaps/gnomeicu-dnd.xpm
+share/gnome/pixmaps/gnomeicu-ffc.xpm
+share/gnome/pixmaps/gnomeicu-inv.xpm
+share/gnome/pixmaps/gnomeicu-message.xpm
+share/gnome/pixmaps/gnomeicu-na.xpm
+share/gnome/pixmaps/gnomeicu-nomess.xpm
+share/gnome/pixmaps/gnomeicu-occ.xpm
+share/gnome/pixmaps/gnomeicu-offline.xpm
+share/gnome/pixmaps/gnomeicu-online.xpm
+share/gnome/pixmaps/gnomeicu-url.xpm
+share/gnome/pixmaps/gnome-gnomeicu.xpm
+share/gnome/applets/Network/GnomeICU.desktop
+etc/CORBA/servers/GnomeICU.gnorba
diff --git a/net/gnomeicu/pkg-comment b/net/gnomeicu/pkg-comment
index 816318198026..6fd7247d057d 100644
--- a/net/gnomeicu/pkg-comment
+++ b/net/gnomeicu/pkg-comment
@@ -1 +1 @@
-X11 and Gtk-based ICQ-compatible program.
+GNOME ICQ client.
diff --git a/net/gnomeicu/pkg-descr b/net/gnomeicu/pkg-descr
index a47edd9ae6eb..70cd93d1b3be 100644
--- a/net/gnomeicu/pkg-descr
+++ b/net/gnomeicu/pkg-descr
@@ -1,10 +1,8 @@
-	GtkICQ is a clone of Mirabilis' popular ICQ written with GTK.
-The original source was taken from Matt Smith's mICQ.  This is ment as
-a replacement for the JavaICQ, which is slow and buggy.  If you would
-like to contribute, please contact Jeremy Wise ( jwise@pathwaynet.com ).
-You may also want to visit The ICQ Protocol Site at:
-[ http://www.student.nada.kth.se/~d95-mih/icq/ ] for information about
-the ICQ protocol and mailing list.
+ GnomeICU (previously GtkICQ) is an Internet based communications
+ program which makes use of ICQ protocol. GnomeICU also makes use of
+ Gnome, a growingly popular desktop environment.GnomeICU is released
+ under the GNU Public License, and is available free of charge.
 
-- Vanilla
-vanilla@FreeBSD.ORG
+See also http://gnomeicu.gdev.net/
+
+Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/net/gnomeicu/pkg-plist b/net/gnomeicu/pkg-plist
index bac94fffe832..ad098656fae4 100644
--- a/net/gnomeicu/pkg-plist
+++ b/net/gnomeicu/pkg-plist
@@ -1,11 +1,19 @@
-bin/gtkicq
-share/gnome/applets/Network/GtkICQ.desktop
-share/gnome/pixmaps/gnome-gtkicq.xpm
-share/gnome/pixmaps/gtkicq-away.xpm
-share/gnome/pixmaps/gtkicq-dnd.xpm
-share/gnome/pixmaps/gtkicq-ffc.xpm
-share/gnome/pixmaps/gtkicq-inv.xpm
-share/gnome/pixmaps/gtkicq-na.xpm
-share/gnome/pixmaps/gtkicq-occ.xpm
-share/gnome/pixmaps/gtkicq-offline.xpm
-share/gnome/pixmaps/gtkicq-online.xpm
+bin/gnomeicu
+share/gnome/pixmaps/gnomeicu-auth.xpm
+share/gnome/pixmaps/gnomeicu-away.xpm
+share/gnome/pixmaps/gnomeicu-blank.xpm
+share/gnome/pixmaps/gnomeicu-chat.xpm
+share/gnome/pixmaps/gnomeicu-chat2.xpm
+share/gnome/pixmaps/gnomeicu-dnd.xpm
+share/gnome/pixmaps/gnomeicu-ffc.xpm
+share/gnome/pixmaps/gnomeicu-inv.xpm
+share/gnome/pixmaps/gnomeicu-message.xpm
+share/gnome/pixmaps/gnomeicu-na.xpm
+share/gnome/pixmaps/gnomeicu-nomess.xpm
+share/gnome/pixmaps/gnomeicu-occ.xpm
+share/gnome/pixmaps/gnomeicu-offline.xpm
+share/gnome/pixmaps/gnomeicu-online.xpm
+share/gnome/pixmaps/gnomeicu-url.xpm
+share/gnome/pixmaps/gnome-gnomeicu.xpm
+share/gnome/applets/Network/GnomeICU.desktop
+etc/CORBA/servers/GnomeICU.gnorba