Split xchat-gnome from xchat. From Julio Merino in pkg/17688.

3 files changed, 63 insertions, 39 deletions

diff --git a/chat/Makefile b/chat/Makefile
index c3546f79086..5e84d1e7d68 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2002/07/20 13:56:08 tron Exp $
+# $NetBSD: Makefile,v 1.45 2002/07/26 17:36:24 wiz Exp $
 #
 
 COMMENT=	communication programs
@@ -53,6 +53,7 @@ SUBDIR+=	tkirc
 SUBDIR+=	tkirc2
 SUBDIR+=	vicq
 SUBDIR+=	xchat
+SUBDIR+=	xchat-gnome
 SUBDIR+=	ymessenger
 SUBDIR+=	ysm
 SUBDIR+=	zenicb
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 4ed6236aebc..d39da665241 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,44 +1,15 @@
-# $NetBSD: Makefile,v 1.22 2002/06/06 11:25:52 manu Exp $
+# $NetBSD: Makefile,v 1.23 2002/07/26 17:36:24 wiz Exp $
 
-DISTNAME=	xchat-1.8.9
-CATEGORIES=	chat x11 gnome
-MASTER_SITES=	${HOMEPAGE}files/source/1.8/
-EXTRACT_SUFX=	.tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://xchat.org/
-COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
+PKGREVISION=	1
 
-USE_GMAKE=	YES
-USE_PERL5=	YES
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	ac_cv_lib_intl_bindtextdomain='yes'
-CONFIGURE_ENV+=	pythonpath=${PYTHONBIN}
-MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
-BUILD_USES_MSGFMT=	YES
+CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=	--disable-zvt
 
-BUILD_DEFS+=	USE_INET6
+CONFLICTS+=		xchat-gnome-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+=	--enable-panel
-
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-# SSL support
-.if defined(XCHAT_USE_SSL) && ${XCHAT_USE_SSL} == "YES"
-.include "../../security/openssl/buildlink.mk"
-CONFIGURE_ARGS+=	--enable-openssl=${BUILDLINK_DIR}
-.endif
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
-
-.include "../../lang/python/application.buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
new file mode 100644
index 00000000000..b947033e3ea
--- /dev/null
+++ b/chat/xchat/Makefile.common
@@ -0,0 +1,52 @@
+# $NetBSD: Makefile.common,v 1.1 2002/07/26 17:36:24 wiz Exp $
+
+DISTNAME=	xchat-1.8.9
+CATEGORIES=	chat x11
+MASTER_SITES=	${HOMEPAGE}files/source/1.8/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	tron@netbsd.org
+HOMEPAGE=	http://xchat.org/
+COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
+
+DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
+FILESDIR=	${.CURDIR}/../xchat/files
+PATCHDIR=	${.CURDIR}/../xchat/patches
+PKGDIR=		${.CURDIR}/../xchat
+PLIST_SRC=	${.CURDIR}/../xchat/PLIST
+
+USE_GMAKE=	YES
+USE_PERL5=	YES
+USE_X11BASE=	YES
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV+=	ac_cv_lib_intl_bindtextdomain='yes'
+CONFIGURE_ENV+=	pythonpath=${PYTHONBIN}
+MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+BUILD_USES_MSGFMT=	YES
+
+BUILD_DEFS+=	USE_INET6 USE_SOCKS
+
+.include "../../mk/bsd.prefs.mk"
+
+# IPv6 support
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+# SSL support
+.if defined(XCHAT_USE_SSL) && ${XCHAT_USE_SSL} == "YES"
+.include "../../security/openssl/buildlink.mk"
+CONFIGURE_ARGS+=	--enable-openssl=${BUILDLINK_DIR}
+.endif
+
+# Socks support
+.if defined(USE_SOCKS) && ${USE_SOCKS} == YES
+CONFIGURE_ARGS+=	--enable-socks
+.endif
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
+
+.include "../../devel/glib/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"