[Midnightbsd-cvs] mports: irc/xchat: Updated to 2.8.4.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Aug 28 22:26:24 EDT 2007 

Log Message:
-----------
Updated to 2.8.4.

Modified Files:
--------------
    mports/irc/xchat:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/irc/xchat/files:
        patch-configure (r1.1 -> r1.2)

Added Files:
-----------
    mports/irc/xchat/files:
        patch-xc284-scrollbmkdir (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/irc/xchat/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lirc/xchat/pkg-plist -Lirc/xchat/pkg-plist -u -r1.1 -r1.2
--- irc/xchat/pkg-plist
+++ irc/xchat/pkg-plist
@@ -8,6 +8,8 @@
 share/applications/xchat.desktop
 %%DBUS%%share/dbus-1/services/org.xchat.service.service
 share/locale/be/LC_MESSAGES/xchat.mo
+share/locale/ca/LC_MESSAGES/xchat.mo
+share/locale/cs/LC_MESSAGES/xchat.mo
 share/locale/de/LC_MESSAGES/xchat.mo
 share/locale/el/LC_MESSAGES/xchat.mo
 share/locale/es/LC_MESSAGES/xchat.mo
@@ -19,6 +21,7 @@
 share/locale/ja/LC_MESSAGES/xchat.mo
 share/locale/ko/LC_MESSAGES/xchat.mo
 share/locale/lt/LC_MESSAGES/xchat.mo
+share/locale/mk/LC_MESSAGES/xchat.mo
 share/locale/nl/LC_MESSAGES/xchat.mo
 share/locale/pa/LC_MESSAGES/xchat.mo
 share/locale/pt/LC_MESSAGES/xchat.mo
@@ -26,23 +29,12 @@
 share/locale/sq/LC_MESSAGES/xchat.mo
 share/locale/sr/LC_MESSAGES/xchat.mo
 share/locale/sv/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/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
 @dirrmtry share/applications
- at dirrmtry share/pixmaps
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat
- at dirrmtry share/locale/zh_TW/LC_MESSAGES
- at dirrmtry share/locale/zh_TW
- at dirrmtry share/locale/sr/LC_MESSAGES
- at dirrmtry share/locale/sr
- at dirrmtry share/locale/ko/LC_MESSAGES
- at dirrmtry share/locale/ko
- at dirrmtry share/locale/gl/LC_MESSAGES
- at dirrmtry share/locale/gl
- at dirrmtry share/locale/fi/LC_MESSAGES
- at dirrmtry share/locale/fi
- at dirrmtry share/locale/el/LC_MESSAGES
- at dirrmtry share/locale/el
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/irc/xchat/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lirc/xchat/Makefile -Lirc/xchat/Makefile -u -r1.2 -r1.3
--- irc/xchat/Makefile
+++ irc/xchat/Makefile
@@ -3,69 +3,42 @@
 # Whom:				Joe Marcus Clarke <marcus at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/irc/xchat/Makefile,v 1.122 2006/11/28 14:44:41 pav Exp $
-#    $MCom: ports-stable/irc/xchat/Makefile,v 1.1 2006/10/26 08:33:06 marcus Exp $
+# $FreeBSD: ports/irc/xchat/Makefile,v 1.133 2007/07/28 18:35:48 marcus Exp $
+#   $MCom: ports-stable/irc/xchat/Makefile,v 1.1 2006/10/26 08:33:06 marcus Exp $
 #
 
 PORTNAME=	xchat
-PORTVERSION=	2.6.8
-PORTREVISION=	1
+PORTVERSION=	2.8.4
 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}
+		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports at MidnightBSD.org
+MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
+LICENSE=	gpl2
 
-OPTIONS=	PYTHON "Enable Python support" Off \
-		SOCKS "Enable SOCKS5 proxy support" Off \
-		TCL "Enable TCL suppoer" Off \
-		PERL "Enable perl support" On \
-		DBUS "Enable dbus support" On \
-		GTKSPELL "Enable spell-checking" On \
+CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
+USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-nls \
-		--enable-ipv6
-
-CONFLICTS=	xchat-1*
-
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-CONFIGURE_ARGS+=	--enable-socks
-.endif
-
-# openssl in now default in configure
+CONFIGURE_ARGS=	--enable-ipv6
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		PYTHON=""
-.else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON="@comment "
-.endif
+OPTIONS=	DBUS "Enable DBUS support" on \
+		GTKSPELL "Enable spell check support using gtkspell" on \
+		LIBSEXY "Enable spell check support using libsexy" off \
+		NOTIFY "Depend on libnotify for notifications" off \
+		PERL "Enable Perl support" on \
+		PYTHON "Enable Python support" off \
+		TCL "Enable TCL support" off \
+		SOCKS "Build with socks5 support" off
 
-.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
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
@@ -78,14 +51,30 @@
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if !defined(WITHOUT_GTKSPELL)
+.if defined(WITH_GTKSPELL)
+.if defined(WITH_LIBSEXY)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
 LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--enable-spell=gtkspell
-.else
-CONFIGURE_ARGS+=--disable-spell
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_LIBSEXY)
+.if defined(WITH_GTKSPELL)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
+LIB_DEPENDS+=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
+CONFIGURE_ARGS+=--enable-spell=libsexy
+.endif
+
+.if !defined(WITH_GTKSPELL) && !defined(WITH_LIBSEXY)
+CONFIGURE_ARGS+=--enable-spell=none
+.endif
+
+.if defined(WITH_NOTIFY)
+RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify \
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+.endif
 
 .if defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
@@ -96,8 +85,40 @@
 PLIST_SUB+=	PERL=""
 .endif
 
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.4
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.4" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${LOCALBASE}/lib/tcl8.4"
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
+.endif
+
+.if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=--enable-socks
+.endif
+
 post-patch:
 	@${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:
+	@${MKDIR} ${PREFIX}/lib/xchat/plugins
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/irc/xchat/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lirc/xchat/distinfo -Lirc/xchat/distinfo -u -r1.1 -r1.2
--- irc/xchat/distinfo
+++ irc/xchat/distinfo
@@ -1,3 +1,3 @@
-MD5 (xchat-2.6.8.tar.bz2) = 940fd8560a4e4e5d905e53207c6cbb87
-SHA256 (xchat-2.6.8.tar.bz2) = 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f
-SIZE (xchat-2.6.8.tar.bz2) = 1184287
+MD5 (xchat-2.8.4.tar.bz2) = 66d60febc62a01bafac9bb3a35fb37ae
+SHA256 (xchat-2.8.4.tar.bz2) = f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
+SIZE (xchat-2.8.4.tar.bz2) = 1370883
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/irc/xchat/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lirc/xchat/files/patch-configure -Lirc/xchat/files/patch-configure -u -r1.1 -r1.2
--- irc/xchat/files/patch-configure
+++ irc/xchat/files/patch-configure
@@ -1,8 +1,8 @@
---- 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.  */
+--- configure.orig	Wed Jul  4 19:41:43 2007
++++ configure	Wed Jul  4 19:42:45 2007
+@@ -26802,12 +26802,12 @@
  #include <libintl.h>
+ $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
 -extern int *_nl_domain_bindings;
 +extern int *libintl_nl_domain_bindings;
@@ -10,8 +10,8 @@
  main ()
  {
  bindtextdomain ("", "");
--return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
    ;
    return 0;
  }
--- /dev/null
+++ irc/xchat/files/patch-xc284-scrollbmkdir
@@ -0,0 +1,33 @@
+#
+# Fix creation of ~/.xchat2/scrollback/ paths.
+#
+--- src/common/text.c	15 Jun 2007 03:53:42 -0000	1.89
++++ src/common/text.c	8 Jul 2007 08:59:02 -0000
+@@ -49,20 +49,25 @@
+ 
+ 
+ static void mkdir_p (char *dir);
++static char *log_create_filename (char *channame);
+ 
+ 
+ static char *
+ scrollback_get_filename (session *sess, char *buf, int max)
+ {
+-	char *net;
++	char *net, *chan;
+ 
+ 	net = server_get_network (sess->server, FALSE);
+ 	if (!net)
+ 		return NULL;
+ 
+-	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, "");
+ 	mkdir_p (buf);
+ 
++	chan = log_create_filename (sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, chan);
++	free (chan);
++
+ 	return buf;
+ }
+

More information about the Midnightbsd-cvs mailing list