diff options
| author | sat <sat@FreeBSD.org> | 2007-04-06 17:59:20 +0800 |
|---|---|---|
| committer | sat <sat@FreeBSD.org> | 2007-04-06 17:59:20 +0800 |
| commit | a753899b322e8d7649dee61176ce41b55aecb2da (patch) | |
| tree | 49d221ee5df490f1d68a33b845b43e99947c83fa | |
| parent | ca41aba1055ee37551f97f4cf2ce141722f55294 (diff) | |
| download | freebsd-ports-gnome-a753899b322e8d7649dee61176ce41b55aecb2da.tar.gz freebsd-ports-gnome-a753899b322e8d7649dee61176ce41b55aecb2da.tar.zst freebsd-ports-gnome-a753899b322e8d7649dee61176ce41b55aecb2da.zip | |
- Allow support for MYSQL and PGSQL to be selected simultaneously
PR: ports/111307 (based on)
Submitted by: Dmitry A Grigorovich <odip@bionet.nsc.ru>
Approved by: Beech Rintoul <beech@alaskaparadise.com> (maintainer)
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 14 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index cb1ccd51833c..57ad16c663d5 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -46,7 +46,7 @@ OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\ MYSQL "Use MySQL" off \ - POSTGRESQL "Use Postgres" off \ + PGSQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ QUOTA "Include mod_quota" off \ IFSESSION "Include mod_ifsession" on \ @@ -155,7 +155,7 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .if defined(WITH_MYSQL) USE_MYSQL= yes -MODULES:=${MODULES}:mod_sql:mod_sql_mysql +MODULES:=${MODULES}:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql PLIST_SUB+= MYSQL="" @@ -163,13 +163,17 @@ PLIST_SUB+= MYSQL="" PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_POSTGRESQL) +.if defined(WITH_PGSQL) USE_PGSQL= yes -MODULES:=${MODULES}:mod_sql:mod_sql_postgres +MODULES:=${MODULES}:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif +.if ${MODULES:M*mod_sql_*} +MODULES:=${MODULES}:mod_sql +.endif + .if defined(WITH_OPENSSL) CFLAGS+= -DHAVE_OPENSSL .include <${PORTSDIR}/Mk/bsd.openssl.mk> @@ -193,7 +197,7 @@ MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif -.if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL) +.if defined(WITH_PGSQL) || defined(WITH_MYSQL) MODULES:=${MODULES}:mod_quotatab_sql .endif .endif diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index cb1ccd51833c..57ad16c663d5 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -46,7 +46,7 @@ OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\ MYSQL "Use MySQL" off \ - POSTGRESQL "Use Postgres" off \ + PGSQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ QUOTA "Include mod_quota" off \ IFSESSION "Include mod_ifsession" on \ @@ -155,7 +155,7 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .if defined(WITH_MYSQL) USE_MYSQL= yes -MODULES:=${MODULES}:mod_sql:mod_sql_mysql +MODULES:=${MODULES}:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql PLIST_SUB+= MYSQL="" @@ -163,13 +163,17 @@ PLIST_SUB+= MYSQL="" PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_POSTGRESQL) +.if defined(WITH_PGSQL) USE_PGSQL= yes -MODULES:=${MODULES}:mod_sql:mod_sql_postgres +MODULES:=${MODULES}:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif +.if ${MODULES:M*mod_sql_*} +MODULES:=${MODULES}:mod_sql +.endif + .if defined(WITH_OPENSSL) CFLAGS+= -DHAVE_OPENSSL .include <${PORTSDIR}/Mk/bsd.openssl.mk> @@ -193,7 +197,7 @@ MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif -.if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL) +.if defined(WITH_PGSQL) || defined(WITH_MYSQL) MODULES:=${MODULES}:mod_quotatab_sql .endif .endif |