Convert to options framework.

While here, reintegrate Makefile.common into Makefile since xchat-gnome
has been removed from pkgsrc and there is no further need for Makefile.common.

tron@ says do it.

3 files changed, 48 insertions, 62 deletions

diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 6f39d62f613..6bd1147721a 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,15 +1,37 @@
-# $NetBSD: Makefile,v 1.29 2004/04/26 22:07:06 snj Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/02 21:48:42 wiz Exp $
 
-.include "Makefile.common"
+DISTNAME=	xchat-1.8.11
+PKGREVISION=	11
+CATEGORIES=	chat x11
+MASTER_SITES=	${HOMEPAGE}files/source/1.8/
+EXTRACT_SUFX=	.tar.bz2
 
-# Don't set "PKGREVISION" here, set it in "Makefile.common".
+MAINTAINER=	tron@NetBSD.org
+HOMEPAGE=	http://xchat.org/
+COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 
+BUILD_USES_MSGFMT=	YES
+
+USE_DIRS+=		gnome1-1.5
+USE_PKGLOCALEDIR=	YES
+USE_X11BASE=		YES
+USE_TOOLS+=		gmake grep perl
+CONFIGURE_ARGS+=	--enable-python
+
+CONFLICTS+=		xchat-gnome-[0-9]*
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		ac_cv_path_perlpath=${PERL5} pythonpath=${PYTHONBIN}
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-zvt
 
-CONFLICTS+=		xchat-gnome-[0-9]*
+.include "options.mk"
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
deleted file mode 100644
index b44818d810c..00000000000
--- a/chat/xchat/Makefile.common
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile.common,v 1.38 2005/06/01 18:02:41 jlam Exp $
-
-DISTNAME=	xchat-1.8.11
-PKGREVISION=	11
-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
-
-BUILD_USES_MSGFMT=	YES
-
-DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
-FILESDIR=	${.CURDIR}/../xchat/files
-PATCHDIR=	${.CURDIR}/../xchat/patches
-PKGDIR=		${.CURDIR}/../xchat
-PLIST_SRC=	${.CURDIR}/../xchat/PLIST
-
-USE_DIRS+=		gnome1-1.5
-USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
-USE_TOOLS+=		gmake grep
-USE_PERL5=		YES
-CONFIGURE_ARGS+=	--enable-python
-
-BUILD_DEFS+=		USE_INET6 USE_SOCKS
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		ac_cv_path_perlpath=${PERL5} pythonpath=${PYTHONBIN}
-
-.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/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-openssl=${SSLBASE}
-.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 "../../mk/x11.buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../lang/python/application.mk"
diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk
new file mode 100644
index 00000000000..19304984fbf
--- /dev/null
+++ b/chat/xchat/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2005/06/02 21:48:42 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat
+PKG_SUPPORTED_OPTIONS=	inet6 socks5 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+PKG_OPTIONS_LEGACY_VARS+=	XCHAT_USE_SSL:ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-openssl=${SSLBASE}
+.endif
+
+.if !empty(PKG_OPTIONS:Msocks5)
+CONFIGURE_ARGS+=	--enable-socks
+.endif