[112558] trunk/dports/irc/hexchat
raimue at macports.org
raimue at macports.org
Fri Oct 25 20:21:18 PDT 2013
Revision: 112558
https://trac.macports.org/changeset/112558
Author: raimue at macports.org
Date: 2013-10-25 20:21:18 -0700 (Fri, 25 Oct 2013)
Log Message:
-----------
irc/hexchat:
Update to version 2.9.6.1.
Remove no longer necessary patches, add +nls variant, remove unsupported
+python2x variants and add +python3x variants.
Modified Paths:
--------------
trunk/dports/irc/hexchat/Portfile
Removed Paths:
-------------
trunk/dports/irc/hexchat/files/patch-cflags.diff
trunk/dports/irc/hexchat/files/patch-gobject.diff
trunk/dports/irc/hexchat/files/patch-strptime.diff
Modified: trunk/dports/irc/hexchat/Portfile
===================================================================
--- trunk/dports/irc/hexchat/Portfile 2013-10-26 02:32:36 UTC (rev 112557)
+++ trunk/dports/irc/hexchat/Portfile 2013-10-26 03:21:18 UTC (rev 112558)
@@ -4,7 +4,7 @@
PortSystem 1.0
name hexchat
-version 2.9.5
+version 2.9.6.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories irc
maintainers raimue \
@@ -23,8 +23,8 @@
master_sites http://dl.hexchat.net/hexchat/
use_xz yes
-checksums rmd160 c3c3c0b777853e6f3984dae99c60e149a5ffef9b \
- sha256 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d
+checksums rmd160 256c23e638743486d9c64968d32b6bc18dc10301 \
+ sha256 6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470
depends_build port:pkgconfig
depends_lib port:gtk2 \
@@ -33,22 +33,9 @@
port:libpng \
port:libnotify
-#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"
-#}
-
-use_autoreconf yes
-
configure.args --disable-dependency-tracking \
+ --enable-minimal-flags \
+ --disable-nls \
--disable-python \
--disable-mmx \
--enable-ipv6 \
@@ -57,45 +44,44 @@
--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
+default_variants +ssl +nls
variant xft conflicts quartz description "Enable Xft2 font support" {
configure.args-append --enable-xft
}
variant ssl description "Enable SSL using openssl" {
- configure.args-delete --disable-openssl
- configure.args-append --enable-openssl
+ configure.args-replace --disable-openssl --enable-openssl
depends_lib-append port:openssl
}
+variant nls description "Enable localization support" {
+ configure.args-replace --disable-nls --enable-nls
+ depends_lib-append port:gettext
+}
+
variant quartz conflicts xft {
configure.args-append --disable-xlib
}
-variant python25 description "Enable Python plugin, using python25" conflicts python26 python27 {
- configure.args-delete --disable-python
- configure.args-append --enable-python
- depends_lib-append port:python25
- configure.env pythonpath="${prefix}/bin/python2.5"
+variant python27 description "Enable Python plugin, using python27" conflicts python33 python34 {
+ configure.args-replace --disable-python --enable-python=python2.7
+ depends_lib-append port:python27
+ configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig/
}
-variant python26 description "Enable Python plugin, using python26" conflicts python25 python27 {
- configure.args-delete --disable-python
- configure.args-append --enable-python
- depends_lib-append port:python26
- configure.env pythonpath="${prefix}/bin/python2.6"
+variant python33 description "Enable Python plugin, using python33" conflicts python27 python34 {
+ configure.args-replace --disable-python --enable-python=python3.3
+ depends_lib-append port:python33
+ configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.3/lib/pkgconfig/
}
-variant python27 description "Enable Python plugin, using python27" conflicts python25 python26 {
- configure.args-delete --disable-python
- configure.args-append --enable-python
- depends_lib-append port:python27
- configure.env pythonpath="${prefix}/bin/python2.7"
+variant python34 description "Enable Python plugin, using python34" conflicts python27 python33 {
+ configure.args-replace --disable-python --enable-python=python3.4
+ depends_lib-append port:python34
+ configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.4/lib/pkgconfig/
}
livecheck.type regex
Deleted: trunk/dports/irc/hexchat/files/patch-cflags.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-cflags.diff 2013-10-26 02:32:36 UTC (rev 112557)
+++ trunk/dports/irc/hexchat/files/patch-cflags.diff 2013-10-26 03:21:18 UTC (rev 112558)
@@ -1,25 +0,0 @@
-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-gobject.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-gobject.diff 2013-10-26 02:32:36 UTC (rev 112557)
+++ trunk/dports/irc/hexchat/files/patch-gobject.diff 2013-10-26 03:21:18 UTC (rev 112558)
@@ -1,33 +0,0 @@
-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-strptime.diff
===================================================================
--- trunk/dports/irc/hexchat/files/patch-strptime.diff 2013-10-26 02:32:36 UTC (rev 112557)
+++ trunk/dports/irc/hexchat/files/patch-strptime.diff 2013-10-26 03:21:18 UTC (rev 112558)
@@ -1,23 +0,0 @@
-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/20131025/6e1a200d/attachment.html>
More information about the macports-changes
mailing list