From fbe28cc361453c6567392e3094286db66eced72a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 29 Oct 2008 11:31:29 +0000 Subject: [PATCH] - update to xchat-2.8.6 (prepare for new gtk) - add license marker, fix MASTER_SITES, and reorder Makefile - add perl plugin - add support for dbus - links correctly with iconv+intl reworked from an original diff by Sergey Prysiazhnyi --- net/xchat/Makefile | 53 +++++++++------- net/xchat/distinfo | 10 ++-- net/xchat/patches/patch-Makefile_in | 11 ++++ net/xchat/patches/patch-configure | 60 +++++++++++++++++++ .../patches/patch-src_common_dbus_Makefile_in | 21 +++++++ net/xchat/patches/patch-src_fe-gtk_xtext_h | 11 ++++ net/xchat/pkg/PFRAG.shared | 2 + net/xchat/pkg/PLIST | 27 +++++---- 8 files changed, 159 insertions(+), 36 deletions(-) create mode 100644 net/xchat/patches/patch-Makefile_in create mode 100644 net/xchat/patches/patch-configure create mode 100644 net/xchat/patches/patch-src_common_dbus_Makefile_in create mode 100644 net/xchat/patches/patch-src_fe-gtk_xtext_h create mode 100644 net/xchat/pkg/PFRAG.shared diff --git a/net/xchat/Makefile b/net/xchat/Makefile index 9125ebb54a5..7e62673bf7d 100644 --- a/net/xchat/Makefile +++ b/net/xchat/Makefile @@ -1,44 +1,57 @@ -# $OpenBSD: Makefile,v 1.67 2008/06/12 21:58:12 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2008/10/29 11:31:29 ajacoutot Exp $ COMMENT= GTK+2 IRC client MAJOR= 2.8 -VERSION= ${MAJOR}.4 +VERSION= ${MAJOR}.6 DISTNAME= xchat-${VERSION} -PKGNAME= ${DISTNAME}p4 + CATEGORIES= net x11 +EXTRACT_SUFX= .tar.bz2 + HOMEPAGE= http://www.xchat.org/ +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xau Xcomposite Xdamage Xdmcp Xcursor Xext Xrender \ - Xfixes Xi Xinerama Xrandr atk-1.0 c cairo \ - crypto expat fontconfig freetype glib-2.0 \ - glitz gmodule-2.0 gobject-2.0 m \ - pango-1.0 pangocairo-1.0 pixman-1 \ - pangoft2-1.0 xml2 pcre png ssl z -MASTER_SITES= ${HOMEPAGE}files/source/${MAJOR}/ -MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=xchat/} +WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto \ + dbus-1 expat fontconfig freetype glib-2.0 glitz \ + gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 png \ + pthread ssl util xml2 z -EXTRACT_SUFX= .tar.bz2 - -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ - sexy::x11/libsexy +MASTER_SITES= ${HOMEPAGE}files/source/${MAJOR}/ \ + ${MASTER_SITE_SOURCEFORGE:=xchat/} MODULES= devel/gettext +RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ + ::devel/gconf2 +LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ + dbus-glib-1.>=4::x11/dbus-glib \ + sexy::x11/libsexy + USE_X11= Yes USE_LIBTOOL= Yes +USE_GMAKE= Yes + CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-python --disable-textfe \ - --disable-perl --disable-mmx --disable-dbus \ - --enable-ipv6 --enable-openssl="/usr" +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --enable-perl \ + --enable-ipv6 \ + --enable-dbus \ + --enable-openssl="/usr" \ + --disable-tcl \ + --disable-python \ + --disable-textfe \ + --disable-mmx CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + GCONF_SCHEMA_FILE_DIR=${LOCALBASE}/share/schemas/xchat .include diff --git a/net/xchat/distinfo b/net/xchat/distinfo index 774d890df17..ed2edd7c4d4 100644 --- a/net/xchat/distinfo +++ b/net/xchat/distinfo @@ -1,5 +1,5 @@ -MD5 (xchat-2.8.4.tar.bz2) = ZtYP68YqAbr6ybs6Nfs3rg== -RMD160 (xchat-2.8.4.tar.bz2) = Nc+E4D39oWBnTRQQY8j8nNCsfeI= -SHA1 (xchat-2.8.4.tar.bz2) = asUJYkwkHt+sXVPZ1OzmPZF2E9Y= -SHA256 (xchat-2.8.4.tar.bz2) = +VqankdxKKrlNmad7defTntNRpByVlaVKJ5Lu1s23WM= -SIZE (xchat-2.8.4.tar.bz2) = 1370883 +MD5 (xchat-2.8.6.tar.bz2) = HyZwhl1DojqavFlt3pmayg== +RMD160 (xchat-2.8.6.tar.bz2) = vBmeO1ip2z39nyr2usf7YWLFPW4= +SHA1 (xchat-2.8.6.tar.bz2) = enRj5lyybGgO1w3ZbOyYvMBUNaQ= +SHA256 (xchat-2.8.6.tar.bz2) = jInb82MEuZNjp/CQ1pVEdlMQK0UoyiqjZ6Kr5c/xdG0= +SIZE (xchat-2.8.6.tar.bz2) = 1423645 diff --git a/net/xchat/patches/patch-Makefile_in b/net/xchat/patches/patch-Makefile_in new file mode 100644 index 00000000000..c74ec91d4fe --- /dev/null +++ b/net/xchat/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ +--- Makefile.in.orig Wed Oct 29 11:04:40 2008 ++++ Makefile.in Wed Oct 29 11:04:52 2008 +@@ -310,7 +310,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) diff --git a/net/xchat/patches/patch-configure b/net/xchat/patches/patch-configure new file mode 100644 index 00000000000..d86ae782540 --- /dev/null +++ b/net/xchat/patches/patch-configure @@ -0,0 +1,60 @@ +$OpenBSD: patch-configure,v 1.5 2008/10/29 11:31:29 ajacoutot Exp $ +--- configure.orig Wed Jun 11 10:34:27 2008 ++++ configure Wed Oct 29 11:01:55 2008 +@@ -22291,13 +22291,13 @@ fi + + else + # Some library is needed. Try libpthread and libc_r. +- { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5 ++echo $ECHO_N "checking for pthread_kill in -pthread... $ECHO_C" >&6; } + if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22354,8 +22354,8 @@ fi + echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; } + if test $ac_cv_lib_pthread_pthread_kill = yes; then + gl_have_pthread=yes +- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread +- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread ++ LIBTHREAD=-pthread LTLIBTHREAD=-pthread ++ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread + fi + + if test -z "$gl_have_pthread"; then +@@ -27602,7 +27602,7 @@ _ACEOF + + + +- INTLLIBS="$LIBINTL" ++ INTLLIBS="$LTLIBINTL" + + + +@@ -33409,7 +33409,7 @@ LIBTHREAD!$LIBTHREAD$ac_delim + LTLIBTHREAD!$LTLIBTHREAD$ac_delim + LIBMULTITHREAD!$LIBMULTITHREAD$ac_delim + LTLIBMULTITHREAD!$LTLIBMULTITHREAD$ac_delim +-LIBICONV!$LIBICONV$ac_delim ++LIBICONV!$LTLIBICONV$ac_delim + LTLIBICONV!$LTLIBICONV$ac_delim + INTLBISON!$INTLBISON$ac_delim + GLIBC21!$GLIBC21$ac_delim +@@ -33427,8 +33427,8 @@ INSTOBJEXT!$INSTOBJEXT$ac_delim + GENCAT!$GENCAT$ac_delim + INTLOBJS!$INTLOBJS$ac_delim + INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-LIBINTL!$LIBINTL$ac_delim ++INTLLIBS!$LTLIBINTL$ac_delim ++LIBINTL!$LTLIBINTL$ac_delim + LTLIBINTL!$LTLIBINTL$ac_delim + POSUB!$POSUB$ac_delim + sedpath!$sedpath$ac_delim diff --git a/net/xchat/patches/patch-src_common_dbus_Makefile_in b/net/xchat/patches/patch-src_common_dbus_Makefile_in new file mode 100644 index 00000000000..cab8c058864 --- /dev/null +++ b/net/xchat/patches/patch-src_common_dbus_Makefile_in @@ -0,0 +1,21 @@ +$OpenBSD: patch-src_common_dbus_Makefile_in,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ +--- src/common/dbus/Makefile.in.orig Wed Jun 11 10:34:23 2008 ++++ src/common/dbus/Makefile.in Wed Oct 29 12:24:39 2008 +@@ -301,7 +301,7 @@ servicedir = $(DBUS_SERVICES_DIR) + service_in_files = org.xchat.service.service.in + service_DATA = $(service_in_files:.service.in=.service) + @DO_GCONF_TRUE@GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source` +-@DO_GCONF_TRUE@GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas ++@DO_GCONF_TRUE@GCONF_SCHEMA_FILE_DIR = $(prefix)/share/schemas/xchat + @DO_GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) + @DO_GCONF_TRUE@schema_DATA = apps_xchat_url_handler.schemas + all: $(BUILT_SOURCES) +@@ -560,7 +560,7 @@ info: info-am + + info-am: + +-install-data-am: install-data-local install-schemaDATA \ ++install-data-am: install-schemaDATA \ + install-serviceDATA + + install-dvi: install-dvi-am diff --git a/net/xchat/patches/patch-src_fe-gtk_xtext_h b/net/xchat/patches/patch-src_fe-gtk_xtext_h new file mode 100644 index 00000000000..45d464e0c30 --- /dev/null +++ b/net/xchat/patches/patch-src_fe-gtk_xtext_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_fe-gtk_xtext_h,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ +--- src/fe-gtk/xtext.h.orig Sun Feb 24 05:48:02 2008 ++++ src/fe-gtk/xtext.h Wed Oct 29 10:25:26 2008 +@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *xtext, gboolean + xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); + void gtk_xtext_buffer_free (xtext_buffer *buf); + void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); +-GtkType gtk_xtext_get_type (void); ++GType gtk_xtext_get_type (void); + + #endif diff --git a/net/xchat/pkg/PFRAG.shared b/net/xchat/pkg/PFRAG.shared new file mode 100644 index 00000000000..9619c540c88 --- /dev/null +++ b/net/xchat/pkg/PFRAG.shared @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ +lib/xchat/plugins/perl.so diff --git a/net/xchat/pkg/PLIST b/net/xchat/pkg/PLIST index 5de45c58001..7b8f7945776 100644 --- a/net/xchat/pkg/PLIST +++ b/net/xchat/pkg/PLIST @@ -1,7 +1,14 @@ -@comment $OpenBSD: PLIST,v 1.23 2007/12/15 21:14:22 ajacoutot Exp $ -bin/xchat -share/applications/ +@comment $OpenBSD: PLIST,v 1.24 2008/10/29 11:31:29 ajacoutot Exp $ +%%SHARED%% +@bin bin/xchat +lib/xchat/ +lib/xchat/plugins/ +@comment lib/xchat/plugins/perl.a +@comment lib/xchat/plugins/perl.la share/applications/xchat.desktop +share/dbus-1/ +share/dbus-1/services/ +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 @@ -15,28 +22,26 @@ share/locale/hu/LC_MESSAGES/xchat.mo share/locale/it/LC_MESSAGES/xchat.mo share/locale/ja/LC_MESSAGES/xchat.mo share/locale/ko/LC_MESSAGES/xchat.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/xchat.mo -share/locale/mk/ -share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/xchat.mo share/locale/nl/LC_MESSAGES/xchat.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/xchat.mo share/locale/pt/LC_MESSAGES/xchat.mo share/locale/ru/LC_MESSAGES/xchat.mo -share/locale/sq/ -share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/xchat.mo share/locale/sr/LC_MESSAGES/xchat.mo share/locale/sv/LC_MESSAGES/xchat.mo +share/locale/th/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/ share/pixmaps/xchat.png +@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/xchat/*.schemas > /dev/null +share/schemas/ +share/schemas/xchat/ +share/schemas/xchat/apps_xchat_url_handler.schemas +@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/xchat/*.schemas > /dev/null @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database