[110850] trunk/dports/irc

raimue at macports.org raimue at macports.org
Sun Sep 8 05:00:31 PDT 2013


Revision: 110850
          https://trac.macports.org/changeset/110850
Author:   raimue at macports.org
Date:     2013-09-08 05:00:31 -0700 (Sun, 08 Sep 2013)
Log Message:
-----------
irc/hexchat:
New port, successor to xchat2, closes #40256

Modified Paths:
--------------
    trunk/dports/irc/hexchat/Portfile

Added Paths:
-----------
    trunk/dports/irc/hexchat/
    trunk/dports/irc/hexchat/files/patch-cflags.diff
    trunk/dports/irc/hexchat/files/patch-gobject.diff
    trunk/dports/irc/hexchat/files/patch-nls.diff
    trunk/dports/irc/hexchat/files/patch-strptime.diff

Removed Paths:
-------------
    trunk/dports/irc/hexchat/files/patch-glib-2.32.diff
    trunk/dports/irc/hexchat/files/patch-gmodule.diff
    trunk/dports/irc/hexchat/files/patch-gtk2.19.7.diff

Modified: trunk/dports/irc/hexchat/Portfile
===================================================================
--- trunk/dports/irc/xchat2/Portfile	2013-09-08 06:31:51 UTC (rev 110849)
+++ trunk/dports/irc/hexchat/Portfile	2013-09-08 12:00:31 UTC (rev 110850)
@@ -3,48 +3,66 @@
 
 PortSystem          1.0
 
-name                xchat2
-version             2.8.8
-revision            6
+name                hexchat
+version             2.9.5
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          irc
-maintainers         nomaintainer
-description         GTK+2 IRC client
-homepage            http://www.xchat.org/
+maintainers         raimue \
+                    openmaintainer
+description         IRC client based on XChat
+homepage            http://hexchat.github.io/
 platforms           darwin
 license             GPL-2+
 
 long_description \
-    XChat2 is a graphical IRC client based on GTK2 that has \
-    many features and can be scripted with Perl and/or Python.
+    HexChat is a graphical IRC client using GTK2 that has \
+    many features and can be scripted with Perl and/or Python. \
+    It is based on XChat, but unlike its predecessor completely \
+    free software.
 
-master_sites        http://xchat.org/files/source/${branch}/
-patch_sites         http://xchat.org/files/source/${branch}/patches/
+master_sites        http://dl.hexchat.net/hexchat/
+use_xz yes
 
-distname            xchat-${version}
-use_bzip2           yes
+checksums           rmd160  c3c3c0b777853e6f3984dae99c60e149a5ffef9b \
+                    sha256  11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d
 
-checksums           md5     6775c44f38e84d06c06c336b32c4a452 \
-                    sha1    a4ac161e4e40f4bbabc492675a1ff4380dba8d68 \
-                    rmd160  1bc3e0ff00e15c83588dd21a3ef3e8e34f953331
-
 depends_build       port:pkgconfig
-depends_lib         port:gtk2 port:libsexy path:bin/perl:perl5 port:libpng
+depends_lib         port:gtk2 \
+                    port:libsexy \
+                    path:bin/perl:perl5 \
+                    port:libpng \
+                    port:libnotify
 
-patchfiles          patch-gtk2.19.7.diff patch-glib-2.32.diff patch-gmodule.diff
+#patchfiles          patch-gtk2.19.7.diff patch-glib-2.32.diff patch-gmodule.diff
+
+patchfiles          patch-cflags.diff \
+                    patch-gobject.diff \
+                    patch-nls.diff \
+                    patch-strptime.diff
 patch.pre_args      -p1
 
-post-extract {
-    system "touch ${worksrcpath}/NEWS"
-    system "touch ${worksrcpath}/ABOUT-NLS"
-}
+#post-extract {
+#    system "touch ${worksrcpath}/NEWS"
+#    system "touch ${worksrcpath}/ABOUT-NLS"
+#}
 
-use_autoconf        yes
+use_autoreconf        yes
 
-configure.args      --disable-python --disable-mmx --enable-ipv6 \
-                    --disable-openssl --disable-dependency-tracking
+configure.args      --disable-dependency-tracking \
+                    --disable-python \
+                    --disable-mmx \
+                    --enable-ipv6 \
+                    --disable-openssl \
+                    --enable-libnotify \
+                    --enable-spell=libsexy \
+                    --enable-socks
+
+# gettextize has not been run on the distributed tarball and cannot be run non-interactively
+configure.args-append --disable-nls
 universal_variant   no
 
+default_variants    +ssl
+
 variant xft conflicts quartz description "Enable Xft2 font support" {
     configure.args-append --enable-xft
 }
@@ -80,5 +98,6 @@
     configure.env pythonpath="${prefix}/bin/python2.7"
 }
 
-livecheck.url       http://www.xchat.org/files/source/${branch}/?S=D
-livecheck.regex     xchat-(\[0-9.\]+)${extract.suffix}
+livecheck.type  regex
+livecheck.url   http://hexchat.github.io/downloads.html
+livecheck.regex ${name}-(\\d+(\\.\\d+)+)\\.tar

Added: trunk/dports/irc/hexchat/files/patch-cflags.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-cflags.diff	                        (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-cflags.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -0,0 +1,25 @@
+Upstream: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-irc/hexchat/files/hexchat-2.9.5-cflags.patch?revision=1.1
+
+From: Julian Ospald <hasufell at gentoo.org>
+Date: Wed Apr  3 17:55:10 UTC 2013
+Subject: build system
+
+respect system CFLAGS
+
+--- hexchat-2.9.5/configure.ac
++++ hexchat-2.9.5/configure.ac
+@@ -807,14 +807,6 @@
+ 	if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ 		CFLAGS="$CFLAGS -Wall"
+ 	fi
+-	if test "$system" = "Linux" -o "$system" = "FreeBSD"; then
+-		if test -z "`echo "$CFLAGS" | grep "\-pipe" 2> /dev/null`" ; then
+-			CFLAGS="$CFLAGS -pipe"
+-		fi
+-	fi
+-	if test -z "`echo "$CFLAGS" | grep "\-g " 2> /dev/null`" ; then
+-		CFLAGS="$CFLAGS -g"
+-	fi
+ fi
+ 
+ dnl does this compiler support -Wno-pointer-sign ?

Deleted: trunk/dports/irc/hexchat/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-glib-2.32.diff	2013-09-08 06:31:51 UTC (rev 110849)
+++ trunk/dports/irc/hexchat/files/patch-glib-2.32.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -1,51 +0,0 @@
-diff -Naurp ./src/common/servlist.c ./src/common/servlist.c
---- ./src/common/servlist.c	2010-05-16 00:24:26.000000000 -0700
-+++ ./src/common/servlist.c	2012-04-09 14:02:12.000000000 -0700
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "cfgfiles.h"
- #include "fe.h"
-diff -Naurp ./src/common/text.c ./src/common/text.c
---- ./src/common/text.c	2010-05-29 19:14:41.000000000 -0700
-+++ ./src/common/text.c	2012-04-09 14:02:12.000000000 -0700
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-diff -Naurp ./src/common/util.c ./src/common/util.c
---- ./src/common/util.c	2009-08-16 02:40:16.000000000 -0700
-+++ ./src/common/util.c	2012-04-09 14:02:12.000000000 -0700
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-diff -Naurp ./src/common/xchat.h ./src/common/xchat.h
---- ./src/common/xchat.h	2009-08-16 02:40:16.000000000 -0700
-+++ ./src/common/xchat.h	2012-04-09 14:01:05.000000000 -0700
-@@ -1,10 +1,6 @@
- #include "../../config.h"
- 
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h>			/* need time_t */
- 
- #ifndef XCHAT_H

Deleted: trunk/dports/irc/hexchat/files/patch-gmodule.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-gmodule.diff	2013-09-08 06:31:51 UTC (rev 110849)
+++ trunk/dports/irc/hexchat/files/patch-gmodule.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -1,15 +0,0 @@
---- a/configure.in.orig	2013-02-10 20:06:08.000000000 -0800
-+++ a/configure.in	2013-02-10 20:09:57.000000000 -0800
-@@ -182,8 +182,10 @@ dnl ************************************
- dnl ** GNOME ************************************************************
- dnl *********************************************************************
- 
--GUI_LIBS="$GUI_LIBS $GTK_LIBS"
--GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
-+PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
-+
-+GUI_LIBS="$GUI_LIBS $GTK_LIBS $GMODULE_LIBS"
-+GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS $GMODULE_CFLAGS"
- 
- gnome=no
- #if test "$gnome" = yes; then

Added: trunk/dports/irc/hexchat/files/patch-gobject.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-gobject.diff	                        (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-gobject.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -0,0 +1,33 @@
+Upstream: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-irc/hexchat/files/hexchat-2.9.5-gobject.patch?revision=1.1
+
+From: Julian Ospald <hasufell at gentoo.org>
+Date: Wed May  8 23:22:23 UTC 2013
+Subject: fix build time error
+
+https://bugs.gentoo.org/show_bug.cgi?id=469122
+https://github.com/hexchat/hexchat/pull/580
+
+--- hexchat-2.9.5/configure.ac
++++ hexchat-2.9.5/configure.ac
+@@ -190,9 +190,10 @@
+ if test "$glib" = no; then
+ 	AC_MSG_ERROR(Cannot find GLib!)
+ fi
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [], [AC_MSG_ERROR(Cannot find gobject-2.0!)])
+ 
+-COMMON_CFLAGS="$GLIB_CFLAGS"
+-COMMON_LIBS="$GLIB_LIBS"
++COMMON_CFLAGS="$GLIB_CFLAGS $GOBJECT_CFLAGS"
++COMMON_LIBS="$GLIB_LIBS $GOBJECT_LIBS"
+ COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0"
+ 
+ dnl *********************************************************************
+@@ -213,8 +214,6 @@
+ 
+ if test "$gtkfe" != yes; then
+ 	gnome=no
+-	COMMON_LIBS="$GLIB_LIBS"
+-	COMMON_CFLAGS="$GLIB_CFLAGS"
+ fi
+ 
+ dnl *********************************************************************

Deleted: trunk/dports/irc/hexchat/files/patch-gtk2.19.7.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff	2013-09-08 06:31:51 UTC (rev 110849)
+++ trunk/dports/irc/hexchat/files/patch-gtk2.19.7.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -1,17 +0,0 @@
-# http://sourceforge.net/tracker/?func=detail&aid=2974436&group_id=239&atid=100239
-Index: xchat-2.8.8/src/fe-gtk/maingui.c
-===================================================================
---- ./src/fe-gtk/maingui.c.orig
-+++ ./src/fe-gtk/maingui.c
-@@ -2585,9 +2585,9 @@ mg_rightpane_cb (GtkPaned *pane, GParamS
- {
- 	int handle_size;
- 
--/*	if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1)))
-+/*	if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1)))
- 		return;
--	if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2)))
-+	if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2)))
- 		return;*/
- 
- 	gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL);

Added: trunk/dports/irc/hexchat/files/patch-nls.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-nls.diff	                        (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-nls.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -0,0 +1,21 @@
+--- hexchat-2.9.5/configure.ac
++++ hexchat-2.9.5/configure.ac
+@@ -968,8 +968,6 @@
+ plugins/doat/Makefile
+ plugins/fishlim/Makefile
+ plugins/sysinfo/Makefile
+-intl/Makefile
+-po/Makefile.in
+ man/Makefile
+ ])
+ dnl plugins/tcl/Makefile
+--- hexchat-2.9.5/Makefile.am
++++ hexchat-2.9.5/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = po intl src plugins man share
++SUBDIRS = src plugins man share
+ 
+ EXTRA_DIST = autogen.sh
+ 

Added: trunk/dports/irc/hexchat/files/patch-strptime.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-strptime.diff	                        (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-strptime.diff	2013-09-08 12:00:31 UTC (rev 110850)
@@ -0,0 +1,23 @@
+This custom strptime() conflicts with strptime() provided by the system in time.h.
+--- hexchat-2.9.5/src/fe-gtk/banlist.c.orig	2013-09-08 13:20:35.000000000 +0200
++++ hexchat-2.9.5/src/fe-gtk/banlist.c	2013-09-08 13:20:52.000000000 +0200
+@@ -583,7 +583,7 @@
+  *		#define DATE_FORMAT "%a %b %d %T %Y"
+  */
+ static void
+-strptime (char *ti, struct tm *tm)
++xstrptime (char *ti, struct tm *tm)
+ {
+ 	/* Expect something like "Sat Mar 16 21:24:27 2013" */
+ 	static char *mon[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+@@ -625,8 +625,8 @@
+ 
+ 	gtk_tree_model_get(model, a, DATE_COLUMN, &time1, -1);
+ 	gtk_tree_model_get(model, b, DATE_COLUMN, &time2, -1);
+-	strptime (time1, &tm1);
+-	strptime (time2, &tm2);
++	xstrptime (time1, &tm1);
++	xstrptime (time2, &tm2);
+ 	t1 = mktime (&tm1);
+ 	t2 = mktime (&tm2);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130908/e0dcbd4b/attachment.html>


More information about the macports-changes mailing list