Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Jul 2007 15:33:48 -0400 (EDT)
From:      Thomas Abthorpe <thomas@goodking.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        alexander@wittig.name, thomas@goodking.ca, miwi@FreeBSD.org
Subject:   ports/114480: [PATCH] mail/squirrelmail-compatibility-plugin: update to 2.0.8, take maintainership
Message-ID:  <200707101933.l6AJXm20095867@goodking.goodking.ca>
Resent-Message-ID: <200707101940.l6AJe5t3031737@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         114480
>Category:       ports
>Synopsis:       [PATCH] mail/squirrelmail-compatibility-plugin: update to 2.0.8, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 19:40:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Abthorpe
>Release:        FreeBSD 6.2-RELEASE-p5 i386
>Organization:
GoodKing.Ca
>Environment:
System: FreeBSD goodking.goodking.ca 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #0: Sun Jun 10 14:58:15 EDT 2007
>Description:
- Update to 2.0.8
- Take maintainership, pre-arranged with current maintainer
- rework Makefile for easier readability
- reformat pkg-desc
- thanks to neil_AT_darlow_co_uk for reviewing the patch

Port maintainer (alexander@wittig.name) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- squirrelmail-compatibility-plugin-2.0.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-compatibility-plugin/Makefile /home/ports/mail/squirrelmail-compatibility-plugin/Makefile
--- /usr/ports/mail/squirrelmail-compatibility-plugin/Makefile	Mon Feb 12 11:37:52 2007
+++ /home/ports/mail/squirrelmail-compatibility-plugin/Makefile	Tue Jul 10 15:16:25 2007
@@ -4,35 +4,39 @@
 #
 # $FreeBSD: ports/mail/squirrelmail-compatibility-plugin/Makefile,v 1.6 2007/02/12 16:37:52 rafan Exp $
 
-PORTNAME=	squirrelmail
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTNAME=	compatibility
+PORTVERSION=	2.0.8
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMESUFFIX=	-${SQUIRREL_PLUGIN_NAME}-plugin
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	alexander@wittig.name
+MAINTAINER=	thomas@goodking.ca
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-RUN_DEPENDS=	squirrelmail>=1.4.9:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	squirrelmail>=1.4.10:${PORTSDIR}/mail/squirrelmail
 
 CONFLICTS=	squirrelmail-compatibility-plugin-1.*
 
-SQUIRREL_PLUGIN_NAME=	compatibility
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
+SUB_LIST+=	"SQUIRRELDIR=${SQUIRRELDIR}"
 .else
-.	ifndef WITHOUT_WWWDIR
+.ifndef WITHOUT_WWWDIR
 SQUIRRELDIR=	${PREFIX}/www/squirrelmail
 PLIST_SUB+=	SQUIRRELDIR=www/squirrelmail
-.	else
+SUB_LIST+=	"SQUIRRELDIR=www/squirrelmail"
+.else
 SQUIRRELDIR=	${PREFIX}/squirrelmail
 PLIST_SUB+=	SQUIRRELDIR=squirrelmail
-.	endif
+SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
+.endif
 .endif
+PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -56,11 +60,12 @@
 
 do-install:
 	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
 
 post-install:
 	@${ECHO} "Patching SquirrelMail for compatibility plugin"
 	@${ECHO} ""
-	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins/compatibility < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.9.diff
+	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins/compatibility < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.10.diff
 	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-compatibility-plugin/distinfo /home/ports/mail/squirrelmail-compatibility-plugin/distinfo
--- /usr/ports/mail/squirrelmail-compatibility-plugin/distinfo	Wed Jan 24 16:17:41 2007
+++ /home/ports/mail/squirrelmail-compatibility-plugin/distinfo	Tue Jul 10 10:57:01 2007
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.6.tar.gz) = a0cd6c1e2d307184033b35ee34fd2364
-SHA256 (squirrelmail/compatibility-2.0.6.tar.gz) = 3f2c27390bf715d98220849b2445332683daa23a0e05d2a037b17e497f3d114c
-SIZE (squirrelmail/compatibility-2.0.6.tar.gz) = 25079
+MD5 (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = b7a19451b104480fc01f75f39d056cd0
+SHA256 (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = d3cde09dee0470091d651fdc907f80ff16f3189482beed822e421f2b3283d4f6
+SIZE (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = 32254
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-compatibility-plugin/pkg-descr /home/ports/mail/squirrelmail-compatibility-plugin/pkg-descr
--- /usr/ports/mail/squirrelmail-compatibility-plugin/pkg-descr	Sat Mar 18 12:37:02 2006
+++ /home/ports/mail/squirrelmail-compatibility-plugin/pkg-descr	Tue Jul 10 15:21:25 2007
@@ -1,10 +1,7 @@
-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.
+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
-
-- Alexander Wittig
-alexander@wittig.name
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-compatibility-plugin/pkg-plist /home/ports/mail/squirrelmail-compatibility-plugin/pkg-plist
--- /usr/ports/mail/squirrelmail-compatibility-plugin/pkg-plist	Wed Jan 24 16:17:41 2007
+++ /home/ports/mail/squirrelmail-compatibility-plugin/pkg-plist	Tue Jul 10 14:49:24 2007
@@ -1,4 +1,4 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
 @unexec mv -f %D/%%SQUIRRELDIR%%/functions/strings.php.orig %D/%%SQUIRRELDIR%%/functions/strings.php
 @exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
 @exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
@@ -21,15 +21,11 @@
 %%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
 %%SQUIRRELDIR%%/plugins/compatibility/README
 %%SQUIRRELDIR%%/plugins/compatibility/setup.php
-%%SQUIRRELDIR%%/plugins/compatibility/TODO
 %%SQUIRRELDIR%%/plugins/compatibility/version
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.0.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.1.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.2.diff
@@ -40,6 +36,7 @@
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.7.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.8.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.9.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.10.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.5.0.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.2.11.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.4.diff
@@ -61,6 +58,7 @@
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
@@ -69,4 +67,4 @@
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
 @exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins/compatibility < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility; fi
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
--- squirrelmail-compatibility-plugin-2.0.8.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707101933.l6AJXm20095867>