1 files changed, 59 insertions, 58 deletions

diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 64372f5f0cc1..2adb46c2028a 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -17,46 +17,27 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
 
+CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
+USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-nls \
-		--enable-ipv6
+CONFIGURE_ARGS=	--enable-ipv6
 
-CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
+OPTIONS=	DBUS "Enable DBUS support" on \
+		GTKSPELL "Enable spell check support using gtkspell" on \
+		LIBSEXY "Enable spell check support using libsexy" off \
+		NOTIFY "Depend on libnotify for notifications" off \
+		PERL "Enable Perl support" on \
+		PYTHON "Enable Python support" off \
+		TCL "Enable TCL support" off \
+		SOCKS "Build with socks5 support" off
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-CONFIGURE_ARGS+=	--enable-socks
-.endif
-
-# openssl in now default in configure
-
-.if defined(WITH_PYTHON)
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		PYTHON=""
-.else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON="@comment "
-.endif
-
-.if defined(WITH_TCL)
-LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.3" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-		-L${LOCALBASE}/lib/tcl8.3"
-PLIST_SUB+=	TCL=""
-.else
-CONFIGURE_ARGS+=--enable-tcl=no
-PLIST_SUB+=	TCL="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
@@ -69,16 +50,32 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if !defined(WITHOUT_GTKSPELL)
+.if defined(WITH_GTKSPELL)
+.if defined(WITH_LIBSEXY)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
 LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--enable-spell=gtkspell
-.else
-CONFIGURE_ARGS+=--disable-spell
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_LIBSEXY)
+.if defined(WITH_GTKSPELL)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
+LIB_DEPENDS+=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
+CONFIGURE_ARGS+=--enable-spell=libsexy
+.endif
+
+.if !defined(WITH_GTKSPELL) && !defined(WITH_LIBSEXY)
+CONFIGURE_ARGS+=--enable-spell=none
+.endif
+
+.if defined(WITH_NOTIFY)
+RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify \
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+.endif
 
-.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
+.if defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
 .else
@@ -87,28 +84,32 @@ CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .endif
 
-pre-everything::
-.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) || !defined(WITHOUT_PERL) || !defined(WITHOUT_DBUS) || !defined(WITHOUT_GTKSPELL)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} ""
-.endif
-.if !defined(WITH_PYTHON)
-	@${ECHO_MSG} "WITH_PYTHON=yes for Python support"
-.endif
-.if !defined(WITH_SOCKS)
-	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
-.endif
-.if !defined(WITH_TCL)
-	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
-.endif
-.if !defined(WITHOUT_PERL)
-	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
-.if !defined(WITHOUT_DBUS)
-	@${ECHO_MSG} "WITHOUT_DBUS=yes to disable dbus support"
+
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.4
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.4" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${LOCALBASE}/lib/tcl8.4"
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
 .endif
-.if !defined(WITHOUT_GTKSPELL)
-	@${ECHO_MSG} "WITHOUT_GTKSPELL=yes to disable spell check support"
+
+.if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=--enable-socks
 .endif
 
 post-patch: