Second patch form the PR was missed

- Found serious OPTIONS interaction errors. Fixed.

PR:		ports/78723
Submitted by:	Boris Kovalenko <boris@tagnet.ru> (maintainer)
This commit is contained in:
Sergey Matveychuk 2005-03-12 16:29:57 +00:00
parent a2bc1c2c4c
commit 0786e76dd7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=131028
2 changed files with 8 additions and 2 deletions

View file

@ -14,6 +14,7 @@ MASTER_SITES= http://www.ex-parrot.com/~chris/tpop3d/
MAINTAINER= boris@tagnet.ru MAINTAINER= boris@tagnet.ru
COMMENT= Virtual-domain capable POP3 server supporting MySQL,PgSQL etc auth COMMENT= Virtual-domain capable POP3 server supporting MySQL,PgSQL etc auth
IS_INTERACTIVE= yes
USE_OPENSSL= yes USE_OPENSSL= yes
USE_REINPLACE= yes USE_REINPLACE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
@ -30,8 +31,13 @@ OPTIONS= MYSQL "Use MySQL authentication" off \
FLATAUTH "Enable /etc/passwd-style authentication" off \ FLATAUTH "Enable /etc/passwd-style authentication" off \
MAILDIR "Compile Maildir support" on MAILDIR "Compile Maildir support" on
.include <bsd.port.pre.mk>
# MySQL authentication # MySQL authentication
.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL) .if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
IGNORE= MySQL and PgSQL authentication can not be build together
.endif
USE_MYSQL= yes USE_MYSQL= yes
DEFAULT_MYSQL_VER= 41 DEFAULT_MYSQL_VER= 41
CONFIGURE_ARGS+= --enable-auth-mysql \ CONFIGURE_ARGS+= --enable-auth-mysql \
@ -93,4 +99,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.post.mk>

View file

@ -33,7 +33,7 @@ tpop3d_flags=${tpop3d_flags:-""}
load_rc_config $name load_rc_config $name
command=%%PREFIX%%/sbin/tpop3d command=%%PREFIX%%/sbin/tpop3d
required_files=%%PREFIX%%/tpop3d.conf required_files=%%PREFIX%%/etc/tpop3d.conf
pidfile=/var/run/tpop3d.pid pidfile=/var/run/tpop3d.pid
tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}" tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}"