diff options
| author | xtraeme <xtraeme> | 2004-10-29 07:07:44 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-10-29 07:07:44 +0000 |
| commit | f8c8b45cb366de566348a867acf23dabc9528c12 (patch) | |
| tree | 43c212e5b38d3a7011c811fc3f9a5edc0b760c6b /net | |
| parent | 023286d73b82e5519a9e7be64f14ac33a895f6e3 (diff) | |
| download | pkgsrc-f8c8b45cb366de566348a867acf23dabc9528c12.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
Diffstat (limited to 'net')
| -rw-r--r-- | net/freeradius/options.mk | 19 | ||||
| -rw-r--r-- | net/pure-ftpd/options.mk | 4 |
2 files changed, 7 insertions, 16 deletions
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 |