Date: Sat, 15 Jun 2013 13:48:33 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320998 - head/mail/qmailadmin Message-ID: <201306151348.r5FDmXEL092141@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Jun 15 13:48:32 2013 New Revision: 320998 URL: http://svnweb.freebsd.org/changeset/ports/320998 Log: Use new options helpers Modified: head/mail/qmailadmin/Makefile Modified: head/mail/qmailadmin/Makefile ============================================================================== --- head/mail/qmailadmin/Makefile Sat Jun 15 13:39:39 2013 (r320997) +++ head/mail/qmailadmin/Makefile Sat Jun 15 13:48:32 2013 (r320998) @@ -45,13 +45,43 @@ IDX_DESC= Use ezmlm-idx instead of ezml IDX_SQL_DESC= Enable MySQL support for ezmlm HELP_DESC= Show help links on login page SPAM_DETECTION_DESC= Allow users to toggle spam checking -SPAM_NEEDS_EMAIL_DESC= Append user's email to spam command +SPAM_NEEDS_EMAIL_DESC= Append user's email to spam command #' CATCHALL_DESC= Enable catch-all accounts TRIVIAL_PASSWORD_DESC= Disallow password containing username NOCACHE_DESC= Prohibit caching via http headers +CONFIGURE_ARGS+= \ + --enable-qmaildir=${QMAIL_PREFIX} \ + --enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ + --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ + --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ + --enable-htmllibdir=${DATADIR} \ + --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ + --enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \ + --enable-vpopmaildir=${VPOPMAIL_DIR} \ + --enable-autoresponder-path=${LOCALBASE}/bin \ + --enable-maxusersperpage=${MAXUSERSPERPAGE} \ + --enable-maxaliasesperpage=${MAXALIASESPERPAGE} \ + --enable-ezmlmdir=${LOCALBASE}/bin + +IPAUTH_CONFIGURE_OFF= --disable-ipauth +USER_INDEX_CONFIGURE_OFF= --disable-user-index +MODIFY_QUOTA_CONFIGURE_OFF= --enable-modify-quota +DOMAIN_AUTOFILL_CONFIGURE_ON= --enable-domain-autofill +IDX_SQL_CONFIGURE_OFF= --disable-ezmlm-mysql +HELP_CONFIGURE_ON= --enable-help +CATCHALL_CONFIGURE_OFF= --disable-catchall +TRIVIAL_PASSWORD_CONFIGURE_OFF= --disable-trivial-password +NOCACHE_CONFIGURE_ON= --enable-no-cache +SPAM_DETECTION_CONFIGURE_ON= --enable-modify-spam=y +SPAM_NEEDS_EMAIL_CONFIGURE_ENABLE= spamcmd-needs-email + .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MSPAM_DETECTION} && defined(SPAM_COMMAND) +CONFIGURE_ARGS+= --enable-spam-command="${SPAM_COMMAND}" +.endif + # vpopmail installation directory # # NB: change this with extreme caution! For instance, if vpopmail is not @@ -97,66 +127,4 @@ BUILD_DEPENDS+= ezmlm-idx:${PORTSDIR}/ma RUN_DEPENDS+= ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx .endif -CONFIGURE_ARGS+= \ - --enable-qmaildir=${QMAIL_PREFIX} \ - --enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ - --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ - --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ - --enable-htmllibdir=${DATADIR} \ - --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ - --enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \ - --enable-vpopmaildir=${VPOPMAIL_DIR} \ - --enable-autoresponder-path=${LOCALBASE}/bin \ - --enable-maxusersperpage=${MAXUSERSPERPAGE} \ - --enable-maxaliasesperpage=${MAXALIASESPERPAGE} \ - --enable-ezmlmdir=${LOCALBASE}/bin - -.if empty(PORT_OPTIONS:MIPAUTH) -CONFIGURE_ARGS+= --disable-ipauth -.endif - -.if empty(PORT_OPTIONS:MUSER_INDEX) -CONFIGURE_ARGS+= --disable-user-index -.endif - -.if ${PORT_OPTIONS:MMODIFY_QUOTA} -CONFIGURE_ARGS+= --enable-modify-quota -.endif - -.if ${PORT_OPTIONS:MDOMAIN_AUTOFILL} -CONFIGURE_ARGS+= --enable-domain-autofill -.endif - -.if empty(PORT_OPTIONS:MIDX_SQL) -CONFIGURE_ARGS+= --disable-ezmlm-mysql -.endif - -.if ${PORT_OPTIONS:MHELP} -CONFIGURE_ARGS+= --enable-help -.endif - -.if ${PORT_OPTIONS:MSPAM_DETECTION} -CONFIGURE_ARGS+= --enable-modify-spam=y -.if defined(SPAM_COMMAND) -CONFIGURE_ARGS+= --enable-spam-command="${SPAM_COMMAND}" -.endif -.if ${PORT_OPTIONS:MSPAM_NEEDS_EMAIL} -CONFIGURE_ARGS+= --enable-spamcmd-needs-email -.else -CONFIGURE_ARGS+= --disable-spamcmd-needs-email -.endif -.endif - -.if empty(PORT_OPTIONS:MCATCHALL) -CONFIGURE_ARGS+= --disable-catchall -.endif - -.if empty(PORT_OPTIONS:MTRIVIAL_PASSWORD) -CONFIGURE_ARGS+= --disable-trivial-password -.endif - -.if ${PORT_OPTIONS:MNOCACHE} -CONFIGURE_ARGS+= --enable-no-cache -.endif - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306151348.r5FDmXEL092141>