[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Move Makefile.options to options.mk (to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d4e36e8e7a5
branches:  trunk
changeset: 479206:0d4e36e8e7a5
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Aug 07 14:29:20 2004 +0000

description:
Move Makefile.options to options.mk (to follow jlam@'s changes),
by default we'll use PKG_OPTIONS.jabberd2?=mysql4 (which is the default
for jabberd2).

diffstat:

 chat/jabberd2/Makefile         |   6 ++++--
 chat/jabberd2/Makefile.options |  40 ----------------------------------------
 chat/jabberd2/options.mk       |  40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 42 deletions(-)

diffs (108 lines):

diff -r 2f3102e7d85f -r 0d4e36e8e7a5 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Sat Aug 07 14:13:06 2004 +0000
+++ b/chat/jabberd2/Makefile    Sat Aug 07 14:29:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/08/07 14:13:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/07 14:29:20 xtraeme Exp $
 #
 
 DISTNAME=              jabberd-2.0s3
@@ -62,7 +62,9 @@
 CONF_FILES+=           ${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml
 .undef f
 
-.include "Makefile.options"
+PKG_OPTIONS.jabberd2?= mysql4
+
+.include "options.mk"
 
 .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
 OWN_DIRS_PERMS+=       ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
diff -r 2f3102e7d85f -r 0d4e36e8e7a5 chat/jabberd2/Makefile.options
--- a/chat/jabberd2/Makefile.options    Sat Aug 07 14:13:06 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile.options,v 1.1 2004/07/31 00:01:04 xtraeme Exp $
-#
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.jabberd2
-PKG_SUPPORTED_OPTIONS= db mysql mysql4 pgsql ldap pam
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdb)
-BUILD_DEFS+=           JABBERD_DBDIR
-JABBERD_DBDIR?=         ${VARBASE}/db/jabberd
-CONFIGURE_ARGS+=        --enable-db
-.  include "../../databases/db4/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+=        --enable-mysql
-CPPFLAGS+=              -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-.  include "../../databases/mysql-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql4)
-CONFIGURE_ARGS+=       --enable-mysql
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-.  include "../../databases/mysql4-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+=        --enable-pgsql
-.  include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=        --enable-ldap
-.  include "../../databases/openldap/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+=        --enable-pam
-.  include "../../security/PAM/buildlink3.mk"
-.endif
diff -r 2f3102e7d85f -r 0d4e36e8e7a5 chat/jabberd2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/jabberd2/options.mk  Sat Aug 07 14:29:20 2004 +0000
@@ -0,0 +1,40 @@
+# $NetBSD: options.mk,v 1.1 2004/08/07 14:29:20 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.jabberd2
+PKG_SUPPORTED_OPTIONS= db mysql mysql4 pgsql ldap pam
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdb)
+BUILD_DEFS+=           JABBERD_DBDIR
+JABBERD_DBDIR?=         ${VARBASE}/db/jabberd
+CONFIGURE_ARGS+=        --enable-db
+.  include "../../databases/db4/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=        --enable-mysql
+CPPFLAGS+=              -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+.  include "../../databases/mysql-client/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql4)
+CONFIGURE_ARGS+=       --enable-mysql
+CPPFLAGS+=             -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+.  include "../../databases/mysql4-client/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=        --enable-pgsql
+.  include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=        --enable-ldap
+.  include "../../databases/openldap/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=        --enable-pam
+.  include "../../security/PAM/buildlink3.mk"
+.endif