[pkgsrc/trunk]: pkgsrc/chat/xchat Convert to options framework.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/888b1f4eba83
branches:  trunk
changeset: 495125:888b1f4eba83
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jun 02 21:48:42 2005 +0000

description:
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.

diffstat:

 chat/xchat/Makefile        |  32 +++++++++++++++++++++----
 chat/xchat/Makefile.common |  57 ----------------------------------------------
 chat/xchat/options.mk      |  21 ++++++++++++++++
 3 files changed, 48 insertions(+), 62 deletions(-)

diffs (132 lines):

diff -r 932ddc22498f -r 888b1f4eba83 chat/xchat/Makefile
--- a/chat/xchat/Makefile       Thu Jun 02 21:39:53 2005 +0000
+++ b/chat/xchat/Makefile       Thu Jun 02 21:48:42 2005 +0000
@@ -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 $
+
+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@localhost
+HOMEPAGE=      http://xchat.org/
+COMMENT=       X11 (X Window System) IRC client, using the GTK+ toolkit
 
-.include "Makefile.common"
+BUILD_USES_MSGFMT=     YES
 
-# Don't set "PKGREVISION" here, set it in "Makefile.common".
+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 -r 932ddc22498f -r 888b1f4eba83 chat/xchat/Makefile.common
--- a/chat/xchat/Makefile.common        Thu Jun 02 21:39:53 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r 932ddc22498f -r 888b1f4eba83 chat/xchat/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat/options.mk     Thu Jun 02 21:48:42 2005 +0000
@@ -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