freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 2.9.6.1

Browse Source 
- Change maintainer email gmx.ch --> FreeBSD.org
- USES gmake desktop-file-utils pkgconfig
- Use the new format for LIB_DEPENDS
- Change CONFIGURE_ARGS
- Add DOCS and FISHLIM Options
- Remove OPENSSL Option, use --enable-openssl
- Remove OPENSSL from default Options
- Reword Options description
- Add dependencies for audio/libcanberra and textproc/en-aspell
- Simplify Option handling
- Change REINPLACE_CMD that not install for Gnome3 hexchat.appdata.xml
- Mute dir install
- Remove unneeded patches

Removed file(s):
- files/patch-configure.ac
- files/patch-src-fe-gtk-Makefile.am
- files/patch-src-fe-gtk-banlist.c
- files/patch-src-fe-gtk-custom-list.h
- files/patch-src-fe-gtk-fe-gtk.c
- files/patch-src__common__dbus__dbus-client.c

Approved by:	wg/pawel (mentors)
This commit is contained in:
Rusmir Dusko
2013-09-16 20:55:03 +00:00
parent 4615ad6c88
commit d4eb5633fd
9 changed files with 48 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
irc/hexchat/Makefile
View File

@@ -2,23 +2,25 @@
# $FreeBSD$
PORTNAME= hexchat
PORTVERSION= 2.9.5
PORTVERSION= 2.9.6.1
CATEGORIES= irc gnome ipv6
MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/
MAINTAINER= nemysis@gmx.ch
MAINTAINER= nemysis@FreeBSD.org
COMMENT= IRC chat program with GTK and Text Frontend
LICENSE= GPLv2
LIB_DEPENDS= proxy:${PORTSDIR}/net/libproxy
LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy \
libcanberra.so:${PORTSDIR}/audio/libcanberra
USE_XZ= yes
USES= desktop-file-utils pathfix pkgconfig gmake
USES= gmake desktop-file-utils pkgconfig
USE_GNOME= gtk20 libxml2
USE_AUTOTOOLS= automake autoconf libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-gtkfe --disable-sysinfo
CONFIGURE_ARGS+=--enable-openssl --enable-gtkfe --disable-sysinfo \
--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
INSTALLS_ICONS= yes
LDFLAGS+= -pthread
@@ -27,138 +29,92 @@ MAN1= hexchat.1
PORTDOCS= *
OPTIONS_DEFINE= NLS SOCKS XFT OPENSSL TEXTFE PYTHON PERL DOAT DBUS NOTIFY
OPTIONS_DEFINE= DOCS NLS SOCKS XFT TEXTFE PYTHON PERL DOAT FISHLIM DBUS NOTIFY
OPTIONS_RADIO= SPELL
OPTIONS_RADIO_SPELL= LIBSEXY GTKSPELL STATIC
OPTIONS_DEFAULT= SOCKS XFT OPENSSL PERL DOAT DBUS NOTIFY LIBSEXY
OPTIONS_DEFAULT= SOCKS XFT PERL DOAT DBUS NOTIFY LIBSEXY
TEXTFE_DESC= Build the Text frontend
DOAT_DESC= Build the Do At plugin
OPTIONS_SUB= yes
TEXTFE_DESC= Text frontend
DOAT_DESC= Do At plugin
FISHLIM_DESC= FiSHLiM plugin
STATIC_DESC= Spell checking embedded in the binary
LIBSEXY_DESC= Spell checking through Libsexy
GTKSPELL_DESC= Spell checking through GTKSpell
LIBSEXY_DESC= Spell checking support via Libsexy
GTKSPELL_DESC= Spell checking support via GTKSpell
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell
SOCKS_LIB_DEPENDS= libsocks.so:${PORTSDIR}/net/dante
SOCKS_CONFIGURE_ENABLE= socks
XFT_CONFIGURE_ENABLE= xft
TEXTFE_CONFIGURE_ENABLE= textfe
PYTHON_CONFIGURE_ENABLE= python
PERL_CONFIGURE_ENABLE= perl
DOAT_CONFIGURE_ENABLE= doat
FISHLIM_CONFIGURE_ENABLE= fishlim
DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
DBUS_CONFIGURE_ENABLE= dbus
NOTIFY_RUN_DEPENDS= notify-send:${PORTSDIR}/devel/libnotify
NOTIFY_CONFIGURE_ENABLE= libnotify
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
.if ! ${PORT_OPTIONS:MLIBSEXY} && ! ${PORT_OPTIONS:MGTKSPELL} && ! ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+=--enable-spell=none
.endif
.if ${PORT_OPTIONS:MLIBSEXY} || ${PORT_OPTIONS:MGTKSPELL} || ${PORT_OPTIONS:MSTATIC}
RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/en-aspell
.endif
.if ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+=--enable-spell=static
.endif
.if ${PORT_OPTIONS:MLIBSEXY}
LIB_DEPENDS+= sexy:${PORTSDIR}/x11-toolkits/libsexy
CONFIGURE_ARGS+=--enable-spell=libsexy
.endif
.if ${PORT_OPTIONS:MGTKSPELL}
LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell
CONFIGURE_ARGS+=--enable-spell=gtkspell
.endif
.if ${PORT_OPTIONS:MSOCKS}
LIB_DEPENDS+= socks:${PORTSDIR}/net/dante
CONFIGURE_ARGS+=--enable-socks
.else
CONFIGURE_ARGS+=--disable-socks
.endif
.if ${PORT_OPTIONS:MXFT}
USE_XORG+= xft
CONFIGURE_ARGS+=--enable-xft
.else
CONFIGURE_ARGS+=--disable-xft
.endif
.if ${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS+=--enable-openssl
PLIST_SUB+= OPENSSL=""
.else
CONFIGURE_ARGS+=--disable-openssl
PLIST_SUB+= OPENSSL="@comment "
.endif
.if ${PORT_OPTIONS:MTEXTFE}
CONFIGURE_ARGS+=--enable-textfe
PLIST_SUB+= TEXTFE=""
.else
CONFIGURE_ARGS+=--disable-textfe
PLIST_SUB+= TEXTFE="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
USE_PYTHON= yes
CONFIGURE_ARGS+=--enable-python
PLIST_SUB+= PYTHON=""
.else
CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
.if ${PORT_OPTIONS:MPERL}
USES+= perl5
CONFIGURE_ARGS+=--enable-perl
PLIST_SUB+= PERL=""
.else
CONFIGURE_ARGS+=--disable-perl
PLIST_SUB+= PERL="@comment "
.endif
.if ${PORT_OPTIONS:MDOAT}
CONFIGURE_ARGS+=--enable-doat
PLIST_SUB+= DOAT=""
.else
CONFIGURE_ARGS+=--disable-doat
PLIST_SUB+= DOAT="@comment "
.endif
.if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
CONFIGURE_ARGS+=--enable-dbus
USE_GNOME+= gconf2
GCONF_SCHEMAS+= apps_hexchat_url_handler.schemas
PLIST_SUB+= DBUS=""
.else
CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= DBUS="@comment "
.endif
.if ${PORT_OPTIONS:MNOTIFY}
RUN_DEPENDS+= notify-send:${PORTSDIR}/devel/libnotify
CONFIGURE_ARGS+=--enable-libnotify
PLIST_SUB+= NOTIFY=""
.else
CONFIGURE_ARGS+=--disable-libnotify
PLIST_SUB+= NOTIFY="@comment "
.endif
post-patch:
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' ${WRKSRC}/autogen.sh
@${REINPLACE_CMD} -e 's|po intl|po|g' ${WRKSRC}/Makefile.am
@${REINPLACE_CMD} -e '/^appdata_DATA/s|hexchat.appdata.xml||' \
${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in
pre-configure:
@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
post-install:
${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/share/doc/*.md ${DOCSDIR}
.endif
@(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a)
# @(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a)
.include <bsd.port.mk>

4
irc/hexchat/distinfo
View File

@@ -1,2 +1,2 @@
SHA256 (hexchat-2.9.5.tar.xz) = 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d
SIZE (hexchat-2.9.5.tar.xz) = 1309112
SHA256 (hexchat-2.9.6.1.tar.xz) = 6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470
SIZE (hexchat-2.9.6.1.tar.xz) = 1768392

41
irc/hexchat/files/patch-configure.ac
View File

@@ -1,41 +0,0 @@
--- configure.ac.orig 2013-04-02 01:07:55.000000000 +0000
+++ configure.ac 2013-06-02 13:38:33.000000000 +0000
@@ -191,9 +191,9 @@
AC_MSG_ERROR(Cannot find GLib!)
fi
-COMMON_CFLAGS="$GLIB_CFLAGS"
+COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
COMMON_LIBS="$GLIB_LIBS"
-COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0"
+COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0"
dnl *********************************************************************
dnl ** GTK **************************************************************
@@ -201,7 +201,7 @@
# we might get undefined macro without this test
if test "$gtkfe" = yes ; then
- AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
+ AM_PATH_GTK_2_0(2.14.0, havegtk=yes, havegtk=no)
if test "$havegtk" = no; then
gtkfe=no
@@ -222,7 +222,7 @@
dnl *********************************************************************
GUI_LIBS="$GUI_LIBS $GTK_LIBS"
-GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
+GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES"
#if test "$gnome" = yes; then
# AC_PATH_PROG(pkgconfigpath, pkg-config)
@@ -684,7 +684,7 @@
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.0.0, [
AC_DEFINE(HAVE_ISO_CODES)
AC_DEFINE(USE_LIBSEXY)
- GUI_CFLAGS="$GUI_CFLAGS -I/usr/include/libxml2"
+ GUI_CFLAGS="$GUI_CFLAGS $LIBXML2_CFLAGS"
LIBS="$LIBS -lxml2"
], [
AC_MSG_ERROR(Cannot find libxml2!)

11
irc/hexchat/files/patch-src-fe-gtk-Makefile.am
View File

@@ -1,11 +0,0 @@
--- src/fe-gtk/Makefile.am.orig 2013-04-02 03:07:55.000000000 +0200
+++ src/fe-gtk/Makefile.am 2013-04-04 21:02:35.000000000 +0200
@@ -2,7 +2,7 @@
bin_PROGRAMS = hexchat
-AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)

30
irc/hexchat/files/patch-src-fe-gtk-banlist.c
View File

@@ -1,30 +0,0 @@
--- src/fe-gtk/banlist.c.orig 2013-04-02 03:07:55.000000000 +0200
+++ src/fe-gtk/banlist.c 2013-04-04 20:31:29.000000000 +0200
@@ -37,6 +37,7 @@
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkcheckbutton.h>
#include <gtk/gtktable.h>
#include <glib.h>
@@ -583,7 +584,7 @@
* #define DATE_FORMAT "%a %b %d %T %Y"
*/
static void
-strptime (char *ti, struct tm *tm)
+banlist_strptime (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 +626,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);
+ banlist_strptime (time1, &tm1);
+ banlist_strptime (time2, &tm2);
t1 = mktime (&tm1);
t2 = mktime (&tm2);

11
irc/hexchat/files/patch-src-fe-gtk-custom-list.h
View File

@@ -1,11 +0,0 @@
--- src/fe-gtk/custom-list.h.orig 2013-04-02 03:07:55.000000000 +0200
+++ src/fe-gtk/custom-list.h 2013-04-04 21:09:51.000000000 +0200
@@ -22,6 +22,8 @@
#include <gtk/gtk.h>
+GType custom_list_get_type (void);
+
/* Some boilerplate GObject defines. 'klass' is used
* instead of 'class', because 'class' is a C++ keyword */

11
irc/hexchat/files/patch-src-fe-gtk-fe-gtk.c
View File

@@ -1,11 +0,0 @@
--- src/fe-gtk/fe-gtk.c.orig 2013-04-02 03:07:55.000000000 +0200
+++ src/fe-gtk/fe-gtk.c 2013-04-04 20:46:15.000000000 +0200
@@ -134,7 +134,7 @@
{"no-plugins", 'n', 0, G_OPTION_ARG_NONE, &arg_skip_plugins, N_("Don't auto load any plugins"), NULL},
{"plugindir", 'p', 0, G_OPTION_ARG_NONE, &arg_show_autoload, N_("Show plugin/script auto-load directory"), NULL},
{"configdir", 'u', 0, G_OPTION_ARG_NONE, &arg_show_config, N_("Show user config directory"), NULL},
- {"url", 0, 0, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel URL"), "URL"},
+ {"url", 0, 0, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel?key URL"), "URL"},
#ifndef WIN32 /* uses DBUS */
{"command", 'c', 0, G_OPTION_ARG_STRING, &arg_command, N_("Execute command:"), "COMMAND"},
{"existing", 'e', 0, G_OPTION_ARG_NONE, &arg_existing, N_("Open URL or execute command in an existing HexChat"), NULL},

16
irc/hexchat/files/patch-src__common__dbus__dbus-client.c
View File

@@ -1,16 +0,0 @@
--- ./src/common/dbus/dbus-client.c.orig 2013-04-02 01:07:55.000000000 +0000
+++ ./src/common/dbus/dbus-client.c 2013-04-13 13:50:32.000000000 +0000
@@ -53,11 +53,13 @@
GError *error = NULL;
char *command = NULL;
+#if !GLIB_CHECK_VERSION (2, 32, 0)
/* GnomeVFS >=2.15 uses D-Bus and threads, so threads should be
* initialised before opening for the first time a D-Bus connection */
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
+#endif
dbus_g_thread_init ();
/* if there is nothing to do, return now. */

9
irc/hexchat/pkg-plist
View File

@@ -1,16 +1,17 @@
bin/hexchat
%%TEXTFE%%bin/hexchat-text
include/hexchat-plugin.h
%%OPENSSL%%lib/hexchat/plugins/checksum.la
%%OPENSSL%%lib/hexchat/plugins/checksum.so
lib/hexchat/plugins/checksum.la
lib/hexchat/plugins/checksum.so
%%DOAT%%lib/hexchat/plugins/doat.la
%%DOAT%%lib/hexchat/plugins/doat.so
%%OPENSSL%%lib/hexchat/plugins/fishlim.la
%%OPENSSL%%lib/hexchat/plugins/fishlim.so
%%FISHLIM%%lib/hexchat/plugins/fishlim.la
%%FISHLIM%%lib/hexchat/plugins/fishlim.so
%%PERL%%lib/hexchat/plugins/perl.la
%%PERL%%lib/hexchat/plugins/perl.so
%%PYTHON%%lib/hexchat/plugins/python.la
%%PYTHON%%lib/hexchat/plugins/python.so
libdata/pkgconfig/hexchat-plugin.pc
share/applications/hexchat.desktop
%%DBUS%%share/dbus-1/services/org.hexchat.service.service
share/icons/hicolor/48x48/apps/hexchat.png