= Update 0.93 -> 0.94.1

= Add WITH_DANTE knob to compile with Dante socks client support.

8 files changed, 74 insertions, 44 deletions

diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 124cd7d0d9f4..73e6c22941d2 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	gnomeicu
-PORTVERSION=	0.93
+PORTVERSION=	0.94.1
 CATEGORIES=	net gnome
-MASTER_SITES=	ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
-		ftp://ftp.vision.net.au/ftp7/linuxberg/files/gnome/com/ \
-		ftp://ftp.datacomm.ch/.3/linuxberg/files/gnome/com/ \
-		ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/gnome/com/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= gnomeicu
 
 MAINTAINER=	nectar@FreeBSD.org
 
@@ -21,8 +19,23 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+.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
+.endif
+
+CONFIGURE_ARGS= --with-statusmenu
+CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+		CFLAGS="${CFLAGS}"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/net-im/gnomeicu/distinfo b/net-im/gnomeicu/distinfo
index a43f7dbd05db..760c16bd6314 100644
--- a/net-im/gnomeicu/distinfo
+++ b/net-im/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.93.tar.bz2) = e09cc7b08018c5e5fe4506c9a364494c
+MD5 (gnomeicu-0.94.1.tar.bz2) = 3c8035d682df22a1a9418216343544ec
diff --git a/net-im/gnomeicu/files/patch-ad b/net-im/gnomeicu/files/patch-ad
new file mode 100644
index 000000000000..416be7ad9346
--- /dev/null
+++ b/net-im/gnomeicu/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/kanji_conv.c.orig	Sun Oct 29 12:42:04 2000
++++ src/kanji_conv.c	Sun Oct 29 12:42:15 2000
+@@ -117,7 +117,7 @@
+     return strdup(str);
+ }
+ gchar *
+-kanji_conv(gchar *str, gint from_code, gint to_code)
++kanji_conv(gchar **str, gint from_code, gint to_code)
+ {
+ #ifdef TRACE_FUNCTION
+     printf("kanji_conv, did nothing.\n");
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index ea414d4eeaea..0a84f5e7f909 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -3,19 +3,7 @@ bin/gnomeicu-client
 etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/help/gnomeicu/C/authors.html
-share/gnome/help/gnomeicu/C/basicfuncs.html
-share/gnome/help/gnomeicu/C/bugs.html
-share/gnome/help/gnomeicu/C/chat.html
-share/gnome/help/gnomeicu/C/contact.html
-share/gnome/help/gnomeicu/C/docbook.css
-share/gnome/help/gnomeicu/C/index.html
-share/gnome/help/gnomeicu/C/license.html
-share/gnome/help/gnomeicu/C/ln7.html
-share/gnome/help/gnomeicu/C/options.html
 share/gnome/help/gnomeicu/C/topic.dat
-share/gnome/help/gnomeicu/C/usage.html
-share/gnome/help/gnomeicu/C/userprefs.html
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/pixmaps/gnomeicu/animeyes.png
 share/gnome/pixmaps/gnomeicu/cancel.xpm
@@ -47,6 +35,7 @@ share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
 share/locale/es/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/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
@@ -56,12 +45,14 @@ share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/no/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/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/sounds/gnomeicu
-@dirrm share/gnome/pixmaps/gnomeicu
+@dirrm share/gnome/help/gnomeicu/C/images
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
+@dirrm share/gnome/pixmaps/gnomeicu
+@dirrm share/gnome/sounds/gnomeicu
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 124cd7d0d9f4..73e6c22941d2 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	gnomeicu
-PORTVERSION=	0.93
+PORTVERSION=	0.94.1
 CATEGORIES=	net gnome
-MASTER_SITES=	ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
-		ftp://ftp.vision.net.au/ftp7/linuxberg/files/gnome/com/ \
-		ftp://ftp.datacomm.ch/.3/linuxberg/files/gnome/com/ \
-		ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/gnome/com/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= gnomeicu
 
 MAINTAINER=	nectar@FreeBSD.org
 
@@ -21,8 +19,23 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+.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
+.endif
+
+CONFIGURE_ARGS= --with-statusmenu
+CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+		CFLAGS="${CFLAGS}"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo
index a43f7dbd05db..760c16bd6314 100644
--- a/net-im/gnomeicu2/distinfo
+++ b/net-im/gnomeicu2/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.93.tar.bz2) = e09cc7b08018c5e5fe4506c9a364494c
+MD5 (gnomeicu-0.94.1.tar.bz2) = 3c8035d682df22a1a9418216343544ec
diff --git a/net-im/gnomeicu2/files/patch-ad b/net-im/gnomeicu2/files/patch-ad
new file mode 100644
index 000000000000..416be7ad9346
--- /dev/null
+++ b/net-im/gnomeicu2/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/kanji_conv.c.orig	Sun Oct 29 12:42:04 2000
++++ src/kanji_conv.c	Sun Oct 29 12:42:15 2000
+@@ -117,7 +117,7 @@
+     return strdup(str);
+ }
+ gchar *
+-kanji_conv(gchar *str, gint from_code, gint to_code)
++kanji_conv(gchar **str, gint from_code, gint to_code)
+ {
+ #ifdef TRACE_FUNCTION
+     printf("kanji_conv, did nothing.\n");
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index ea414d4eeaea..0a84f5e7f909 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/gnomeicu2/pkg-plist
@@ -3,19 +3,7 @@ bin/gnomeicu-client
 etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/help/gnomeicu/C/authors.html
-share/gnome/help/gnomeicu/C/basicfuncs.html
-share/gnome/help/gnomeicu/C/bugs.html
-share/gnome/help/gnomeicu/C/chat.html
-share/gnome/help/gnomeicu/C/contact.html
-share/gnome/help/gnomeicu/C/docbook.css
-share/gnome/help/gnomeicu/C/index.html
-share/gnome/help/gnomeicu/C/license.html
-share/gnome/help/gnomeicu/C/ln7.html
-share/gnome/help/gnomeicu/C/options.html
 share/gnome/help/gnomeicu/C/topic.dat
-share/gnome/help/gnomeicu/C/usage.html
-share/gnome/help/gnomeicu/C/userprefs.html
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/pixmaps/gnomeicu/animeyes.png
 share/gnome/pixmaps/gnomeicu/cancel.xpm
@@ -47,6 +35,7 @@ share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
 share/locale/es/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/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
@@ -56,12 +45,14 @@ share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/no/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/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/sounds/gnomeicu
-@dirrm share/gnome/pixmaps/gnomeicu
+@dirrm share/gnome/help/gnomeicu/C/images
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
+@dirrm share/gnome/pixmaps/gnomeicu
+@dirrm share/gnome/sounds/gnomeicu