summaryrefslogtreecommitdiff
path: root/chat/xchat
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2007-08-10 19:14:06 +0000
committertron <tron@pkgsrc.org>2007-08-10 19:14:06 +0000
commit93643c2d9a3e8c6ae9e10d1901f37f578c0cc8d9 (patch)
treeed63bc412050e89aa608eef73b80555dc070983b /chat/xchat
parent622b9980ad8fff43db3f272d56a58b6f17cc7a65 (diff)
downloadpkgsrc-93643c2d9a3e8c6ae9e10d1901f37f578c0cc8d9.tar.gz
Apply extensive patch contributed by Blair Sadewitz in private e-mail:
1.) Add new options: GNOME support, Spell checking, Socks 5 supports and fast Tinting via MIT-SHM 2.) Use "desktop-file-utils" package to register the "xchat.desktop" file. This is useful for GNOME and KDE users. Bump package revision because of these changes.
Diffstat (limited to 'chat/xchat')
-rw-r--r--chat/xchat/Makefile17
-rw-r--r--chat/xchat/PLIST9
-rw-r--r--chat/xchat/options.mk47
3 files changed, 66 insertions, 7 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 0c4167ac653..37f98d8561b 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.50 2007/05/25 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2007/08/10 19:14:06 tron Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-MAINTAINER= tron@NetBSD.org
+PKGREVISION= 1
+MAINTAINER= tron@NetBSD.org
COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit
CONFLICTS= xchat-gnome-[0-9]*
USE_TOOLS+= msgfmt
-USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
+USE_DIRS+= xdg-1.1
+GCONF2_SCHEMAS= apps_xchat_url_handler.schemas
CONFIGURE_ARGS+= --enable-tcl=no
CONFIGURE_ARGS+= --disable-perl
@@ -25,6 +27,7 @@ LDFLAGS.IRIX+= -lX11
.include "options.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
.include "../../x11/gtk2/buildlink3.mk"
@@ -46,4 +49,12 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/plugins/plugin20.html \
${DESTDIR}${PREFIX}/share/doc/xchat/
+.if !empty(PKG_OPTIONS:Mgnome)
+
+ ${INSTALL_DATA_DIR} ${DESTDIR}${GCONF2_SCHEMAS_DIR}
+# In case there're ever additional schema files, use ODE loop.
+ ${GCONF2_SCHEMAS:@.s.@${INSTALL_DATA} ${WRKSRC}/src/common/dbus/${.s.} \
+ ${DESTDIR}${GCONF2_SCHEMAS_DIR}/@}
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index 27378159360..6a11d21e104 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.15 2007/07/20 15:09:22 tron Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/08/10 19:14:06 tron Exp $
bin/xchat
share/applications/xchat.desktop
+${GNOME}share/dbus-1/services/org.xchat.service.service
share/doc/xchat/README
share/doc/xchat/faq.html
share/doc/xchat/plugin20.html
+${GNOME}share/gconf/schemas/apps_xchat_url_handler.schemas
share/locale/be/LC_MESSAGES/xchat.mo
share/locale/ca/LC_MESSAGES/xchat.mo
share/locale/cs/LC_MESSAGES/xchat.mo
@@ -32,8 +34,11 @@ share/locale/zh_CN/LC_MESSAGES/xchat.mo
share/locale/zh_TW/LC_MESSAGES/xchat.mo
share/pixmaps/xchat.png
@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/doc/xchat
+@comment in dbus: @dirrm share/dbus-1/services
+@comment in dbus: @dirrm share/dbus-1
@comment in xdg-dirs: @dirrm share/applications
@exec ${MKDIR} %D/lib/xchat/plugins
-@dirrm share/doc/xchat
@dirrm lib/xchat/plugins
@dirrm lib/xchat
diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk
index add7bc91558..41f502d9d97 100644
--- a/chat/xchat/options.mk
+++ b/chat/xchat/options.mk
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.8 2005/12/05 23:55:03 rillig Exp $
+# $NetBSD: options.mk,v 1.9 2007/08/10 19:14:06 tron Exp $
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.xchat
-PKG_SUPPORTED_OPTIONS= inet6 ssl socks5
+PKG_SUPPORTED_OPTIONS= inet6 ssl socks5 mitshm gnome
+PKG_OPTIONS_GROUP.spell= libsexy gtkspell
+PKG_OPTIONS_OPTIONAL_GROUPS= spell
PKG_SUGGESTED_OPTIONS= ssl
.include "../../mk/bsd.options.mk"
@@ -32,3 +34,44 @@ CONFIGURE_ARGS+= --enable-socks
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
.endif
+
+###
+### MIT-SHM extension support (for "fast tinting")
+###
+.if !empty(PKG_OPTIONS:Mmitshm)
+CONFIGURE_ARGS+= --enable-shm
+.else
+CONFIGURE_ARGS+= --disable-shm
+.endif
+
+###
+### GNOME support
+###
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+= --enable-dbus
+PLIST_SUBST+= GNOME=""
+SUBST_CLASSES+= gconf
+SUBST_STAGE.gconf+= pre-configure
+SUBST_MESSAGE.gconf+= Disabling schema registration/installation.
+SUBST_SED.gconf+= -e 's,DO_GCONF_TRUE,DO_GCONF_FALSE,g'
+SUBST_FILES.gconf+= src/common/dbus/Makefile.in
+USE_DIRS+= gnome2-1.5
+. include "../../devel/GConf2/schemas.mk"
+. include "../../sysutils/dbus-glib/buildlink3.mk"
+.else
+# We set this to ${FALSE} to avoid detection.
+CONFIGURE_ARGS+= --disable-dbus
+PLIST_SUBST= GNOME="@comment "
+USE_DIRS+= xdg-1.1
+.endif
+
+###
+### Support for spell checking
+###
+.if !empty(PKG_OPTIONS:Mgtkspell)
+CONFIGURE_ARGS+= --enable-spell=gtkspell
+. include "../../textproc/gtkspell/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mlibsexy)
+CONFIGURE_ARGS+= --enable-spell=libsexy
+. include "../../devel/libsexy/buildlink3.mk"
+.endif