diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-28 12:35:56 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-28 12:35:56 +0000 |
commit | 89c9d6285cc0d8154ce6b9073bf173c4e52f21b8 (patch) | |
tree | e22bc4957427f450ca2c1649e9a5f940d37b346b /irc/xchat | |
parent | games/gnomegames2 -> games/gnome-games (diff) |
- Rename ports
irc/xchat -> irc/xchat1
irc/xchat2 -> irc/xchat
Notes
Notes:
svn path=/head/; revision=163692
Diffstat (limited to 'irc/xchat')
-rw-r--r-- | irc/xchat/Makefile | 142 | ||||
-rw-r--r-- | irc/xchat/distinfo | 6 | ||||
-rw-r--r-- | irc/xchat/files/patch-configure | 20 | ||||
-rw-r--r-- | irc/xchat/files/patch-fixtabcomp | 24 | ||||
-rw-r--r-- | irc/xchat/files/patch-src::common::cfgfiles.c | 11 | ||||
-rw-r--r-- | irc/xchat/pkg-descr | 7 | ||||
-rw-r--r-- | irc/xchat/pkg-plist | 63 |
7 files changed, 144 insertions, 129 deletions
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index f58a714fd494..4e13846c47dd 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -1,88 +1,112 @@ -# New ports collection makefile for: xchat -# Date created: 17 Nov 1998 -# Whom: Jim Mock <jim@FreeBSD.org> +# New ports collection makefile for: xchat2 +# Date created: 17 Aug 2002 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= xchat -PORTVERSION= 1.8.11 -PORTREVISION= 6 -CATEGORIES+= irc gnome ipv6 -MASTER_SITES= http://xchat.org/files/source/1.8/ \ - http://xchat.linuxpower.org/files/source/1.8/ +PORTNAME= xchat +PORTVERSION= 2.6.2 +CATEGORIES= irc gnome ipv6 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://xchat.org/files/source/2.6/ +MASTER_SITE_SUBDIR= ${PORTNAME:S|2||} +DISTNAME= xchat-${PORTVERSION} -MAINTAINER?= ports@FreeBSD.org -COMMENT= An X11 IRC client using the GTK+ toolkit, and optionally, GNOME +MAINTAINER= gnome@FreeBSD.org +COMMENT= An X11 IRC client using the GTK+ 2 toolkit -# This port has a slave port japanese/xchat. Do not carelessly overwrite -# the variables or the targets defined in it. When you need to, please -# contact its maintainer. +USE_X_PREFIX= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gtk20 +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --enable-nls \ + --enable-ipv6 -USE_X_PREFIX= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_GNOME= gtk12 -WANT_GNOME= yes -GNU_CONFIGURE= yes -# Assign with `+=' for slave ports -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl -liconv" -CONFIGURE_ARGS+= --without-included-gettext \ - --enable-nls \ - --enable-ipv6 \ - --datadir="${PREFIX}/share" \ - --enable-perl +CONFLICTS= xchat-1* -.if defined(WITH_SSL) -USE_OPENSSL= YES -CONFIGURE_ARGS+= --enable-openssl +.if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 +CONFIGURE_ARGS+= --enable-socks .endif +# openssl in now default in configure + .if defined(WITH_PYTHON) -USE_PYTHON= yes +USE_PYTHON= yes CONFIGURE_ARGS+= --enable-python +PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+= --disable-python +PLIST_SUB+= PYTHON="@comment " .endif -.include <bsd.port.pre.mk> - -.if defined(WITH_SOCKS) -# Assign with `+=' for slave ports -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -CONFIGURE_ARGS+= --enable-socks +.if defined(WITH_TCL) +LIB_DEPENDS+= tcl83.1:${PORTSDIR}/lang/tcl83 +CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ + -I${LOCALBASE}/include/tcl8.3" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \ + -L${LOCALBASE}/lib/tcl8.3" +PLIST_SUB+= TCL="" +.else +CONFIGURE_ARGS+=--enable-tcl=no +PLIST_SUB+= TCL="@comment " .endif -.if defined(WITH_TRANSPARENCY) -BUILD_DEPENDS+= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf -CONFIGURE_ARGS+= --enable-gdk-pixbuf +.if !defined(WITHOUT_DBUS) +LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+=--enable-dbus +USE_GNOME+= gconf2 +GCONF_SCHEMAS= apps_xchat_url_handler.schemas +PLIST_SUB+= DBUS="" +.else +CONFIGURE_ARGS+=--disable-dbus +PLIST_SUB+= DBUS="@comment " .endif -.if ${HAVE_GNOME:Mimlib}!="" -USE_GNOME= imlib -CONFIGURE_ARGS+= --enable-gnome --enable-panel --enable-gdk-pixbuf \ - --enable-zvt -MAKE_ARGS= icondir="${PREFIX}/share/gnome/pixmaps" \ - utildir="${PREFIX}/share/gnome/apps/Internet" +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL) +CONFIGURE_ARGS+=--disable-perl +PLIST_SUB+= PERL="@comment " .else -CONFIGURE_ARGS+= --disable-gnome --disable-zvt +USE_PERL5= yes +CONFIGURE_ARGS+=--enable-perl +PLIST_SUB+= PERL="" +.endif + +pre-everything:: +.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) || !defined(WITHOUT_PERL) || !defined(WITHOUT_DBUS) + @${ECHO_MSG} "You may specify the following on the command line:" + @${ECHO_MSG} "" +.endif +.if !defined(WITH_PYTHON) + @${ECHO_MSG} "WITH_PYTHON=yes for Python support" +.endif +.if !defined(WITH_SOCKS) + @${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support" +.endif +.if !defined(WITH_TCL) + @${ECHO_MSG} "WITH_TCL=yes for tcl support" +.endif +.if !defined(WITHOUT_PERL) + @${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support" +.endif +.if !defined(WITHOUT_DBUS) + @${ECHO_MSG} "WITHOUT_DBUS=yes to disable dbus support" .endif post-patch: - @${PERL} -pi \ - -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ + @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure +# Create plugins directory even when no plugins are installed post-install: -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" - @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat - ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat -.endif + @${MKDIR} ${PREFIX}/lib/xchat/plugins .include <bsd.port.post.mk> diff --git a/irc/xchat/distinfo b/irc/xchat/distinfo index 0e2f124dcc51..913c1c244f4c 100644 --- a/irc/xchat/distinfo +++ b/irc/xchat/distinfo @@ -1,3 +1,3 @@ -MD5 (xchat-1.8.11.tar.bz2) = 951f5b2fe2d5deef08f7f519414072a1 -SHA256 (xchat-1.8.11.tar.bz2) = b3d457e014649e4b25ba5241e6dde600ffe2c8c6c4d462b8d4392b9f38b5abed -SIZE (xchat-1.8.11.tar.bz2) = 850453 +MD5 (xchat-2.6.2.tar.bz2) = 6b534baf9a4df6bf23d7d16f7e4eb379 +SHA256 (xchat-2.6.2.tar.bz2) = a184d42a8130e5a4151e0190ba45dc3440c49270818fec02f35bca932da64f9c +SIZE (xchat-2.6.2.tar.bz2) = 1046910 diff --git a/irc/xchat/files/patch-configure b/irc/xchat/files/patch-configure index 1d6df50fa5f2..a48d5cbc869a 100644 --- a/irc/xchat/files/patch-configure +++ b/irc/xchat/files/patch-configure @@ -1,11 +1,17 @@ ---- configure.orig Wed Jan 15 23:38:08 2003 -+++ configure Wed Jan 15 23:38:08 2003 -@@ -6017,4 +6017,4 @@ - #include "confdefs.h" +--- configure.orig Sun Apr 2 19:17:32 2006 ++++ configure Sun Apr 2 19:18:07 2006 +@@ -24741,12 +24741,12 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; +extern int *libintl_nl_domain_bindings; -@@ -6031,2 +6031,2 @@ --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings -+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + int + main () + { + bindtextdomain ("", ""); +-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ++return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + ; + return 0; + } diff --git a/irc/xchat/files/patch-fixtabcomp b/irc/xchat/files/patch-fixtabcomp new file mode 100644 index 000000000000..9498dd636f93 --- /dev/null +++ b/irc/xchat/files/patch-fixtabcomp @@ -0,0 +1,24 @@ +# Fixes two tab-nick-completion bugs: +# 1. Crash when you type space-tab +# 2. Critical glib warning when completion in a dialog-tab. +--- src/fe-gtk/fkeys.c.orig Thu Aug 5 07:49:06 2004 ++++ src/fe-gtk/fkeys.c Mon Aug 16 22:54:58 2004 +@@ -1427,7 +1427,7 @@ + skip_len++; + } + else +- cursor_pos = g_utf8_pointer_to_offset(text, g_utf8_offset_to_pointer(ch, 1)); ++ return 2; + } + + comp = skip_len; +@@ -1608,7 +1608,8 @@ + list = list->next; + } + PrintText (sess, buf); +- g_completion_free(gcomp); ++ if (gcomp) ++ g_completion_free(gcomp); + return 2; + } + /* Only one matching entry */ diff --git a/irc/xchat/files/patch-src::common::cfgfiles.c b/irc/xchat/files/patch-src::common::cfgfiles.c deleted file mode 100644 index d33af116ddda..000000000000 --- a/irc/xchat/files/patch-src::common::cfgfiles.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/cfgfiles.c.orig Mon Mar 29 15:46:01 2004 -+++ src/common/cfgfiles.c Mon Mar 29 15:46:20 2004 -@@ -600,7 +600,7 @@ - - prefs.autoresume = 1; - prefs.show_away_once = 1; -- prefs.show_away_message = 1; -+ prefs.show_away_message = 0; - prefs.indent_pixels = 80; - prefs.dialog_indent_pixels = 80; - prefs.indent_nicks = 1; diff --git a/irc/xchat/pkg-descr b/irc/xchat/pkg-descr index 8fb4ab1a14da..f93552a5ae8d 100644 --- a/irc/xchat/pkg-descr +++ b/irc/xchat/pkg-descr @@ -1,8 +1,5 @@ XChat is a graphical IRC client. It requires a computer running a -UNIX-like OS and the X Window System (X11), and the GTK library. It can -also (optionally) take advantage of GNOME and use Perl and Python -scripts. +UNIX-like OS and the X Window System (X11), and the GTK 2 library. It can +also use Perl and (optionally) Python scripts. WWW: http://xchat.org/ - -- Jim <jim@FreeBSD.org> diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist index feeacf15b1e9..3589681dec50 100644 --- a/irc/xchat/pkg-plist +++ b/irc/xchat/pkg-plist @@ -1,55 +1,30 @@ bin/xchat -bin/xchat-text -%%NOGNOME:%%etc/X11/applnk/Internet/xchat.desktop -%%PORTDOCS%%share/doc/xchat/ChangeLog -%%PORTDOCS%%share/doc/xchat/README -%%PORTDOCS%%share/doc/xchat/xchat-1.html -%%PORTDOCS%%share/doc/xchat/xchat-10.html -%%PORTDOCS%%share/doc/xchat/xchat-2.html -%%PORTDOCS%%share/doc/xchat/xchat-3.html -%%PORTDOCS%%share/doc/xchat/xchat-4.html -%%PORTDOCS%%share/doc/xchat/xchat-5.html -%%PORTDOCS%%share/doc/xchat/xchat-6.html -%%PORTDOCS%%share/doc/xchat/xchat-7.html -%%PORTDOCS%%share/doc/xchat/xchat-8.html -%%PORTDOCS%%share/doc/xchat/xchat-9.html -%%PORTDOCS%%share/doc/xchat/xchat.html -%%PORTDOCS%%share/doc/xchat/xchat.sgml -%%GNOME:%%share/gnome/apps/Internet/xchat.desktop -%%GNOME:%%share/gnome/pixmaps/xchat.png -%%PORTDOCS%%@dirrm share/doc/xchat -share/locale/ca/LC_MESSAGES/xchat.mo -share/locale/cs/LC_MESSAGES/xchat.mo -share/locale/da/LC_MESSAGES/xchat.mo +bin/xchat-remote +%%DBUS%%lib/xchat/plugins/dbus.la +%%DBUS%%lib/xchat/plugins/dbus.so +%%PERL%%lib/xchat/plugins/perl.la +%%PERL%%lib/xchat/plugins/perl.so +%%PYTHON%%lib/xchat/plugins/python.la +%%PYTHON%%lib/xchat/plugins/python.so +%%TCL%%lib/xchat/plugins/tcl.la +%%TCL%%lib/xchat/plugins/tcl.so +share/applications/xchat.desktop share/locale/de/LC_MESSAGES/xchat.mo share/locale/el/LC_MESSAGES/xchat.mo -share/locale/es/LC_MESSAGES/xchat.mo share/locale/fi/LC_MESSAGES/xchat.mo share/locale/fr/LC_MESSAGES/xchat.mo -share/locale/he/LC_MESSAGES/xchat.mo +share/locale/gl/LC_MESSAGES/xchat.mo share/locale/hu/LC_MESSAGES/xchat.mo -share/locale/it/LC_MESSAGES/xchat.mo share/locale/ja/LC_MESSAGES/xchat.mo share/locale/ko/LC_MESSAGES/xchat.mo -share/locale/lt/LC_MESSAGES/xchat.mo -share/locale/lv/LC_MESSAGES/xchat.mo share/locale/nl/LC_MESSAGES/xchat.mo -share/locale/no/LC_MESSAGES/xchat.mo -share/locale/pl/LC_MESSAGES/xchat.mo -share/locale/pt/LC_MESSAGES/xchat.mo -share/locale/pt_BR/LC_MESSAGES/xchat.mo -share/locale/ro/LC_MESSAGES/xchat.mo -share/locale/ru/LC_MESSAGES/xchat.mo -share/locale/sk/LC_MESSAGES/xchat.mo -share/locale/sl/LC_MESSAGES/xchat.mo -share/locale/sr/LC_MESSAGES/xchat.mo +share/locale/pa/LC_MESSAGES/xchat.mo +share/locale/sq/LC_MESSAGES/xchat.mo share/locale/sv/LC_MESSAGES/xchat.mo -share/locale/tr/LC_MESSAGES/xchat.mo -share/locale/uk/LC_MESSAGES/xchat.mo share/locale/vi/LC_MESSAGES/xchat.mo -share/locale/zh_CN/LC_MESSAGES/xchat.mo -share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo -%%NOGNOME:%%share/pixmaps/xchat.png -%%NOGNOME:%%@dirrmtry etc/X11/applnk/Internet -%%NOGNOME:%%@dirrmtry etc/X11/applnk -%%NOGNOME:%%@dirrmtry etc/X11 +share/locale/zh_TW/LC_MESSAGES/xchat.mo +share/pixmaps/xchat.png +@dirrmtry share/applications +@exec mkdir -p %D/lib/xchat/plugins +@dirrm lib/xchat/plugins +@dirrm lib/xchat |