From owner-svn-ports-head@FreeBSD.ORG Sat Nov 10 01:37:25 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A6FCA6F; Sat, 10 Nov 2012 01:37:25 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5B9558FC13; Sat, 10 Nov 2012 01:37:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAA1bPOn099997; Sat, 10 Nov 2012 01:37:25 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAA1bPFw099989; Sat, 10 Nov 2012 01:37:25 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201211100137.qAA1bPFw099989@svn.freebsd.org> From: Adam Weinberger Date: Sat, 10 Nov 2012 01:37:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307260 - in head/mail: squirrelmail-calendar_file_backend-plugin squirrelmail-calendar_sql_backend-plugin squirrelmail-calendar_sql_backend-plugin/files squirrelmail-login_auth-plugin ... 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.14 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: Sat, 10 Nov 2012 01:37:25 -0000 Author: adamw Date: Sat Nov 10 01:37:24 2012 New Revision: 307260 URL: http://svnweb.freebsd.org/changeset/ports/307260 Log: Convert remaining squirrelmail plugins to bsd.squirrelmail.mk. Because they were duplicating the content there, php version mismatches were created and package building broke. Also includes a few whitespace and header fixes due to OCD. Feature safe: yes Modified: head/mail/squirrelmail-calendar_file_backend-plugin/Makefile head/mail/squirrelmail-calendar_sql_backend-plugin/Makefile head/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in head/mail/squirrelmail-login_auth-plugin/Makefile head/mail/squirrelmail-postfixadmin-plugin/Makefile head/mail/squirrelmail-qmailadmin_login-plugin/Makefile head/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in Modified: head/mail/squirrelmail-calendar_file_backend-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-calendar_file_backend-plugin/Makefile Sat Nov 10 01:37:24 2012 (r307260) @@ -1,73 +1,18 @@ -# New ports collection makefile for: squirrelmail-calendar_file_backend-plugin -# Date created: 02 Jan 2008 -# Whom: Gerrit Beine -# +# Created by: Gerrit Beine # $FreeBSD$ PORTNAME= calendar_file_backend PORTVERSION= 1.0 PORTREVISION= 1 -CATEGORIES= mail www -MASTER_SITES= http://www.squirrelmail.org/plugins/ -PKGNAMEPREFIX= squirrelmail- -PKGNAMESUFFIX= -plugin DISTNAME= ${PORTNAME}-${PORTVERSION}-2.0 DIST_SUBDIR= squirrelmail MAINTAINER= ports@FreeBSD.org COMMENT= File backend for SquirrelMail Calendar plugin -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail - SQUIRREL_PLUGIN_NAME= ${PORTNAME} -.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 - -NO_BUILD= yes -NO_WRKSUBDIR= yes -USE_PERL5_BUILD= yes -USE_PHP= yes -WANT_PHP_WEB= yes - -pre-everything:: - @${ECHO} "" -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you don't want to automatically activate the plug-in set" - @${ECHO} "WITHOUT_ACTIVATE=yes" -.else - @${ECHO} "NOT Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you want to automatically activate the plug-in unset" - @${ECHO} "WITHOUT_ACTIVATE" -.endif - @${ECHO} "" - -do-install: - ${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} - -post-install: -.ifndef WITHOUT_ACTIVATE -.if exists( ${SQUIRRELDIR}/config/config.php ) - @${ECHO} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} -.endif -.else - @${ECHO} "To activate the plug-in in SquirrelMail use" - @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" -.endif -.include +.include +.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" +.include Modified: head/mail/squirrelmail-calendar_sql_backend-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-calendar_sql_backend-plugin/Makefile Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-calendar_sql_backend-plugin/Makefile Sat Nov 10 01:37:24 2012 (r307260) @@ -1,80 +1,21 @@ -# New ports collection makefile for: squirrelmail-calendar_sql_backend-plugin -# Date created: 02 Jan 2008 -# Whom: Gerrit Beine -# +# Created by: Gerrit Beine # $FreeBSD$ PORTNAME= calendar_sql_backend -PORTVERSION= 1.1 +PORTVERSION= 1.1 PORTREVISION= 1 -CATEGORIES= mail www -MASTER_SITES= http://www.squirrelmail.org/plugins/ -PKGNAMEPREFIX= squirrelmail- -PKGNAMESUFFIX= -plugin DISTNAME= ${PORTNAME}-${PORTVERSION}-2.0 -DIST_SUBDIR= squirrelmail +DIST_SUBDIR= squirrelmail MAINTAINER= ports@FreeBSD.org COMMENT= SQL backend for SquirrelMail Calendar plugin -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \ - ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB +RUN_DEPENDS= ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB +PEARDIR= ${PREFIX}/share/pear SQUIRREL_PLUGIN_NAME= ${PORTNAME} -.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 - -SUB_FILES= pkg-message - -NO_BUILD= yes -NO_WRKSUBDIR= yes -USE_PERL5_BUILD= yes -USE_PHP= yes -WANT_PHP_WEB= yes - -PEARDIR= ${PREFIX}/share/pear - -pre-everything:: - @${ECHO} "" -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you don't want to automatically activate the plug-in set" - @${ECHO} "WITHOUT_ACTIVATE=yes" -.else - @${ECHO} "NOT Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you want to automatically activate the plug-in unset" - @${ECHO} "WITHOUT_ACTIVATE" -.endif - @${ECHO} "" - -do-install: - ${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} - -post-install: -.ifndef WITHOUT_ACTIVATE -.if exists( ${SQUIRRELDIR}/config/config.php ) - @${ECHO} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} -.endif -.else - @${ECHO} "To activate the plug-in in SquirrelMail use" - @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" -.endif - @${ECHO} "" - @${CAT} ${PKGMESSAGE} -.include +.include +.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" +.include Modified: head/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in ============================================================================== --- head/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in Sat Nov 10 01:37:24 2012 (r307260) @@ -1,5 +1,5 @@ For the port to work properly you must copy the file -%%PREFIX%%/%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.sample.php +%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.sample.php to -%%PREFIX%%/%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.php +%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.php and edit the configuration to meet your needs. Modified: head/mail/squirrelmail-login_auth-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-login_auth-plugin/Makefile Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-login_auth-plugin/Makefile Sat Nov 10 01:37:24 2012 (r307260) @@ -4,70 +4,20 @@ # # $FreeBSD$ -PORTNAME= squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin +PORTNAME= login_auth PORTVERSION= 2.0 PORTREVISION= 1 -CATEGORIES= mail www MASTER_SITES= http://www.squirrelmail.org/plugins/ \ http://alkoholix.tallence.de/www.squirrelmail.org/plugins/ -DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0 +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.0 DIST_SUBDIR= squirrelmail MAINTAINER= stb@lassitu.de COMMENT= Automatically log in user based on HTTP authentication -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail +SQUIRREL_PLUGIN_NAME= ${PORTNAME} -SQUIRREL_PLUGIN_NAME= login_auth -.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 - -NO_BUILD= yes -NO_WRKSUBDIR= yes -USE_PERL5_BUILD= yes -USE_PHP= yes -WANT_PHP_WEB= yes - -pre-everything:: - @${ECHO} "" -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you don't want to automatically activate the plug-in set" - @${ECHO} "WITHOUT_ACTIVATE=yes" -.else - @${ECHO} "NOT Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you want to automatically activate the plug-in unset" - @${ECHO} "WITHOUT_ACTIVATE" -.endif - @${ECHO} "" - -do-install: - ${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} - -post-install: -.ifndef WITHOUT_ACTIVATE -.if exists( ${SQUIRRELDIR}/config/config.php ) - @${ECHO} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} -.endif -.else - @${ECHO} "To activate the plug-in in SquirrelMail use" - @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" -.endif - @${ECHO} "" - -.include +.include +.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" +.include Modified: head/mail/squirrelmail-postfixadmin-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-postfixadmin-plugin/Makefile Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-postfixadmin-plugin/Makefile Sat Nov 10 01:37:24 2012 (r307260) @@ -20,6 +20,7 @@ COMMENT= Lets users change password, vac RUN_DEPENDS= ZendFramework>=1.9.0:${PORTSDIR}/www/zend-framework USE_BZIP2= yes +DEFAULT_PHP_VER= 53 .include .include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" Modified: head/mail/squirrelmail-qmailadmin_login-plugin/Makefile ============================================================================== --- head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Sat Nov 10 01:37:24 2012 (r307260) @@ -1,75 +1,18 @@ -# New ports collection makefile for: squirrelmail-qmailadmin_login-plugin -# Date created: 9 Dec 2006 -# Whom: Gerrit Beine -# +# Created by: Gerrit Beine # $FreeBSD$ -PORTNAME= squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin -PORTVERSION= 1.1 +PORTNAME= qmailadmin_login +PORTVERSION= 1.1 PORTREVISION= 2 -CATEGORIES= mail www -MASTER_SITES= http://www.squirrelmail.org/plugins/ -DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.3 -DIST_SUBDIR= squirrelmail +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.3 +DIST_SUBDIR= squirrelmail MAINTAINER= ports@FreeBSD.org COMMENT= Using the QmailAdmin cgi interface from SquirrelMail -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail +SQUIRREL_PLUGIN_NAME= ${PORTNAME} -SQUIRREL_PLUGIN_NAME= qmailadmin_login -.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 - -SUB_FILES= pkg-message - -NO_BUILD= yes -NO_WRKSUBDIR= yes -USE_PERL5_BUILD= yes -USE_PHP= yes -WANT_PHP_WEB= yes - -pre-everything:: - @${ECHO} "" -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you don't want to automatically activate the plug-in set" - @${ECHO} "WITHOUT_ACTIVATE=yes" -.else - @${ECHO} "NOT Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you want to automatically activate the plug-in unset" - @${ECHO} "WITHOUT_ACTIVATE" -.endif - @${ECHO} "" - -do-install: - ${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} - -post-install: -.ifndef WITHOUT_ACTIVATE -.if exists( ${SQUIRRELDIR}/config/config.php ) - @${ECHO} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} -.endif -.else - @${ECHO} "To activate the plug-in in SquirrelMail use" - @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" -.endif - @${ECHO} "" - @${CAT} ${PKGMESSAGE} - -.include +.include +.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" +.include Modified: head/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in ============================================================================== --- head/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in Fri Nov 9 23:02:15 2012 (r307259) +++ head/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in Sat Nov 10 01:37:24 2012 (r307260) @@ -1,5 +1,5 @@ For the port to work properly you must copy the file -%%PREFIX%%/%%SQUIRRELDIR%%/plugins/qmailadmin_login/config_default.php +%%SQUIRRELDIR%%/plugins/qmailadmin_login/config_default.php to -%%PREFIX%%/%%SQUIRRELDIR%%/plugins/qmailadmin_login/config.php +%%SQUIRRELDIR%%/plugins/qmailadmin_login/config.php and edit the configuration to meet your needs.