diff options
| -rw-r--r-- | mail/tpop3d/Makefile | 7 | ||||
| -rw-r--r-- | mail/tpop3d/files/tpop3d.sh.in | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index d51cb4bddcdf..7bb18235e4ba 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= tpop3d PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.ex-parrot.com/~chris/tpop3d/ @@ -35,10 +35,9 @@ OPTIONS= MYSQL "Use MySQL authentication" off \ # MySQL authentication .if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL) .if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL) -IGNORE= MySQL and PgSQL authentication can not be build together +BROKEN= MySQL and PgSQL authentication can not be build together .endif USE_MYSQL= yes -DEFAULT_MYSQL_VER= 41 CONFIGURE_ARGS+= --enable-auth-mysql \ --with-mysql-lib-dir=${LOCALBASE}/lib/mysql \ --with-mysql-include-dir=${LOCALBASE}/include/mysql @@ -53,7 +52,7 @@ CONFIGURE_ARGS+= --enable-auth-pgsql \ .endif .if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) -LIB_DEPENDS+= ldap-2.2:${PORTSDIR}/net/openldap22-client +USE_OPENLDAP= yes CONFIGURE_ARGS+= --enable-auth-ldap --with-openldap-root=${LOCALBASE} .endif diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.sh.in index 4e32ad9502f2..384e18a3ea67 100644 --- a/mail/tpop3d/files/tpop3d.sh.in +++ b/mail/tpop3d/files/tpop3d.sh.in @@ -2,7 +2,7 @@ # # PROVIDE: tpop3d -# BEFORE: LOGIN +# REQUIRE: LOGIN # # Add the following line to /etc/rc.conf to enable tpop3d: @@ -27,14 +27,14 @@ stop_postcmd() # set defaults -tpop3d_enable=${tpop3d_enable:-"NO"} -tpop3d_flags=${tpop3d_flags:-""} -load_rc_config $name command=%%PREFIX%%/sbin/tpop3d required_files=%%PREFIX%%/etc/tpop3d.conf pidfile=/var/run/tpop3d.pid -tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}" +load_rc_config $name + +: ${tpop3d_enable="NO"} +: ${tpop3d_flags="-f ${required_files} -p ${pidfile}"} run_rc_command "$1" |