diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 9a858edde58a..ad9091594210 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -1,67 +1,66 @@ # New ports collection makefile for: gaim # Date created: 26 Mar 1999 # Whom: Jim Mock # # $FreeBSD$ # PORTNAME= gaim -PORTVERSION= 0.59.5 -PORTREVISION= 2 +PORTVERSION= 0.59.6 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER?= marcus@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gtk12 WANT_GNOME= yes USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gaim.1 GNOME_PANEL2= ${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc .if !defined(WITHOUT_GDK_PIXBUF) # Note, gdk-pixbuf is needed for buddy icon support. USE_GNOME+= gdkpixbuf .endif .include .if ${HAVE_GNOME:Mlibpanel}!= "" && !exists(${GNOME_PANEL2}) USE_GNOME+= libpanel RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --enable-panel PKGNAMESUFFIX= -gnome PLIST_SUB+= PANEL:="" NOPANEL:="@comment " .else CONFIGURE_ARGS+= --disable-gnome PLIST_SUB+= PANEL:="@comment " NOPANEL:="" .endif .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound .else PKGNAMESUFFIX= -esound .endif .else CONFIGURE_ARGS+= --disable-esd .endif post-patch: @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure .include diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo index a8eac9ebee62..d232a4b104e9 100644 --- a/net-im/gaim/distinfo +++ b/net-im/gaim/distinfo @@ -1 +1 @@ -MD5 (gaim-0.59.5.tar.bz2) = ac67eebcc80320199d44191f1f802254 +MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f diff --git a/net-im/gaim/files/patch-src_buddy.c b/net-im/gaim/files/patch-src_buddy.c deleted file mode 100644 index e2d13a254362..000000000000 --- a/net-im/gaim/files/patch-src_buddy.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/buddy.c.orig Thu Oct 17 12:11:51 2002 -+++ src/buddy.c Thu Oct 17 16:58:49 2002 -@@ -2231,7 +2231,13 @@ - if (blist_options & OPT_BLIST_SHOW_IDLETIME) - gtk_widget_show(bs->idle); - -- style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ if (gtk_rc_get_style(bs->label) != NULL) { -+ style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ } else { -+ style = gtk_style_new(); -+ gdk_font_unref(gtk_style_get_font(style)); -+ gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style))); -+ } - for (i = 0; i < 5; i++) - style->fg[i] = bs->idle->style->fg[i]; - if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) { diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 9a858edde58a..ad9091594210 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -1,67 +1,66 @@ # New ports collection makefile for: gaim # Date created: 26 Mar 1999 # Whom: Jim Mock # # $FreeBSD$ # PORTNAME= gaim -PORTVERSION= 0.59.5 -PORTREVISION= 2 +PORTVERSION= 0.59.6 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER?= marcus@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gtk12 WANT_GNOME= yes USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gaim.1 GNOME_PANEL2= ${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc .if !defined(WITHOUT_GDK_PIXBUF) # Note, gdk-pixbuf is needed for buddy icon support. USE_GNOME+= gdkpixbuf .endif .include .if ${HAVE_GNOME:Mlibpanel}!= "" && !exists(${GNOME_PANEL2}) USE_GNOME+= libpanel RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --enable-panel PKGNAMESUFFIX= -gnome PLIST_SUB+= PANEL:="" NOPANEL:="@comment " .else CONFIGURE_ARGS+= --disable-gnome PLIST_SUB+= PANEL:="@comment " NOPANEL:="" .endif .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound .else PKGNAMESUFFIX= -esound .endif .else CONFIGURE_ARGS+= --disable-esd .endif post-patch: @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure .include diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo index a8eac9ebee62..d232a4b104e9 100644 --- a/net/gaim-snapshot/distinfo +++ b/net/gaim-snapshot/distinfo @@ -1 +1 @@ -MD5 (gaim-0.59.5.tar.bz2) = ac67eebcc80320199d44191f1f802254 +MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f diff --git a/net/gaim-snapshot/files/patch-src_buddy.c b/net/gaim-snapshot/files/patch-src_buddy.c deleted file mode 100644 index e2d13a254362..000000000000 --- a/net/gaim-snapshot/files/patch-src_buddy.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/buddy.c.orig Thu Oct 17 12:11:51 2002 -+++ src/buddy.c Thu Oct 17 16:58:49 2002 -@@ -2231,7 +2231,13 @@ - if (blist_options & OPT_BLIST_SHOW_IDLETIME) - gtk_widget_show(bs->idle); - -- style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ if (gtk_rc_get_style(bs->label) != NULL) { -+ style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ } else { -+ style = gtk_style_new(); -+ gdk_font_unref(gtk_style_get_font(style)); -+ gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style))); -+ } - for (i = 0; i < 5; i++) - style->fg[i] = bs->idle->style->fg[i]; - if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) { diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 9a858edde58a..ad9091594210 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -1,67 +1,66 @@ # New ports collection makefile for: gaim # Date created: 26 Mar 1999 # Whom: Jim Mock # # $FreeBSD$ # PORTNAME= gaim -PORTVERSION= 0.59.5 -PORTREVISION= 2 +PORTVERSION= 0.59.6 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER?= marcus@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gtk12 WANT_GNOME= yes USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gaim.1 GNOME_PANEL2= ${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc .if !defined(WITHOUT_GDK_PIXBUF) # Note, gdk-pixbuf is needed for buddy icon support. USE_GNOME+= gdkpixbuf .endif .include .if ${HAVE_GNOME:Mlibpanel}!= "" && !exists(${GNOME_PANEL2}) USE_GNOME+= libpanel RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --enable-panel PKGNAMESUFFIX= -gnome PLIST_SUB+= PANEL:="" NOPANEL:="@comment " .else CONFIGURE_ARGS+= --disable-gnome PLIST_SUB+= PANEL:="@comment " NOPANEL:="" .endif .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound .else PKGNAMESUFFIX= -esound .endif .else CONFIGURE_ARGS+= --disable-esd .endif post-patch: @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure .include diff --git a/net/gaim/distinfo b/net/gaim/distinfo index a8eac9ebee62..d232a4b104e9 100644 --- a/net/gaim/distinfo +++ b/net/gaim/distinfo @@ -1 +1 @@ -MD5 (gaim-0.59.5.tar.bz2) = ac67eebcc80320199d44191f1f802254 +MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f diff --git a/net/gaim/files/patch-src_buddy.c b/net/gaim/files/patch-src_buddy.c deleted file mode 100644 index e2d13a254362..000000000000 --- a/net/gaim/files/patch-src_buddy.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/buddy.c.orig Thu Oct 17 12:11:51 2002 -+++ src/buddy.c Thu Oct 17 16:58:49 2002 -@@ -2231,7 +2231,13 @@ - if (blist_options & OPT_BLIST_SHOW_IDLETIME) - gtk_widget_show(bs->idle); - -- style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ if (gtk_rc_get_style(bs->label) != NULL) { -+ style = gtk_style_copy( gtk_rc_get_style(bs->label) ); -+ } else { -+ style = gtk_style_new(); -+ gdk_font_unref(gtk_style_get_font(style)); -+ gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style))); -+ } - for (i = 0; i < 5; i++) - style->fg[i] = bs->idle->style->fg[i]; - if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) {