From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 26 20:10:15 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 36B7C16A40E for ; Thu, 26 Apr 2007 20:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id D35AD13C45B for ; Thu, 26 Apr 2007 20:10:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3QKAEpW068171 for ; Thu, 26 Apr 2007 20:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3QKAEWZ068170; Thu, 26 Apr 2007 20:10:14 GMT (envelope-from gnats) Resent-Date: Thu, 26 Apr 2007 20:10:14 GMT Resent-Message-Id: <200704262010.l3QKAEWZ068170@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Neil Darlow Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CD9FA16A408 for ; Thu, 26 Apr 2007 20:05:09 +0000 (UTC) (envelope-from neil@darlow.co.uk) Received: from queue02-winn.ispmail.ntl.com (queue02-winn.ispmail.ntl.com [81.103.221.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4071A13C4EE for ; Thu, 26 Apr 2007 20:05:09 +0000 (UTC) (envelope-from neil@darlow.co.uk) Received: from aamtaout02-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com with ESMTP id <20070426194049.OJHR19810.mtaout02-winn.ispmail.ntl.com@aamtaout02-winn.ispmail.ntl.com> for ; Thu, 26 Apr 2007 20:40:49 +0100 Received: from router.darlow.co.uk ([80.6.42.220]) by aamtaout02-winn.ispmail.ntl.com with ESMTP id <20070426194049.WJFJ17393.aamtaout02-winn.ispmail.ntl.com@router.darlow.co.uk> for ; Thu, 26 Apr 2007 20:40:49 +0100 Received: from router.darlow.co.uk (localhost [127.0.0.1]) by router.darlow.co.uk (Postfix) with ESMTP id 0D3F51030C9 for ; Thu, 26 Apr 2007 20:40:47 +0100 (BST) Received: by router.darlow.co.uk (Postfix, from userid 1001) id EFC071030C6; Thu, 26 Apr 2007 20:40:46 +0100 (BST) Message-Id: <20070426194046.EFC071030C6@router.darlow.co.uk> Date: Thu, 26 Apr 2007 20:40:46 +0100 (BST) From: Neil Darlow To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/112166: squirrelmail-password_forget-plugin auto-install/remove fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Neil Darlow List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Apr 2007 20:10:15 -0000 >Number: 112166 >Category: ports >Synopsis: squirrelmail-password_forget-plugin auto-install/remove fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Apr 26 20:10:13 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Neil Darlow >Release: FreeBSD 6.2-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD router.darlow.co.uk 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #0: Sun Mar 18 20:52:24 GMT 2007 root@router.darlow.co.uk:/usr/obj/usr/src/sys/ROUTER i386 >Description: Modify port to include bsd.port.(pre|post).mk to fix auto-install/remove Adopt new PKGNAMEPREFIX-PORTNAME-PKGNAMESUFFIX standard for squirrelmail ports Bump PORTREVISION to reflect user-visible behaviour change of port >How-To-Repeat: N/A >Fix: Patch follows. diff -ur mail/squirrelmail-password_forget-plugin.orig/Makefile mail/squirrelmail-password_forget-plugin/Makefile --- mail/squirrelmail-password_forget-plugin.orig/Makefile Fri Jan 26 09:41:20 2007 +++ mail/squirrelmail-password_forget-plugin/Makefile Thu Apr 26 20:12:31 2007 @@ -4,12 +4,13 @@ # # $FreeBSD: ports/mail/squirrelmail-password_forget-plugin/Makefile,v 1.3 2007/01/25 22:58:54 miwi Exp $ -PORTNAME= squirrelmail +PORTNAME= password_forget PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www MASTER_SITES= http://www.squirrelmail.org/plugins/ -PKGNAMESUFFIX= -${SQUIRREL_PLUGIN_NAME}-plugin +PKGNAMEPREFIX= squirrelmail- +PKGNAMESUFFIX= -plugin DISTNAME= ${SQUIRREL_PLUGIN_NAME}.${PORTVERSION}-1.0.1 DIST_SUBDIR= squirrelmail @@ -19,7 +20,7 @@ RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \ ${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin -SQUIRREL_PLUGIN_NAME= password_forget +SQUIRREL_PLUGIN_NAME= ${PORTNAME} .ifdef SQUIRRELDIR PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR} @@ -32,12 +33,15 @@ PLIST_SUB+= 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 + pre-everything:: @${ECHO} "" .ifndef WITHOUT_ACTIVATE @@ -66,4 +70,4 @@ @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" .endif -.include +.include diff -ur mail/squirrelmail-password_forget-plugin.orig/pkg-plist mail/squirrelmail-password_forget-plugin/pkg-plist --- mail/squirrelmail-password_forget-plugin.orig/pkg-plist Mon Dec 4 21:56:46 2006 +++ mail/squirrelmail-password_forget-plugin/pkg-plist Thu Apr 26 20:14:01 2007 @@ -1,4 +1,4 @@ -@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin password_forget; fi +@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi %%SQUIRRELDIR%%/plugins/password_forget/COPYING %%SQUIRRELDIR%%/plugins/password_forget/INSTALL %%SQUIRRELDIR%%/plugins/password_forget/README @@ -8,4 +8,4 @@ %%SQUIRRELDIR%%/plugins/password_forget/setup.php %%SQUIRRELDIR%%/plugins/password_forget/version @dirrmtry %%SQUIRRELDIR%%/plugins/password_forget -@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin password_forget; fi +@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi >Release-Note: >Audit-Trail: >Unformatted: