diff options
| author | nbm <nbm@FreeBSD.org> | 2001-03-01 21:05:47 +0800 |
|---|---|---|
| committer | nbm <nbm@FreeBSD.org> | 2001-03-01 21:05:47 +0800 |
| commit | 1720e4816dcd72958da31ceb8bdf8af01dc3041f (patch) | |
| tree | 28ba8d0c0925f3982598e95c5a084de4eeb414e9 | |
| parent | c40b31f16fe43369f9d35e1b0df7dca36568db06 (diff) | |
| download | freebsd-ports-graphics-1720e4816dcd72958da31ceb8bdf8af01dc3041f.tar.gz freebsd-ports-graphics-1720e4816dcd72958da31ceb8bdf8af01dc3041f.tar.zst freebsd-ports-graphics-1720e4816dcd72958da31ceb8bdf8af01dc3041f.zip | |
Some fixes and tweaks from Yuri, hopefully fixing the mysql problems
that have been reported to me.
These changes don't affect the package, just if people use some of the
WITH_* or WITHOUT_* options
Submitted by: Yuri L Khachaturian <yukh@ns.otradnoe.net>
| -rw-r--r-- | mail/vpopmail-devel/Makefile | 14 | ||||
| -rw-r--r-- | mail/vpopmail-stable/Makefile | 14 | ||||
| -rw-r--r-- | mail/vpopmail/Makefile | 14 |
3 files changed, 30 insertions, 12 deletions
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile index f5f37ed80fc..5e4d50169e5 100644 --- a/mail/vpopmail-devel/Makefile +++ b/mail/vpopmail-devel/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS= --enable-qmail-dir=${QMAIL_DIR} \ HARDQUOTA?= 10000000 RELAYCLEAR?= 30 LOGLEVEL?= y -APOPFILE?= /etc/apop-secrets +APOPFILE?= /usr/local/vpopmail/etc/apop-secrets .if exists(${LOCALBASE}/qmail/bin/qmail-send) QMAIL_DIR?= ${LOCALBASE}/qmail @@ -80,6 +80,12 @@ CONFIGURE_ARGS+= --enable-passwd=n .if defined(WITH_APOP) CONFIGURE_ARGS+= --enable-apop=y \ --enable-apop-file=${APOPFILE} +.else +CONFIGURE_ARGS+= --enable-apop=n +.endif + +.if !defined(WITH_SQWEBMAIL) +CONFIGURE_ARGS+= --enable-sqwebmail-pass=n .endif .if !defined(WITHOUT_ROAMING) @@ -89,9 +95,9 @@ CONFIGURE_ARGS+= --enable-roaming-users=y \ .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --with-mysql=y \ - --with-sqlincdir=${LOCALBASE}/include/mysql \ - --with-sqllibdir=${LOCALBASE}/lib/mysql +CONFIGURE_ARGS+= --enable-mysql=y \ + --enable-sqlincdir=${LOCALBASE}/include/mysql \ + --enable-sqllibdir=${LOCALBASE}/lib/mysql .endif .if defined(DEFAULT_DOMAIN) diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile index f5f37ed80fc..5e4d50169e5 100644 --- a/mail/vpopmail-stable/Makefile +++ b/mail/vpopmail-stable/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS= --enable-qmail-dir=${QMAIL_DIR} \ HARDQUOTA?= 10000000 RELAYCLEAR?= 30 LOGLEVEL?= y -APOPFILE?= /etc/apop-secrets +APOPFILE?= /usr/local/vpopmail/etc/apop-secrets .if exists(${LOCALBASE}/qmail/bin/qmail-send) QMAIL_DIR?= ${LOCALBASE}/qmail @@ -80,6 +80,12 @@ CONFIGURE_ARGS+= --enable-passwd=n .if defined(WITH_APOP) CONFIGURE_ARGS+= --enable-apop=y \ --enable-apop-file=${APOPFILE} +.else +CONFIGURE_ARGS+= --enable-apop=n +.endif + +.if !defined(WITH_SQWEBMAIL) +CONFIGURE_ARGS+= --enable-sqwebmail-pass=n .endif .if !defined(WITHOUT_ROAMING) @@ -89,9 +95,9 @@ CONFIGURE_ARGS+= --enable-roaming-users=y \ .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --with-mysql=y \ - --with-sqlincdir=${LOCALBASE}/include/mysql \ - --with-sqllibdir=${LOCALBASE}/lib/mysql +CONFIGURE_ARGS+= --enable-mysql=y \ + --enable-sqlincdir=${LOCALBASE}/include/mysql \ + --enable-sqllibdir=${LOCALBASE}/lib/mysql .endif .if defined(DEFAULT_DOMAIN) diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index f5f37ed80fc..5e4d50169e5 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS= --enable-qmail-dir=${QMAIL_DIR} \ HARDQUOTA?= 10000000 RELAYCLEAR?= 30 LOGLEVEL?= y -APOPFILE?= /etc/apop-secrets +APOPFILE?= /usr/local/vpopmail/etc/apop-secrets .if exists(${LOCALBASE}/qmail/bin/qmail-send) QMAIL_DIR?= ${LOCALBASE}/qmail @@ -80,6 +80,12 @@ CONFIGURE_ARGS+= --enable-passwd=n .if defined(WITH_APOP) CONFIGURE_ARGS+= --enable-apop=y \ --enable-apop-file=${APOPFILE} +.else +CONFIGURE_ARGS+= --enable-apop=n +.endif + +.if !defined(WITH_SQWEBMAIL) +CONFIGURE_ARGS+= --enable-sqwebmail-pass=n .endif .if !defined(WITHOUT_ROAMING) @@ -89,9 +95,9 @@ CONFIGURE_ARGS+= --enable-roaming-users=y \ .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --with-mysql=y \ - --with-sqlincdir=${LOCALBASE}/include/mysql \ - --with-sqllibdir=${LOCALBASE}/lib/mysql +CONFIGURE_ARGS+= --enable-mysql=y \ + --enable-sqlincdir=${LOCALBASE}/include/mysql \ + --enable-sqllibdir=${LOCALBASE}/lib/mysql .endif .if defined(DEFAULT_DOMAIN) |