From owner-svn-ports-head@FreeBSD.ORG Sun Dec 8 16:01:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7981C479; Sun, 8 Dec 2013 16:01:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A1281D44; Sun, 8 Dec 2013 16:01:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8G129m037049; Sun, 8 Dec 2013 16:01:02 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8G128m037048; Sun, 8 Dec 2013 16:01:02 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201312081601.rB8G128m037048@svn.freebsd.org> From: Adam Weinberger Date: Sun, 8 Dec 2013 16:01:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335906 - head/mail/squirrelmail-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 16:01:02 -0000 Author: adamw Date: Sun Dec 8 16:01:01 2013 New Revision: 335906 URL: http://svnweb.freebsd.org/changeset/ports/335906 Log: Clean up list, sort, use OPTIONS helpers. PORTREVISION bump because a few options names were expanded. Modified: head/mail/squirrelmail-plugins/Makefile Modified: head/mail/squirrelmail-plugins/Makefile ============================================================================== --- head/mail/squirrelmail-plugins/Makefile Sun Dec 8 15:42:31 2013 (r335905) +++ head/mail/squirrelmail-plugins/Makefile Sun Dec 8 16:01:01 2013 (r335906) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= squirrelmail-plugins -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.0 +PORTREVISION= 2 CATEGORIES= mail www -MASTER_SITES= # none +MASTER_SITES= # none DISTFILES= # none MAINTAINER= ports@FreeBSD.org @@ -14,143 +14,79 @@ COMMENT= A "meta-port" to install Squir NO_BUILD= yes NO_MTREE= yes -.ifdef SQUIRRELDIR -PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR} -SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" -.else -.ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail -PLIST_SUB+= SQUIRRELDIR=www/squirrelmail -SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" -.else -SQUIRRELDIR= ${PREFIX}/squirrelmail -PLIST_SUB+= SQUIRRELDIR=squirrelmail -SUB_LIST+= "SQUIRRELDIR=squirrelmail" -.endif -.endif - -OPTIONS_DEFINE= SIEVE CALENDR LDAPPW SQLPW MAILFT LGAUTH LGNOTES \ - MLOGIN NOTES NOTIFY PW4GET PUPDATE QMADMIN QUOTA \ - SASQL BUTTONS SLOGIN TIMEOUT TMDA VLOGIN WEBSRCH \ - WETTER -SIEVE_DESC= Sieve Mail Filters plugin -CALENDR_DESC= Shared Calendars plugin +SQUIRRELDIR?= ${PREFIX}/www/squirrelmail + +OPTIONS_DEFINE= BUTTONS CALENDAR LDAPPW LGAUTH LGNOTES MAILFT MLOGIN \ + NOTES NOTIFY PUPDATE PW4GET QMADMIN QUOTA SASQL SIEVE SLOGIN \ + SQLPW TIMEOUT TMDA VLOGIN WEBSEARCH WETTER + +BUTTONS_DESC= Custom (spam/ham/etc.) buttons +BUTTONS_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/spam_buttons:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin + +CALENDAR_DESC= Shared Calendars plugin +CALENDAR_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/calendar:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin + LDAPPW_DESC= Change LDAP passwords plugin -SQLPW_DESC= Change *SQL passwords plugin -MAILFT_DESC= E-mail footer plugin +LDAPPW_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/change_ldappass:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin + LGAUTH_DESC= HTTP-auth based login plugin +LGAUTH_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/login_auth:${PORTSDIR}/mail/squirrelmail-login_auth-plugin + LGNOTES_DESC= Notes on login screen plugin +LGNOTES_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/login_notes:${PORTSDIR}/mail/squirrelmail-login_notes-plugin + +MAILFT_DESC= E-mail footer plugin +MAILFT_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/email_footer:${PORTSDIR}/mail/squirrelmail-email_footer-plugin + MLOGIN_DESC= Multilogin plugin +MLOGIN_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/multilogin:${PORTSDIR}/mail/squirrelmail-multilogin-plugin + NOTES_DESC= Notes plugin +NOTES_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/notes:${PORTSDIR}/mail/squirrelmail-notes-plugin + NOTIFY_DESC= New mail notify plugin -PW4GET_DESC= Password forget plugin +NOTIFY_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/notify:${PORTSDIR}/mail/squirrelmail-notify-plugin + PUPDATE_DESC= Plugin update check plugin +PUPDATE_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/pupdate:${PORTSDIR}/mail/squirrelmail-pupdate-plugin + +PW4GET_DESC= Password forget plugin +PW4GET_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/password_forget:${PORTSDIR}/mail/squirrelmail-password_forget-plugin + QMADMIN_DESC= Qmailadmin login plugin +QMADMIN_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/qmailadmin_login:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin + QUOTA_DESC= Quota usage plugin +QUOTA_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/quota_usage:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin + SASQL_DESC= SpamAssassin SQL plugin -BUTTONS_DESC= Custom (spam/ham/etc.) buttons +SASQL_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/sasql:${PORTSDIR}/mail/squirrelmail-sasql-plugin + +SIEVE_DESC= Sieve Mail Filters plugin +SIEVE_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/avelsieve:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin + SLOGIN_DESC= SSL login plugin +SLOGIN_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/secure_login:${PORTSDIR}/mail/squirrelmail-secure_login-plugin + +SQLPW_DESC= Change *SQL passwords plugin +SQLPW_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/change_sqlpass:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin + TIMEOUT_DESC= User session timeout plugin +TIMEOUT_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/timeout_user:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin + TMDA_DESC= TMDA plugin +TMDA_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/tmdatools:${PORTSDIR}/mail/squirrelmail-tmda-plugin + VLOGIN_DESC= Multi-site-hosting capabilities plugin -WEBSRCH_DESC= Web search engines plugin -WETTER_DESC= Weather in Germany plugin +VLOGIN_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/vlogin:${PORTSDIR}/mail/squirrelmail-vlogin-plugin -.include +WEBSEARCH_DESC= Web search engines plugin +WEBSEARCH_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/web_search:${PORTSDIR}/mail/squirrelmail-websearch-plugin -.if ${PORT_OPTIONS:MSIEVE} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/avelsieve:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin -.endif - -.if ${PORT_OPTIONS:MCALENDR} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/calendar:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin -.endif - -.if ${PORT_OPTIONS:MLDAPPW} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/change_ldappass:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin -.endif - -.if ${PORT_OPTIONS:MSQLPW} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/change_sqlpass:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin -.endif - -.if ${PORT_OPTIONS:MMAILFT} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/email_footer:${PORTSDIR}/mail/squirrelmail-email_footer-plugin -.endif - -.if ${PORT_OPTIONS:MLGAUTH} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/login_auth:${PORTSDIR}/mail/squirrelmail-login_auth-plugin -.endif - -.if ${PORT_OPTIONS:MLGNOTES} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/login_notes:${PORTSDIR}/mail/squirrelmail-login_notes-plugin -.endif - -.if ${PORT_OPTIONS:MMLOGIN} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/multilogin:${PORTSDIR}/mail/squirrelmail-multilogin-plugin -.endif -# requires compatibility1 plugin - breaks other plugins -#.if ${PORT_OPTIONS:MNEWUSER} -#RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/newuser_wiz:${PORTSDIR}/mail/squirrelmail-newuser_wiz-plugin -#.endif - -.if ${PORT_OPTIONS:MNOTES} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/notes:${PORTSDIR}/mail/squirrelmail-notes-plugin -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/notify:${PORTSDIR}/mail/squirrelmail-notify-plugin -.endif - -.if ${PORT_OPTIONS:MPW4GET} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/password_forget:${PORTSDIR}/mail/squirrelmail-password_forget-plugin -.endif - -.if ${PORT_OPTIONS:MPUPDATE} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/pupdate:${PORTSDIR}/mail/squirrelmail-pupdate-plugin -.endif - -.if ${PORT_OPTIONS:MQMADMIN} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/qmailadmin_login:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin -.endif - -.if ${PORT_OPTIONS:MQUOTA} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/quota_usage:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin -.endif - -.if ${PORT_OPTIONS:MSASQL} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/sasql:${PORTSDIR}/mail/squirrelmail-sasql-plugin -.endif - -.if ${PORT_OPTIONS:MBUTTONS} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/spam_buttons:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin -.endif - -.if ${PORT_OPTIONS:MSLOGIN} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/secure_login:${PORTSDIR}/mail/squirrelmail-secure_login-plugin -.endif - -.if ${PORT_OPTIONS:MTIMEOUT} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/timeout_user:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin -.endif - -.if ${PORT_OPTIONS:MTMDA} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/tmdatools:${PORTSDIR}/mail/squirrelmail-tmda-plugin -.endif - -.if ${PORT_OPTIONS:MVLOGIN} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/vlogin:${PORTSDIR}/mail/squirrelmail-vlogin-plugin -.endif - -.if ${PORT_OPTIONS:MWEBSRCH} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/web_search:${PORTSDIR}/mail/squirrelmail-websearch-plugin -.endif - -.if ${PORT_OPTIONS:MWETTER} -RUN_DEPENDS+= ${SQUIRRELDIR}/plugins/wetteronline:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin -.endif +WETTER_DESC= Weather in Germany plugin +WETTER_RUN_DEPENDS= ${SQUIRRELDIR}/plugins/wetteronline:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin do-install: build @${DO_NADA} -.include +.include