pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat Replace the outdated "xchat" package (version 1.8...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/df849b3d1493
branches:  trunk
changeset: 495273:df849b3d1493
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Jun 06 11:35:39 2005 +0000

description:
Replace the outdated "xchat" package (version 1.8.11) with the
"xchat2" package (version 2.4.3).

diffstat:

 chat/Makefile               |    3 +-
 chat/xchat/DESCR            |    5 +-
 chat/xchat/Makefile         |   44 ++++-----
 chat/xchat/Makefile.common  |   21 +++++
 chat/xchat/PLIST            |   41 ++++-----
 chat/xchat/distinfo         |   11 +-
 chat/xchat/options.mk       |   37 +++++---
 chat/xchat/patches/patch-aa |   22 -----
 chat/xchat/patches/patch-ad |   13 ---
 chat/xchat/patches/patch-ae |  178 --------------------------------------------
 chat/xchat2/DESCR           |    2 -
 chat/xchat2/Makefile        |   33 --------
 chat/xchat2/Makefile.common |   21 -----
 chat/xchat2/PLIST           |   46 -----------
 chat/xchat2/distinfo        |    5 -
 chat/xchat2/options.mk      |   32 -------
 16 files changed, 91 insertions(+), 423 deletions(-)

diffs (truncated from 637 to 300 lines):

diff -r aae1c52947fa -r df849b3d1493 chat/Makefile
--- a/chat/Makefile     Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/Makefile     Mon Jun 06 11:35:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2005/05/18 22:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2005/06/06 11:35:39 tron Exp $
 #
 
 COMMENT=       Communication programs
@@ -91,7 +91,6 @@
 SUBDIR+=       xaric
 SUBDIR+=       xchat
 SUBDIR+=       xchat-systray-integration
-SUBDIR+=       xchat2
 SUBDIR+=       ymessenger
 SUBDIR+=       ysm
 SUBDIR+=       zenicb
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/DESCR
--- a/chat/xchat/DESCR  Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/xchat/DESCR  Mon Jun 06 11:35:39 2005 +0000
@@ -1,3 +1,2 @@
-XChat is a graphical IRC client that runs on UNIX like systems. It
-uses the GTK+ toolkit for graphical abstraction.  (Use the chat/xchat2
-package for XChat version 2 using the GTK2 toolkit.)
+XChat is a graphical IRC client that runs on UNIX-like systems.
+It uses the GTK 2 library as its graphics toolkit.
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/Makefile
--- a/chat/xchat/Makefile       Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/xchat/Makefile       Mon Jun 06 11:35:39 2005 +0000
@@ -1,37 +1,33 @@
-# $NetBSD: Makefile,v 1.30 2005/06/02 21:48:42 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/06/06 11:35:39 tron Exp $
+
+MAINTAINER=            tron%NetBSD.org@localhost
 
-DISTNAME=      xchat-1.8.11
-PKGREVISION=   11
-CATEGORIES=    chat x11
-MASTER_SITES=  ${HOMEPAGE}files/source/1.8/
-EXTRACT_SUFX=  .tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=    tron%NetBSD.org@localhost
-HOMEPAGE=      http://xchat.org/
-COMMENT=       X11 (X Window System) IRC client, using the GTK+ toolkit
+COMMENT=       X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=     YES
 
-USE_DIRS+=             gnome1-1.5
+CONFLICTS=             xchat-gnome-[0-9]*
+
+USE_DIRS+=             xdg-1.1
 USE_PKGLOCALEDIR=      YES
-USE_X11BASE=           YES
-USE_TOOLS+=            gmake grep perl
-CONFIGURE_ARGS+=       --enable-python
 
-CONFLICTS+=            xchat-gnome-[0-9]*
+CONFIGURE_ARGS+=       --enable-textfe
+CONFIGURE_ARGS+=       --enable-tcl=no
+CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-python
 
-GNU_CONFIGURE=         YES
-CONFIGURE_ENV+=                ac_cv_path_perlpath=${PERL5} pythonpath=${PYTHONBIN}
-CONFIGURE_ARGS+=       --disable-gnome
-CONFIGURE_ARGS+=       --disable-zvt
+LDFLAGS.IRIX+=         -lX11
+LDFLAGS.Darwin+=       -lX11
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+post-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/lib/xchat/plugins
+
 .include "../../mk/bsd.pkg.mk"
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat/Makefile.common        Mon Jun 06 11:35:39 2005 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.40 2005/06/06 11:35:39 tron Exp $
+#
+# Please do not merge this file into "Makefile" because it is used by
+# packages in "pkgsrc-wip".
+
+DISTNAME=      xchat-2.4.3
+CATEGORIES=    chat gnome
+MASTER_SITES=  http://www.xchat.org/files/source/2.4/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER?=   minskim%NetBSD.org@localhost
+HOMEPAGE=      http://www.xchat.org/
+
+DISTINFO_FILE= ${.CURDIR}/../../chat/xchat2/distinfo
+
+GNU_CONFIGURE= YES
+USE_LIBTOOL=   YES
+USE_TOOLS+=    gmake
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/PLIST
--- a/chat/xchat/PLIST  Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/xchat/PLIST  Mon Jun 06 11:35:39 2005 +0000
@@ -1,49 +1,46 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/27 12:54:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/06/06 11:35:39 tron Exp $
 bin/xchat
 bin/xchat-text
-share/doc/xchat/xchat-1.html
-share/doc/xchat/xchat-10.html
-share/doc/xchat/xchat-2.html
-share/doc/xchat/xchat-3.html
-share/doc/xchat/xchat-4.html
-share/doc/xchat/xchat-5.html
-share/doc/xchat/xchat-6.html
-share/doc/xchat/xchat-7.html
-share/doc/xchat/xchat-8.html
-share/doc/xchat/xchat-9.html
-share/doc/xchat/xchat.html
-share/gnome/apps/Internet/xchat.desktop
+share/applications/xchat.desktop
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
-@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
-@dirrm share/doc/xchat
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
+@exec ${MKDIR} %D/lib/xchat/plugins
+@dirrm lib/xchat/plugins
+@dirrm lib/xchat
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/distinfo
--- a/chat/xchat/distinfo       Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/xchat/distinfo       Mon Jun 06 11:35:39 2005 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.22 2005/02/23 15:59:14 agc Exp $
+$NetBSD: distinfo,v 1.23 2005/06/06 11:35:39 tron Exp $
 
-SHA1 (xchat-1.8.11.tar.bz2) = 331afd74bc20797c0dec1a7e32fe014efe6cdc0a
-RMD160 (xchat-1.8.11.tar.bz2) = 5055190942e28933e33b9f520a6811b86241daae
-Size (xchat-1.8.11.tar.bz2) = 850453 bytes
-SHA1 (patch-aa) = 1e9c5159fb241f79df26f8a4ce5f897faaa9052f
-SHA1 (patch-ad) = 7dec0bd4107febc923031b80b75a1a8a36b0255b
-SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
+SHA1 (xchat-2.4.3.tar.bz2) = 9cc9ed984d271feffca8ee0cee53404c05a10843
+RMD160 (xchat-2.4.3.tar.bz2) = 2222632f2c3db2eac260547e952047bcc450b731
+Size (xchat-2.4.3.tar.bz2) = 1259520 bytes
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/options.mk
--- a/chat/xchat/options.mk     Mon Jun 06 09:05:25 2005 +0000
+++ b/chat/xchat/options.mk     Mon Jun 06 11:35:39 2005 +0000
@@ -1,21 +1,32 @@
-# $NetBSD: options.mk,v 1.1 2005/06/02 21:48:42 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/06/06 11:35:39 tron Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.xchat
-PKG_SUPPORTED_OPTIONS= inet6 socks5 ssl
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xchat2
+PKG_SUPPORTED_OPTIONS= inet6 ssl socks5
 PKG_SUGGESTED_OPTIONS= ssl
-PKG_OPTIONS_LEGACY_VARS+=      XCHAT_USE_SSL:ssl
+PKG_OPTIONS_LEGACY_OPTS+=      socks:socks5
 
 .include "../../mk/bsd.options.mk"
 
+###
+### Use OpenSSL libraries for connecting to ircs servers
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.      include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-openssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=       --enable-openssl=no
+.endif
+
+###
+### Support for connecting thru SOCKS servers
+###
+.if !empty(PKG_OPTIONS:Msocks5)
+CONFIGURE_ARGS+=       --enable-socks
+.endif
+
+###
+### IPv6 support.
+###
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-openssl=${SSLBASE}
-.endif
-
-.if !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+=       --enable-socks
-.endif
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/patches/patch-aa
--- a/chat/xchat/patches/patch-aa       Mon Jun 06 09:05:25 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/04/14 21:27:25 tron Exp $
-
---- src/common/server.c.orig   Tue Dec  3 08:06:31 2002
-+++ src/common/server.c        Wed Apr 14 23:18:45 2004
-@@ -837,7 +837,7 @@
-       struct sock5_connect1 sc1;
-       unsigned char *sc2;
-       unsigned int packetlen, addrlen;
--      unsigned char buf[10];
-+      unsigned char buf[260];
- 
-       sc1.version = 5;
-       sc1.nmethods = 1;
-@@ -878,7 +878,7 @@
-       {
-               if (recv (sok, buf, 1, 0) != 1)
-                       return 1;
--              packetlen = buf[0] + 2;
-+              packetlen = buf[0] + 2; /* can't exceed 260 */
-               if (recv (sok, buf, packetlen, 0) != packetlen)
-                       return 1;
-       }
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/patches/patch-ad
--- a/chat/xchat/patches/patch-ad       Mon Jun 06 09:05:25 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2003/01/12 21:49:07 tron Exp $
-
---- Makefile.in.orig    Sun Jan 12 00:53:53 2003
-+++ Makefile.in Sun Jan 12 00:54:15 2003
-@@ -131,7 +131,7 @@
- icondir = $(datadir)/pixmaps
- 
- util_DATA = xchat.desktop
--utildir = $(sysconfdir)/X11/applnk/Internet
-+utildir = $(datadir)/gnome/apps/Internet
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -r aae1c52947fa -r df849b3d1493 chat/xchat/patches/patch-ae
--- a/chat/xchat/patches/patch-ae       Mon Jun 06 09:05:25 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/07/19 05:22:52 mycroft Exp $
-
---- src/common/perl.c.orig     Fri Jul 19 05:14:48 2002
-+++ src/common/perl.c  Fri Jul 19 05:15:59 2002



Home | Main Index | Thread Index | Old Index