Upgrade to 0.56.

8 files changed, 30 insertions, 74 deletions

diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index b06be92..fb2351c 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:	gtkicq
-# Version required:		0.55
+# Version required:		0.56
 # Date created:			Oct 15 1998
 # Whom:				Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/10/19 14:36:42 vanilla Exp $
 #
 
-DISTNAME=	gtkicq-0.55
+DISTNAME=	gtkicq-0.56
 CATEGORIES=	net
 MASTER_SITES=	ftp://ncis.ml.org/pub/gtkicq/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gnome.0:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.0:${PORTSDIR}/x11/gnomelibs \
+		panel_applet.0:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/net-im/gnomeicu/distinfo b/net-im/gnomeicu/distinfo
index c7d7771..3a1081d 100644
--- a/net-im/gnomeicu/distinfo
+++ b/net-im/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gtkicq-0.55.tar.gz) = 370ef0da8dd293700bd34df009ce0d50
+MD5 (gtkicq-0.56.tar.gz) = bbf3a3da24113d5f934f8bb23e134987
diff --git a/net-im/gnomeicu/files/patch-ac b/net-im/gnomeicu/files/patch-ac
index 7d76861..b9bdb32e 100644
--- a/net-im/gnomeicu/files/patch-ac
+++ b/net-im/gnomeicu/files/patch-ac
@@ -1,17 +1,6 @@
---- Makefile.in.orig	Thu Oct 15 22:47:41 1998
-+++ Makefile.in	Thu Oct 15 22:47:50 1998
-@@ -79,7 +79,7 @@
- VERSION = @VERSION@
- need_gnome_support = @need_gnome_support@
- 
--SUBDIRS = macros support src
-+SUBDIRS = macros src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
---- src/Makefile.in.orig	Thu Oct 15 22:47:55 1998
-+++ src/Makefile.in	Thu Oct 15 22:58:23 1998
-@@ -74,7 +74,7 @@
+--- 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@
@@ -20,7 +9,7 @@
  GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
  GNOME_LIBDIR = @GNOME_LIBDIR@
  GNOME_LIBS = @GNOME_LIBS@
-@@ -94,7 +94,7 @@
+@@ -89,7 +89,7 @@
  SUBDIRS = xpms
  
  INCLUDES = 			\
@@ -29,24 +18,12 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = gtkicq
-@@ -491,16 +491,16 @@
- maintainer-clean
- 
- 
--CFLAGS += -DUSE_XSCREENSAVER
-+CFLAGS += -DUSE_XSCREENSAVER -DGTK_VERSION_1_1_1
+@@ -495,7 +495,7 @@
+ CFLAGS += -DUSE_XSCREENSAVER
  
--LIBS += -L/usr/local/lib `glib-config --libs gmodule glib`
-+LIBS += -L/usr/local/lib `glib-config --libs gmodule`
- 
- CFLAGS += -Wall -DUNIX -DGNOME -ggdb
+ CFLAGS += -Wall -DUNIX -DGNOME
 -CFLAGS += -DINTEL_END -UMOTOR_END `gtk-config --cflags`
 +CFLAGS += -DINTEL_END -UMOTOR_END `gtk11-config --cflags`
  
- # To Add Support for Sound, uncomment the following lines, and change the
- # Sound directory where "Online.au" and "Message.au" are located.
--CFLAGS += -DSOUNDDIR="\"/usr/share/ICQ/Sounds\""
-+CFLAGS += -DSOUNDDIR="\"${prefix}/share/gnome/gicq/sounds\""
- CFLAGS += -DFORK_SOUND
- 
  CFLAGS += -DSOUND
+ 
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index ca32700..bac94ff 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -1,5 +1,5 @@
 bin/gtkicq
-share/gnome/apps/Network/GtkICQ.desktop
+share/gnome/applets/Network/GtkICQ.desktop
 share/gnome/pixmaps/gnome-gtkicq.xpm
 share/gnome/pixmaps/gtkicq-away.xpm
 share/gnome/pixmaps/gtkicq-dnd.xpm
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index b06be92..fb2351c 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:	gtkicq
-# Version required:		0.55
+# Version required:		0.56
 # Date created:			Oct 15 1998
 # Whom:				Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/10/19 14:36:42 vanilla Exp $
 #
 
-DISTNAME=	gtkicq-0.55
+DISTNAME=	gtkicq-0.56
 CATEGORIES=	net
 MASTER_SITES=	ftp://ncis.ml.org/pub/gtkicq/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gnome.0:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.0:${PORTSDIR}/x11/gnomelibs \
+		panel_applet.0:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo
index c7d7771..3a1081d 100644
--- a/net-im/gnomeicu2/distinfo
+++ b/net-im/gnomeicu2/distinfo
@@ -1 +1 @@
-MD5 (gtkicq-0.55.tar.gz) = 370ef0da8dd293700bd34df009ce0d50
+MD5 (gtkicq-0.56.tar.gz) = bbf3a3da24113d5f934f8bb23e134987
diff --git a/net-im/gnomeicu2/files/patch-ac b/net-im/gnomeicu2/files/patch-ac
index 7d76861..b9bdb32e 100644
--- a/net-im/gnomeicu2/files/patch-ac
+++ b/net-im/gnomeicu2/files/patch-ac
@@ -1,17 +1,6 @@
---- Makefile.in.orig	Thu Oct 15 22:47:41 1998
-+++ Makefile.in	Thu Oct 15 22:47:50 1998
-@@ -79,7 +79,7 @@
- VERSION = @VERSION@
- need_gnome_support = @need_gnome_support@
- 
--SUBDIRS = macros support src
-+SUBDIRS = macros src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
---- src/Makefile.in.orig	Thu Oct 15 22:47:55 1998
-+++ src/Makefile.in	Thu Oct 15 22:58:23 1998
-@@ -74,7 +74,7 @@
+--- 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@
@@ -20,7 +9,7 @@
  GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
  GNOME_LIBDIR = @GNOME_LIBDIR@
  GNOME_LIBS = @GNOME_LIBS@
-@@ -94,7 +94,7 @@
+@@ -89,7 +89,7 @@
  SUBDIRS = xpms
  
  INCLUDES = 			\
@@ -29,24 +18,12 @@
  	-I$(includedir) $(GNOME_INCLUDEDIR)
  
  bin_PROGRAMS = gtkicq
-@@ -491,16 +491,16 @@
- maintainer-clean
- 
- 
--CFLAGS += -DUSE_XSCREENSAVER
-+CFLAGS += -DUSE_XSCREENSAVER -DGTK_VERSION_1_1_1
+@@ -495,7 +495,7 @@
+ CFLAGS += -DUSE_XSCREENSAVER
  
--LIBS += -L/usr/local/lib `glib-config --libs gmodule glib`
-+LIBS += -L/usr/local/lib `glib-config --libs gmodule`
- 
- CFLAGS += -Wall -DUNIX -DGNOME -ggdb
+ CFLAGS += -Wall -DUNIX -DGNOME
 -CFLAGS += -DINTEL_END -UMOTOR_END `gtk-config --cflags`
 +CFLAGS += -DINTEL_END -UMOTOR_END `gtk11-config --cflags`
  
- # To Add Support for Sound, uncomment the following lines, and change the
- # Sound directory where "Online.au" and "Message.au" are located.
--CFLAGS += -DSOUNDDIR="\"/usr/share/ICQ/Sounds\""
-+CFLAGS += -DSOUNDDIR="\"${prefix}/share/gnome/gicq/sounds\""
- CFLAGS += -DFORK_SOUND
- 
  CFLAGS += -DSOUND
+ 
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index ca32700..bac94ff 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/gnomeicu2/pkg-plist
@@ -1,5 +1,5 @@
 bin/gtkicq
-share/gnome/apps/Network/GtkICQ.desktop
+share/gnome/applets/Network/GtkICQ.desktop
 share/gnome/pixmaps/gnome-gtkicq.xpm
 share/gnome/pixmaps/gtkicq-away.xpm
 share/gnome/pixmaps/gtkicq-dnd.xpm