2010-07-01 mail/squirrelmail-compatibility-plugin1: use mail/squirrelmail-compatibility-plugin

2010-07-01 mail/squirrelmail-newuser_wiz-plugin: use mail/squirrelmail-askuserinfo-plugin

9 files changed, 0 insertions, 208 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 43abdc6a1e17..1b74583d67e0 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -662,13 +662,11 @@
     SUBDIR += squirrelmail-change_sqlpass-plugin
     SUBDIR += squirrelmail-check_quota-plugin
     SUBDIR += squirrelmail-compatibility-plugin
-    SUBDIR += squirrelmail-compatibility-plugin1
     SUBDIR += squirrelmail-email_footer-plugin
     SUBDIR += squirrelmail-login_auth-plugin
     SUBDIR += squirrelmail-login_notes-plugin
     SUBDIR += squirrelmail-mark_read-plugin
     SUBDIR += squirrelmail-multilogin-plugin
-    SUBDIR += squirrelmail-newuser_wiz-plugin
     SUBDIR += squirrelmail-notes-plugin
     SUBDIR += squirrelmail-notify-plugin
     SUBDIR += squirrelmail-password_forget-plugin
diff --git a/mail/squirrelmail-compatibility-plugin1/Makefile b/mail/squirrelmail-compatibility-plugin1/Makefile
deleted file mode 100644
index 489d37b115c0..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# New ports collection makefile for:	squirrelmail-compatibility-plugin1
-# Date created:				3 Feb 2007
-# Whom:					Alexander Wittig <alexander@wittig.name>
-#
-# $FreeBSD$
-
-PORTNAME=	compatibility
-PORTVERSION=	1.3
-PORTREVISION=	2
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DIST_SUBDIR=	squirrelmail
-
-MAINTAINER=	tabthorpe@FreeBSD.org
-COMMENT=	Required by many plugins for compatibility with SquirrelMail
-
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
-
-CONFLICTS=	squirrelmail-compatibility-plugin-2.*
-NO_LATEST_LINK=	yes
-
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
-
-DEPRECATED=		use mail/squirrelmail-compatibility-plugin
-EXPIRATION_DATE=	2010-07-01
-
-.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
-PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_PERL5_BUILD=	yes
-WANT_PHP_WEB=	yes
-
-.include <bsd.port.pre.mk>
-
-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 <bsd.port.post.mk>
diff --git a/mail/squirrelmail-compatibility-plugin1/distinfo b/mail/squirrelmail-compatibility-plugin1/distinfo
deleted file mode 100644
index d290c2954982..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (squirrelmail/compatibility-1.3.tar.gz) = 049c46507ef161ad4ba5f4d4a0b96d09
-SHA256 (squirrelmail/compatibility-1.3.tar.gz) = 0898fe16921f5c9c3855e65eb0dee9079aafbcb322644fb888397332ce04a12c
-SIZE (squirrelmail/compatibility-1.3.tar.gz) = 5966
diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-descr b/mail/squirrelmail-compatibility-plugin1/pkg-descr
deleted file mode 100644
index b148cf3b4d49..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-SquirrelMail Plug-in that provides a standard API for plugin authors
-who need certain functionalities that may not be available in older
-versions of SquirrelMail. SquirrelMail administrators only need to
-download this plugin if any of the plugins they have require it.
-This plugin has no functionality in and of itself.
-
-WWW: http://www.squirrelmail.org
diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-plist b/mail/squirrelmail-compatibility-plugin1/pkg-plist
deleted file mode 100644
index 48c7e62d0567..000000000000
--- a/mail/squirrelmail-compatibility-plugin1/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
-%%SQUIRRELDIR%%/plugins/compatibility/functions.php
-%%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/setup.php
-%%SQUIRRELDIR%%/plugins/compatibility/version
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
diff --git a/mail/squirrelmail-newuser_wiz-plugin/Makefile b/mail/squirrelmail-newuser_wiz-plugin/Makefile
deleted file mode 100644
index 3482c5b04b46..000000000000
--- a/mail/squirrelmail-newuser_wiz-plugin/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# New ports collection makefile for:	squirrelmail-newuser_wiz-plugin
-# Date created:		2006-06-20
-# Whom:			Thomas Abthorpe <thomas@goodking.ca>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	newuser_wiz
-PORTVERSION=	1.3.2
-PORTREVISION=	4
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	squirrelmail
-
-MAINTAINER=	tabthorpe@FreeBSD.org
-COMMENT=	Force user to enter Full name and Email address at initial logon
-
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin1
-
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
-
-DEPRECATED=		use mail/squirrelmail-askuserinfo-plugin
-EXPIRATION_DATE=	2010-07-01
-
-.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
-PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-.include <bsd.port.pre.mk>
-
-.if exists(${SQUIRRELDIR}/plugins/compatibility/getpot)
-IGNORE='compatibility2 plugin is incompatible with this plugin, install mail/squirrelmail-compatibility-plugin1. WARNING compatibility-plugin1 could break other squirrelmail plugins'
-.endif
-
-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 <bsd.port.post.mk>
diff --git a/mail/squirrelmail-newuser_wiz-plugin/distinfo b/mail/squirrelmail-newuser_wiz-plugin/distinfo
deleted file mode 100644
index d3021a4c1215..000000000000
--- a/mail/squirrelmail-newuser_wiz-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (squirrelmail/newuser_wiz-1.3.2.tar.gz) = 38b5c748d939d5ee650d2f3969ba1d25
-SHA256 (squirrelmail/newuser_wiz-1.3.2.tar.gz) = 9bf057f63768dc02d3d3ecd2e3570160d2d9fc9c2806ba0e40b9fa8536cb2bdd
-SIZE (squirrelmail/newuser_wiz-1.3.2.tar.gz) = 3543
diff --git a/mail/squirrelmail-newuser_wiz-plugin/pkg-descr b/mail/squirrelmail-newuser_wiz-plugin/pkg-descr
deleted file mode 100644
index 0871dac5baa5..000000000000
--- a/mail/squirrelmail-newuser_wiz-plugin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-User is forced to enter Full Name and Email Address prior to reading
-or composing after logging in. This is used for users who log in
-for the first time and need to set up their prefs prior to getting
-started.
-
-WWW:    http://www.squirrelmail.org/plugin_view.php?id=181
diff --git a/mail/squirrelmail-newuser_wiz-plugin/pkg-plist b/mail/squirrelmail-newuser_wiz-plugin/pkg-plist
deleted file mode 100644
index 1cbb1cd6307c..000000000000
--- a/mail/squirrelmail-newuser_wiz-plugin/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
-%%SQUIRRELDIR%%/plugins/newuser_wiz/functions.php
-%%SQUIRRELDIR%%/plugins/newuser_wiz/setup.php
-%%SQUIRRELDIR%%/plugins/newuser_wiz/README
-%%SQUIRRELDIR%%/plugins/newuser_wiz/version
-%%SQUIRRELDIR%%/plugins/newuser_wiz/index.php
-%%SQUIRRELDIR%%/plugins/newuser_wiz/INSTALL
-%%SQUIRRELDIR%%/plugins/newuser_wiz/xgetpot
-%%SQUIRRELDIR%%/plugins/newuser_wiz/wiz_submit.php
-%%SQUIRRELDIR%%/plugins/newuser_wiz/newuser_wiz_sample.po
-%%SQUIRRELDIR%%/plugins/newuser_wiz/newuser_wiz.pot
-@dirrm %%SQUIRRELDIR%%/plugins/newuser_wiz
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi