diff options
author | xtraeme <xtraeme> | 2004-10-29 07:07:44 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-10-29 07:07:44 +0000 |
commit | f4b374fdd1bf52b29d21e96e9210097e686c695f (patch) | |
tree | 43c212e5b38d3a7011c811fc3f9a5edc0b760c6b | |
parent | 80470785aceaaac50fe5d8ba00a8afd539e60078 (diff) | |
download | pkgsrc-f4b374fdd1bf52b29d21e96e9210097e686c695f.tar.gz |
Use mk/mysql.buildlink3.mk instead of databases/mysql-client/buildlink3.mk,
so that we'd not force dependance on specific MySQL version, and instead pick
the currently installed mysql*-client (or install the default if there
is no mysql-client package installed yet)
this makes package buildable with arbitrary MySQL version, such as 3.23.x,
4.0.x or 4.1.x
-rw-r--r-- | chat/jabberd2/options.mk | 12 | ||||
-rw-r--r-- | mail/dspam/options.mk | 4 | ||||
-rw-r--r-- | mail/ezmlm-idx/options.mk | 4 | ||||
-rw-r--r-- | mail/postfix-current/options.mk | 6 | ||||
-rw-r--r-- | mail/postfix/options.mk | 6 | ||||
-rw-r--r-- | net/freeradius/options.mk | 19 | ||||
-rw-r--r-- | net/pure-ftpd/options.mk | 4 |
7 files changed, 20 insertions, 35 deletions
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 57f40d23527..7575003c514 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2004/08/07 14:29:20 xtraeme Exp $ +# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2 -PKG_SUPPORTED_OPTIONS= db mysql mysql4 pgsql ldap pam +PKG_SUPPORTED_OPTIONS= db mysql pgsql ldap pam .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdb) @@ -15,13 +15,7 @@ CONFIGURE_ARGS+= --enable-db .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" +. include "../../mk/mysql.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mpgsql) diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index 653178cc5e9..dc8858178c7 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2004/10/28 13:32:20 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2004/10/29 07:07:44 xtraeme Exp $ .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom) DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS} @@ -49,7 +49,7 @@ BUILD_DEFS+= DSPAM_STORAGE_DRIVER PKG_OPTIONS:= ${PKG_OPTIONS:Nvirtualusers} .endif .if !empty(DSPAM_STORAGE_DRIVER:Mmysql) -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=mysql_drv CONFIGURE_ARGS+= \ --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \ diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk index 94a9e6cd278..bc4c6cde039 100644 --- a/mail/ezmlm-idx/options.mk +++ b/mail/ezmlm-idx/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/10/29 07:07:44 xtraeme Exp $ # Legacy options # @@ -31,7 +31,7 @@ PKG_FAIL_REASON+= "MySQL and PostgreSQL cannot both be compiled in." \ ### MySQL support ### .if !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" . if !target(post-configure) post-configure: ${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql > ${WRKSRC}/sub_mysql/conf-sqlcc diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index 0227d25fa5b..960ebccf95e 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2004/08/27 06:29:08 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2004/10/29 07:07:44 xtraeme Exp $ # Global and legacy options # @@ -108,12 +108,12 @@ AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ ### Support using a MySQL database server for table lookups. ### .if !empty(PKG_OPTIONS:Mmysql4) -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CCARGS+= -DHAS_MYSQL CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` .elif !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 4508ead1e04..06f5679e281 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2004/09/23 16:10:07 martti Exp $ +# $NetBSD: options.mk,v 1.10 2004/10/29 07:07:44 xtraeme Exp $ # Global and legacy options # @@ -112,12 +112,12 @@ AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ ### Support using a MySQL database server for table lookups. ### .if !empty(PKG_OPTIONS:Mmysql4) -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CCARGS+= -DHAS_MYSQL CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` .elif !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk index 70f2140c934..65fee035950 100644 --- a/net/freeradius/options.mk +++ b/net/freeradius/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2004/10/02 12:06:03 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius -PKG_SUPPORTED_OPTIONS= ldap postgresql73 postgresql74 mysql4 mysql3 snmp +PKG_SUPPORTED_OPTIONS= ldap postgresql73 postgresql74 mysql snmp .include "../../mk/bsd.options.mk" @@ -49,19 +49,10 @@ PLIST_SRC+= ${PKGDIR}/PLIST.pgsql .endif ### -### Use mySQL v4.x for storing user details +### Use MySQL for storing user details ### -.if !empty(PKG_OPTIONS:Mmysql4) -. include "../../databases/mysql4-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_sql_mysql -PLIST_SRC+= ${PKGDIR}/PLIST.mysql -.endif - -### -### Use mySQL v3.x for storing user details -### -.if !empty(PKG_OPTIONS:Mmysql3) -. include "../../databases/mysql-client/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mmysql) +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_sql_mysql PLIST_SRC+= ${PKGDIR}/PLIST.mysql .endif diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk index 9ddf27fdfd4..317a577a98e 100644 --- a/net/pure-ftpd/options.mk +++ b/net/pure-ftpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2004/10/20 11:10:29 cube Exp $ +# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $ # Legacy options .if !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss]) @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-ldap .endif .if !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql .endif |