diff options
| author | nectar <nectar@FreeBSD.org> | 2001-12-29 12:07:34 +0800 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2001-12-29 12:07:34 +0800 |
| commit | 1918286bc4d1821eb40bad5862b82149a81fb24e (patch) | |
| tree | 655211233d9bd65e675c0e272ce370cec664513d | |
| parent | ff66b23508c55b30a9414b73564222500ac792fc (diff) | |
| download | freebsd-ports-gnome-1918286bc4d1821eb40bad5862b82149a81fb24e.tar.gz freebsd-ports-gnome-1918286bc4d1821eb40bad5862b82149a81fb24e.tar.zst freebsd-ports-gnome-1918286bc4d1821eb40bad5862b82149a81fb24e.zip | |
Update 0.96.1 -> 0.98
PR: ports/33146
Submitted by: Jochem Kossen <j.kossen@home.nl>
Fix the locale directories.
Add a WITH_SOCKS5 knob while I'm here.
35 files changed, 440 insertions, 165 deletions
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index 853dc427516e..9bbaa0c92fc5 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomeicu -PORTVERSION= 0.96.1 -PORTREVISION= 2 +PORTVERSION= 0.98 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -15,9 +14,10 @@ MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_BZIP2= yes USE_GNOME= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -29,6 +29,10 @@ SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ -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 diff --git a/net-im/gnomeicu/distinfo b/net-im/gnomeicu/distinfo index 2eeb3fc7ef30..55e947f5a949 100644 --- a/net-im/gnomeicu/distinfo +++ b/net-im/gnomeicu/distinfo @@ -1 +1 @@ -MD5 (gnomeicu-0.96.1.tar.bz2) = 1286c2d250562fc416836882b89bcdf1 +MD5 (gnomeicu-0.98.tar.gz) = aed40d1993611c3c29e12dfb2c9d5135 diff --git a/net-im/gnomeicu/files/patch-ac b/net-im/gnomeicu/files/patch-ac deleted file mode 100644 index c0a042787c06..000000000000 --- a/net-im/gnomeicu/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 29 16:04:07 2000 -+++ po/Makefile.in.in Sat Jan 29 16:08:19 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/net-im/gnomeicu/files/patch-configure b/net-im/gnomeicu/files/patch-configure index fcb467e8a8ef..005f7f7c92d5 100644 --- a/net-im/gnomeicu/files/patch-configure +++ b/net-im/gnomeicu/files/patch-configure @@ -1,16 +1,29 @@ ---- configure.orig Tue Feb 27 13:35:06 2001 -+++ configure Thu Apr 19 15:50:55 2001 -@@ -5039,5 +5039,5 @@ - --ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5043: checking for iconv.h" >&5 -+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:5043: checking for giconv.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -@@ -5048,3 +5048,3 @@ +--- configure.orig Mon Dec 24 17:17:59 2001 ++++ configure Mon Dec 24 17:18:21 2001 +@@ -3017,7 +3017,7 @@ + #line 3018 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3039,7 +3039,7 @@ + #line 3040 "configure" #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3077,7 +3077,7 @@ + #include "confdefs.h" + + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> - EOF + extern + #ifdef __cplusplus + "C" diff --git a/net-im/gnomeicu/files/patch-po::Makefile.in.in b/net-im/gnomeicu/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..eb27fe3afb48 --- /dev/null +++ b/net-im/gnomeicu/files/patch-po::Makefile.in.in @@ -0,0 +1,20 @@ +--- po/Makefile.in.in.orig Sun Dec 23 17:47:08 2001 ++++ po/Makefile.in.in Fri Dec 28 15:46:57 2001 +@@ -23,7 +23,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/net-im/gnomeicu/files/patch-src::kanji_conv.c b/net-im/gnomeicu/files/patch-src::kanji_conv.c index 497b91d16c89..a6693363b918 100644 --- a/net-im/gnomeicu/files/patch-src::kanji_conv.c +++ b/net-im/gnomeicu/files/patch-src::kanji_conv.c @@ -1,7 +1,11 @@ ---- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 -+++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 -@@ -32,3 +32,3 @@ +--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001 ++++ src/kanji_conv.c Mon Dec 24 12:51:21 2001 +@@ -30,7 +30,7 @@ + #include <locale.h> + #ifdef HAVE_ICONV -#include <iconv.h> +#include <giconv.h> #endif + + #include "kanji_conv.h" diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist index 89d6605f1c55..5511943a23f5 100644 --- a/net-im/gnomeicu/pkg-plist +++ b/net-im/gnomeicu/pkg-plist @@ -4,6 +4,7 @@ etc/CORBA/servers/GnomeICU.gnorba etc/sound/events/GnomeICU.soundlist share/gnome/applets/Network/GnomeICU.desktop share/gnome/apps/Internet/GnomeICU.desktop +share/gnome/gnomeicu/glade/main.glade share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png share/gnome/gnomeicu/icons/Default/gnomeicu-away.png @@ -83,10 +84,28 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png +share/gnome/help/gnomeicu/C/basics.html +share/gnome/help/gnomeicu/C/gnomeicu.sgml +share/gnome/help/gnomeicu/C/index.html +share/gnome/help/gnomeicu/C/ln13.html +share/gnome/help/gnomeicu/C/starting.html +share/gnome/help/gnomeicu/C/stylesheet-images/caution.gif +share/gnome/help/gnomeicu/C/stylesheet-images/home.gif +share/gnome/help/gnomeicu/C/stylesheet-images/important.gif +share/gnome/help/gnomeicu/C/stylesheet-images/next.gif +share/gnome/help/gnomeicu/C/stylesheet-images/note.gif +share/gnome/help/gnomeicu/C/stylesheet-images/prev.gif +share/gnome/help/gnomeicu/C/stylesheet-images/tip.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-blank.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-minus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-plus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/up.gif +share/gnome/help/gnomeicu/C/stylesheet-images/warning.gif share/gnome/help/gnomeicu/C/topic.dat share/gnome/pixmaps/gnome-gnomeicu.xpm share/gnome/sounds/gnomeicu/message.wav 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 @@ -100,25 +119,31 @@ 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/ms/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/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/sk/LC_MESSAGES/gnomeicu.mo share/locale/sl/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 +share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo +share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo +@dirrm share/gnome/gnomeicu/glade @dirrm share/gnome/gnomeicu/icons/Default @dirrm share/gnome/gnomeicu/icons/Eyeballs @dirrm share/gnome/gnomeicu/icons/Gradients @dirrm share/gnome/gnomeicu/icons/reDubbed @dirrm share/gnome/gnomeicu/icons @dirrm share/gnome/gnomeicu -@exec mkdir -p %D/share/gnome/help/gnomeicu/C/images -@dirrm share/gnome/help/gnomeicu/C/images +@dirrm share/gnome/help/gnomeicu/C/figures +@dirrm share/gnome/help/gnomeicu/C/stylesheet-images @dirrm share/gnome/help/gnomeicu/C @dirrm share/gnome/help/gnomeicu @dirrm share/gnome/sounds/gnomeicu diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile index 853dc427516e..9bbaa0c92fc5 100644 --- a/net-im/gnomeicu2/Makefile +++ b/net-im/gnomeicu2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomeicu -PORTVERSION= 0.96.1 -PORTREVISION= 2 +PORTVERSION= 0.98 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -15,9 +14,10 @@ MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_BZIP2= yes USE_GNOME= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -29,6 +29,10 @@ SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ -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 diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo index 2eeb3fc7ef30..55e947f5a949 100644 --- a/net-im/gnomeicu2/distinfo +++ b/net-im/gnomeicu2/distinfo @@ -1 +1 @@ -MD5 (gnomeicu-0.96.1.tar.bz2) = 1286c2d250562fc416836882b89bcdf1 +MD5 (gnomeicu-0.98.tar.gz) = aed40d1993611c3c29e12dfb2c9d5135 diff --git a/net-im/gnomeicu2/files/patch-ac b/net-im/gnomeicu2/files/patch-ac deleted file mode 100644 index c0a042787c06..000000000000 --- a/net-im/gnomeicu2/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 29 16:04:07 2000 -+++ po/Makefile.in.in Sat Jan 29 16:08:19 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/net-im/gnomeicu2/files/patch-configure b/net-im/gnomeicu2/files/patch-configure index fcb467e8a8ef..005f7f7c92d5 100644 --- a/net-im/gnomeicu2/files/patch-configure +++ b/net-im/gnomeicu2/files/patch-configure @@ -1,16 +1,29 @@ ---- configure.orig Tue Feb 27 13:35:06 2001 -+++ configure Thu Apr 19 15:50:55 2001 -@@ -5039,5 +5039,5 @@ - --ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5043: checking for iconv.h" >&5 -+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:5043: checking for giconv.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -@@ -5048,3 +5048,3 @@ +--- configure.orig Mon Dec 24 17:17:59 2001 ++++ configure Mon Dec 24 17:18:21 2001 +@@ -3017,7 +3017,7 @@ + #line 3018 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3039,7 +3039,7 @@ + #line 3040 "configure" #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3077,7 +3077,7 @@ + #include "confdefs.h" + + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> - EOF + extern + #ifdef __cplusplus + "C" diff --git a/net-im/gnomeicu2/files/patch-po::Makefile.in.in b/net-im/gnomeicu2/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..eb27fe3afb48 --- /dev/null +++ b/net-im/gnomeicu2/files/patch-po::Makefile.in.in @@ -0,0 +1,20 @@ +--- po/Makefile.in.in.orig Sun Dec 23 17:47:08 2001 ++++ po/Makefile.in.in Fri Dec 28 15:46:57 2001 +@@ -23,7 +23,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/net-im/gnomeicu2/files/patch-src::kanji_conv.c b/net-im/gnomeicu2/files/patch-src::kanji_conv.c index 497b91d16c89..a6693363b918 100644 --- a/net-im/gnomeicu2/files/patch-src::kanji_conv.c +++ b/net-im/gnomeicu2/files/patch-src::kanji_conv.c @@ -1,7 +1,11 @@ ---- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 -+++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 -@@ -32,3 +32,3 @@ +--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001 ++++ src/kanji_conv.c Mon Dec 24 12:51:21 2001 +@@ -30,7 +30,7 @@ + #include <locale.h> + #ifdef HAVE_ICONV -#include <iconv.h> +#include <giconv.h> #endif + + #include "kanji_conv.h" diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist index 89d6605f1c55..5511943a23f5 100644 --- a/net-im/gnomeicu2/pkg-plist +++ b/net-im/gnomeicu2/pkg-plist @@ -4,6 +4,7 @@ etc/CORBA/servers/GnomeICU.gnorba etc/sound/events/GnomeICU.soundlist share/gnome/applets/Network/GnomeICU.desktop share/gnome/apps/Internet/GnomeICU.desktop +share/gnome/gnomeicu/glade/main.glade share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png share/gnome/gnomeicu/icons/Default/gnomeicu-away.png @@ -83,10 +84,28 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png +share/gnome/help/gnomeicu/C/basics.html +share/gnome/help/gnomeicu/C/gnomeicu.sgml +share/gnome/help/gnomeicu/C/index.html +share/gnome/help/gnomeicu/C/ln13.html +share/gnome/help/gnomeicu/C/starting.html +share/gnome/help/gnomeicu/C/stylesheet-images/caution.gif +share/gnome/help/gnomeicu/C/stylesheet-images/home.gif +share/gnome/help/gnomeicu/C/stylesheet-images/important.gif +share/gnome/help/gnomeicu/C/stylesheet-images/next.gif +share/gnome/help/gnomeicu/C/stylesheet-images/note.gif +share/gnome/help/gnomeicu/C/stylesheet-images/prev.gif +share/gnome/help/gnomeicu/C/stylesheet-images/tip.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-blank.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-minus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-plus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/up.gif +share/gnome/help/gnomeicu/C/stylesheet-images/warning.gif share/gnome/help/gnomeicu/C/topic.dat share/gnome/pixmaps/gnome-gnomeicu.xpm share/gnome/sounds/gnomeicu/message.wav 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 @@ -100,25 +119,31 @@ 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/ms/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/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/sk/LC_MESSAGES/gnomeicu.mo share/locale/sl/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 +share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo +share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo +@dirrm share/gnome/gnomeicu/glade @dirrm share/gnome/gnomeicu/icons/Default @dirrm share/gnome/gnomeicu/icons/Eyeballs @dirrm share/gnome/gnomeicu/icons/Gradients @dirrm share/gnome/gnomeicu/icons/reDubbed @dirrm share/gnome/gnomeicu/icons @dirrm share/gnome/gnomeicu -@exec mkdir -p %D/share/gnome/help/gnomeicu/C/images -@dirrm share/gnome/help/gnomeicu/C/images +@dirrm share/gnome/help/gnomeicu/C/figures +@dirrm share/gnome/help/gnomeicu/C/stylesheet-images @dirrm share/gnome/help/gnomeicu/C @dirrm share/gnome/help/gnomeicu @dirrm share/gnome/sounds/gnomeicu diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index 853dc427516e..9bbaa0c92fc5 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomeicu -PORTVERSION= 0.96.1 -PORTREVISION= 2 +PORTVERSION= 0.98 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -15,9 +14,10 @@ MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_BZIP2= yes USE_GNOME= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -29,6 +29,10 @@ SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ -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 diff --git a/net/gnomeicu/distinfo b/net/gnomeicu/distinfo index 2eeb3fc7ef30..55e947f5a949 100644 --- a/net/gnomeicu/distinfo +++ b/net/gnomeicu/distinfo @@ -1 +1 @@ -MD5 (gnomeicu-0.96.1.tar.bz2) = 1286c2d250562fc416836882b89bcdf1 +MD5 (gnomeicu-0.98.tar.gz) = aed40d1993611c3c29e12dfb2c9d5135 diff --git a/net/gnomeicu/files/patch-ac b/net/gnomeicu/files/patch-ac deleted file mode 100644 index c0a042787c06..000000000000 --- a/net/gnomeicu/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 29 16:04:07 2000 -+++ po/Makefile.in.in Sat Jan 29 16:08:19 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/net/gnomeicu/files/patch-configure b/net/gnomeicu/files/patch-configure index fcb467e8a8ef..005f7f7c92d5 100644 --- a/net/gnomeicu/files/patch-configure +++ b/net/gnomeicu/files/patch-configure @@ -1,16 +1,29 @@ ---- configure.orig Tue Feb 27 13:35:06 2001 -+++ configure Thu Apr 19 15:50:55 2001 -@@ -5039,5 +5039,5 @@ - --ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5043: checking for iconv.h" >&5 -+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:5043: checking for giconv.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -@@ -5048,3 +5048,3 @@ +--- configure.orig Mon Dec 24 17:17:59 2001 ++++ configure Mon Dec 24 17:18:21 2001 +@@ -3017,7 +3017,7 @@ + #line 3018 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3039,7 +3039,7 @@ + #line 3040 "configure" #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3077,7 +3077,7 @@ + #include "confdefs.h" + + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> - EOF + extern + #ifdef __cplusplus + "C" diff --git a/net/gnomeicu/files/patch-po::Makefile.in.in b/net/gnomeicu/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..eb27fe3afb48 --- /dev/null +++ b/net/gnomeicu/files/patch-po::Makefile.in.in @@ -0,0 +1,20 @@ +--- po/Makefile.in.in.orig Sun Dec 23 17:47:08 2001 ++++ po/Makefile.in.in Fri Dec 28 15:46:57 2001 +@@ -23,7 +23,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/net/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/files/patch-src::kanji_conv.c index 497b91d16c89..a6693363b918 100644 --- a/net/gnomeicu/files/patch-src::kanji_conv.c +++ b/net/gnomeicu/files/patch-src::kanji_conv.c @@ -1,7 +1,11 @@ ---- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 -+++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 -@@ -32,3 +32,3 @@ +--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001 ++++ src/kanji_conv.c Mon Dec 24 12:51:21 2001 +@@ -30,7 +30,7 @@ + #include <locale.h> + #ifdef HAVE_ICONV -#include <iconv.h> +#include <giconv.h> #endif + + #include "kanji_conv.h" diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index 853dc427516e..9bbaa0c92fc5 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomeicu -PORTVERSION= 0.96.1 -PORTREVISION= 2 +PORTVERSION= 0.98 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -15,9 +14,10 @@ MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_BZIP2= yes USE_GNOME= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -29,6 +29,10 @@ SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ -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 diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo index 2eeb3fc7ef30..55e947f5a949 100644 --- a/net/gnomeicu/gnomeicu/distinfo +++ b/net/gnomeicu/gnomeicu/distinfo @@ -1 +1 @@ -MD5 (gnomeicu-0.96.1.tar.bz2) = 1286c2d250562fc416836882b89bcdf1 +MD5 (gnomeicu-0.98.tar.gz) = aed40d1993611c3c29e12dfb2c9d5135 diff --git a/net/gnomeicu/gnomeicu/files/patch-ac b/net/gnomeicu/gnomeicu/files/patch-ac deleted file mode 100644 index c0a042787c06..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 29 16:04:07 2000 -+++ po/Makefile.in.in Sat Jan 29 16:08:19 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure index fcb467e8a8ef..005f7f7c92d5 100644 --- a/net/gnomeicu/gnomeicu/files/patch-configure +++ b/net/gnomeicu/gnomeicu/files/patch-configure @@ -1,16 +1,29 @@ ---- configure.orig Tue Feb 27 13:35:06 2001 -+++ configure Thu Apr 19 15:50:55 2001 -@@ -5039,5 +5039,5 @@ - --ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5043: checking for iconv.h" >&5 -+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:5043: checking for giconv.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -@@ -5048,3 +5048,3 @@ +--- configure.orig Mon Dec 24 17:17:59 2001 ++++ configure Mon Dec 24 17:18:21 2001 +@@ -3017,7 +3017,7 @@ + #line 3018 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3039,7 +3039,7 @@ + #line 3040 "configure" #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3077,7 +3077,7 @@ + #include "confdefs.h" + + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> - EOF + extern + #ifdef __cplusplus + "C" diff --git a/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in b/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..eb27fe3afb48 --- /dev/null +++ b/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in @@ -0,0 +1,20 @@ +--- po/Makefile.in.in.orig Sun Dec 23 17:47:08 2001 ++++ po/Makefile.in.in Fri Dec 28 15:46:57 2001 +@@ -23,7 +23,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c index 497b91d16c89..a6693363b918 100644 --- a/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c +++ b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c @@ -1,7 +1,11 @@ ---- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 -+++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 -@@ -32,3 +32,3 @@ +--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001 ++++ src/kanji_conv.c Mon Dec 24 12:51:21 2001 +@@ -30,7 +30,7 @@ + #include <locale.h> + #ifdef HAVE_ICONV -#include <iconv.h> +#include <giconv.h> #endif + + #include "kanji_conv.h" diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist index 89d6605f1c55..5511943a23f5 100644 --- a/net/gnomeicu/gnomeicu/pkg-plist +++ b/net/gnomeicu/gnomeicu/pkg-plist @@ -4,6 +4,7 @@ etc/CORBA/servers/GnomeICU.gnorba etc/sound/events/GnomeICU.soundlist share/gnome/applets/Network/GnomeICU.desktop share/gnome/apps/Internet/GnomeICU.desktop +share/gnome/gnomeicu/glade/main.glade share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png share/gnome/gnomeicu/icons/Default/gnomeicu-away.png @@ -83,10 +84,28 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png +share/gnome/help/gnomeicu/C/basics.html +share/gnome/help/gnomeicu/C/gnomeicu.sgml +share/gnome/help/gnomeicu/C/index.html +share/gnome/help/gnomeicu/C/ln13.html +share/gnome/help/gnomeicu/C/starting.html +share/gnome/help/gnomeicu/C/stylesheet-images/caution.gif +share/gnome/help/gnomeicu/C/stylesheet-images/home.gif +share/gnome/help/gnomeicu/C/stylesheet-images/important.gif +share/gnome/help/gnomeicu/C/stylesheet-images/next.gif +share/gnome/help/gnomeicu/C/stylesheet-images/note.gif +share/gnome/help/gnomeicu/C/stylesheet-images/prev.gif +share/gnome/help/gnomeicu/C/stylesheet-images/tip.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-blank.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-minus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-plus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/up.gif +share/gnome/help/gnomeicu/C/stylesheet-images/warning.gif share/gnome/help/gnomeicu/C/topic.dat share/gnome/pixmaps/gnome-gnomeicu.xpm share/gnome/sounds/gnomeicu/message.wav 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 @@ -100,25 +119,31 @@ 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/ms/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/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/sk/LC_MESSAGES/gnomeicu.mo share/locale/sl/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 +share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo +share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo +@dirrm share/gnome/gnomeicu/glade @dirrm share/gnome/gnomeicu/icons/Default @dirrm share/gnome/gnomeicu/icons/Eyeballs @dirrm share/gnome/gnomeicu/icons/Gradients @dirrm share/gnome/gnomeicu/icons/reDubbed @dirrm share/gnome/gnomeicu/icons @dirrm share/gnome/gnomeicu -@exec mkdir -p %D/share/gnome/help/gnomeicu/C/images -@dirrm share/gnome/help/gnomeicu/C/images +@dirrm share/gnome/help/gnomeicu/C/figures +@dirrm share/gnome/help/gnomeicu/C/stylesheet-images @dirrm share/gnome/help/gnomeicu/C @dirrm share/gnome/help/gnomeicu @dirrm share/gnome/sounds/gnomeicu diff --git a/net/gnomeicu/pkg-plist b/net/gnomeicu/pkg-plist index 89d6605f1c55..5511943a23f5 100644 --- a/net/gnomeicu/pkg-plist +++ b/net/gnomeicu/pkg-plist @@ -4,6 +4,7 @@ etc/CORBA/servers/GnomeICU.gnorba etc/sound/events/GnomeICU.soundlist share/gnome/applets/Network/GnomeICU.desktop share/gnome/apps/Internet/GnomeICU.desktop +share/gnome/gnomeicu/glade/main.glade share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png share/gnome/gnomeicu/icons/Default/gnomeicu-away.png @@ -83,10 +84,28 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png +share/gnome/help/gnomeicu/C/basics.html +share/gnome/help/gnomeicu/C/gnomeicu.sgml +share/gnome/help/gnomeicu/C/index.html +share/gnome/help/gnomeicu/C/ln13.html +share/gnome/help/gnomeicu/C/starting.html +share/gnome/help/gnomeicu/C/stylesheet-images/caution.gif +share/gnome/help/gnomeicu/C/stylesheet-images/home.gif +share/gnome/help/gnomeicu/C/stylesheet-images/important.gif +share/gnome/help/gnomeicu/C/stylesheet-images/next.gif +share/gnome/help/gnomeicu/C/stylesheet-images/note.gif +share/gnome/help/gnomeicu/C/stylesheet-images/prev.gif +share/gnome/help/gnomeicu/C/stylesheet-images/tip.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-blank.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-minus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-plus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/up.gif +share/gnome/help/gnomeicu/C/stylesheet-images/warning.gif share/gnome/help/gnomeicu/C/topic.dat share/gnome/pixmaps/gnome-gnomeicu.xpm share/gnome/sounds/gnomeicu/message.wav 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 @@ -100,25 +119,31 @@ 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/ms/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/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/sk/LC_MESSAGES/gnomeicu.mo share/locale/sl/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 +share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo +share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo +@dirrm share/gnome/gnomeicu/glade @dirrm share/gnome/gnomeicu/icons/Default @dirrm share/gnome/gnomeicu/icons/Eyeballs @dirrm share/gnome/gnomeicu/icons/Gradients @dirrm share/gnome/gnomeicu/icons/reDubbed @dirrm share/gnome/gnomeicu/icons @dirrm share/gnome/gnomeicu -@exec mkdir -p %D/share/gnome/help/gnomeicu/C/images -@dirrm share/gnome/help/gnomeicu/C/images +@dirrm share/gnome/help/gnomeicu/C/figures +@dirrm share/gnome/help/gnomeicu/C/stylesheet-images @dirrm share/gnome/help/gnomeicu/C @dirrm share/gnome/help/gnomeicu @dirrm share/gnome/sounds/gnomeicu diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index 853dc427516e..9bbaa0c92fc5 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomeicu -PORTVERSION= 0.96.1 -PORTREVISION= 2 +PORTVERSION= 0.98 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -15,9 +14,10 @@ MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_BZIP2= yes USE_GNOME= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -29,6 +29,10 @@ SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ -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 diff --git a/net/gnomeicu2/distinfo b/net/gnomeicu2/distinfo index 2eeb3fc7ef30..55e947f5a949 100644 --- a/net/gnomeicu2/distinfo +++ b/net/gnomeicu2/distinfo @@ -1 +1 @@ -MD5 (gnomeicu-0.96.1.tar.bz2) = 1286c2d250562fc416836882b89bcdf1 +MD5 (gnomeicu-0.98.tar.gz) = aed40d1993611c3c29e12dfb2c9d5135 diff --git a/net/gnomeicu2/files/patch-ac b/net/gnomeicu2/files/patch-ac deleted file mode 100644 index c0a042787c06..000000000000 --- a/net/gnomeicu2/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 29 16:04:07 2000 -+++ po/Makefile.in.in Sat Jan 29 16:08:19 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/net/gnomeicu2/files/patch-configure b/net/gnomeicu2/files/patch-configure index fcb467e8a8ef..005f7f7c92d5 100644 --- a/net/gnomeicu2/files/patch-configure +++ b/net/gnomeicu2/files/patch-configure @@ -1,16 +1,29 @@ ---- configure.orig Tue Feb 27 13:35:06 2001 -+++ configure Thu Apr 19 15:50:55 2001 -@@ -5039,5 +5039,5 @@ - --ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:5043: checking for iconv.h" >&5 -+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:5043: checking for giconv.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -@@ -5048,3 +5048,3 @@ +--- configure.orig Mon Dec 24 17:17:59 2001 ++++ configure Mon Dec 24 17:18:21 2001 +@@ -3017,7 +3017,7 @@ + #line 3018 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3039,7 +3039,7 @@ + #line 3040 "configure" #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -3077,7 +3077,7 @@ + #include "confdefs.h" + + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> - EOF + extern + #ifdef __cplusplus + "C" diff --git a/net/gnomeicu2/files/patch-po::Makefile.in.in b/net/gnomeicu2/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..eb27fe3afb48 --- /dev/null +++ b/net/gnomeicu2/files/patch-po::Makefile.in.in @@ -0,0 +1,20 @@ +--- po/Makefile.in.in.orig Sun Dec 23 17:47:08 2001 ++++ po/Makefile.in.in Fri Dec 28 15:46:57 2001 +@@ -23,7 +23,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/net/gnomeicu2/files/patch-src::kanji_conv.c b/net/gnomeicu2/files/patch-src::kanji_conv.c index 497b91d16c89..a6693363b918 100644 --- a/net/gnomeicu2/files/patch-src::kanji_conv.c +++ b/net/gnomeicu2/files/patch-src::kanji_conv.c @@ -1,7 +1,11 @@ ---- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 -+++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 -@@ -32,3 +32,3 @@ +--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001 ++++ src/kanji_conv.c Mon Dec 24 12:51:21 2001 +@@ -30,7 +30,7 @@ + #include <locale.h> + #ifdef HAVE_ICONV -#include <iconv.h> +#include <giconv.h> #endif + + #include "kanji_conv.h" diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist index 89d6605f1c55..5511943a23f5 100644 --- a/net/gnomeicu2/pkg-plist +++ b/net/gnomeicu2/pkg-plist @@ -4,6 +4,7 @@ etc/CORBA/servers/GnomeICU.gnorba etc/sound/events/GnomeICU.soundlist share/gnome/applets/Network/GnomeICU.desktop share/gnome/apps/Internet/GnomeICU.desktop +share/gnome/gnomeicu/glade/main.glade share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png share/gnome/gnomeicu/icons/Default/gnomeicu-away.png @@ -83,10 +84,28 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png +share/gnome/help/gnomeicu/C/basics.html +share/gnome/help/gnomeicu/C/gnomeicu.sgml +share/gnome/help/gnomeicu/C/index.html +share/gnome/help/gnomeicu/C/ln13.html +share/gnome/help/gnomeicu/C/starting.html +share/gnome/help/gnomeicu/C/stylesheet-images/caution.gif +share/gnome/help/gnomeicu/C/stylesheet-images/home.gif +share/gnome/help/gnomeicu/C/stylesheet-images/important.gif +share/gnome/help/gnomeicu/C/stylesheet-images/next.gif +share/gnome/help/gnomeicu/C/stylesheet-images/note.gif +share/gnome/help/gnomeicu/C/stylesheet-images/prev.gif +share/gnome/help/gnomeicu/C/stylesheet-images/tip.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-blank.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-minus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/toc-plus.gif +share/gnome/help/gnomeicu/C/stylesheet-images/up.gif +share/gnome/help/gnomeicu/C/stylesheet-images/warning.gif share/gnome/help/gnomeicu/C/topic.dat share/gnome/pixmaps/gnome-gnomeicu.xpm share/gnome/sounds/gnomeicu/message.wav 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 @@ -100,25 +119,31 @@ 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/ms/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/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/sk/LC_MESSAGES/gnomeicu.mo share/locale/sl/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 +share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo +share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo +@dirrm share/gnome/gnomeicu/glade @dirrm share/gnome/gnomeicu/icons/Default @dirrm share/gnome/gnomeicu/icons/Eyeballs @dirrm share/gnome/gnomeicu/icons/Gradients @dirrm share/gnome/gnomeicu/icons/reDubbed @dirrm share/gnome/gnomeicu/icons @dirrm share/gnome/gnomeicu -@exec mkdir -p %D/share/gnome/help/gnomeicu/C/images -@dirrm share/gnome/help/gnomeicu/C/images +@dirrm share/gnome/help/gnomeicu/C/figures +@dirrm share/gnome/help/gnomeicu/C/stylesheet-images @dirrm share/gnome/help/gnomeicu/C @dirrm share/gnome/help/gnomeicu @dirrm share/gnome/sounds/gnomeicu |