From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 12 01:10:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC4A01065679 for ; Tue, 12 Jul 2011 01:10:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8BB668FC1A for ; Tue, 12 Jul 2011 01:10:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6C1ACaH057680 for ; Tue, 12 Jul 2011 01:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6C1ACIs057679; Tue, 12 Jul 2011 01:10:12 GMT (envelope-from gnats) Resent-Date: Tue, 12 Jul 2011 01:10:12 GMT Resent-Message-Id: <201107120110.p6C1ACIs057679@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, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 655FA1065673 for ; Tue, 12 Jul 2011 01:09:07 +0000 (UTC) (envelope-from mm@neo.vx.sk) Received: from neo.vx.sk (neo.vx.sk [188.40.111.84]) by mx1.freebsd.org (Postfix) with ESMTP id 9C7DD8FC14 for ; Tue, 12 Jul 2011 01:09:06 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by neo.vx.sk (Postfix) with ESMTP id 865DBBD55; Tue, 12 Jul 2011 03:09:07 +0200 (CEST) Received: (from mm@localhost) by neo.vx.sk (8.14.4/8.14.4/Submit) id p6BAe63m069391; Mon, 11 Jul 2011 12:40:06 +0200 (CEST) (envelope-from mm) Message-Id: <201107111040.p6BAe63m069391@neo.vx.sk> Date: Mon, 11 Jul 2011 12:40:06 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gerrit.beine@gmx.de Subject: ports/158822: [PATCH] devel/pear-PHPUnit: update to new PEAR channel infrastructure X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 01:10:12 -0000 >Number: 158822 >Category: ports >Synopsis: [PATCH] devel/pear-PHPUnit: update to new PEAR channel infrastructure >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 12 01:10:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #1 r223692M: Thu Jun 30 14:50:37 CEST >Description: Update to new PEAR channel infrastructure Removed file(s): - files/pear-deinstall.in - files/pear-install.in Port maintainer (gerrit.beine@gmx.de) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- pear-PHPUnit-1.3.3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/pear-PHPUnit/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 31 May 2009 20:31:01 -0000 1.14 +++ Makefile 11 Jul 2011 10:39:46 -0000 @@ -9,29 +9,20 @@ PORTVERSION= 1.3.3 CATEGORIES= devel www pear MASTER_SITES= http://pear.phpunit.de/get/ +PKGNAMEPREFIX= pear- MAINTAINER= gerrit.beine@gmx.de COMMENT= PEAR regression testing framework for unit tests -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ + ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit +RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ + ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit -MANUAL_PACKAGE_BUILD= attempts to contact pear.phpunit.de during install phase +CONFLICTS= pear-PHPUnit-[23]* -CHANNEL= pear.phpunit.de -SUB_FILES= pear-deinstall pear-install -SUB_LIST+= CHANNEL=${CHANNEL} -PKGINSTALL= ${WRKDIR}/pear-install -PKGDEINSTALL= ${WRKDIR}/pear-deinstall - -NO_LATEST_LINK= yes - -FILES= PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \ - PHPUnit/GUI/HTML.tpl PHPUnit/GUI/SetupDecorator.php \ - PHPUnit/Assert.php PHPUnit/RepeatedTest.php PHPUnit/Skeleton.php \ - PHPUnit/TestCase.php PHPUnit/TestDecorator.php \ - PHPUnit/TestFailure.php PHPUnit/TestListener.php \ - PHPUnit/TestResult.php PHPUnit/TestSuite.php +PEAR_CHANNEL= phpunit +PEAR_AUTOINSTALL= yes .include .include "${PORTSDIR}/devel/pear/bsd.pear.mk" Index: files/pear-deinstall.in =================================================================== RCS file: files/pear-deinstall.in diff -N files/pear-deinstall.in --- files/pear-deinstall.in 13 Jan 2009 00:10:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/devel/pear-PHPUnit/files/pear-deinstall.in,v 1.1 2009/01/13 00:10:33 miwi Exp $ -# -# Remove package declaration from PEAR's registry and optionally delete -# a non-standard channel. - -if [ x$2 != xDEINSTALL -a x$2 != xPOST-DEINSTALL ]; then - exit -fi -PKG_NAME=${1%%-[0-9._]*} -PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') - -PEAR=${PKG_PREFIX}/bin/pear -CHANNEL=%%CHANNEL%% - -if [ "$2" = "DEINSTALL" ]; then - if [ "x${CHANNEL}" != "x" ]; then - ${PEAR} uninstall -r -n ${CHANNEL}/${PACKAGE} || true - else - ${PEAR} uninstall -r -n ${PACKAGE} || true - fi -else - if [ "x${CHANNEL}" != "x" ]; then - ${PEAR} channel-delete ${CHANNEL} - fi -fi Index: files/pear-install.in =================================================================== RCS file: files/pear-install.in diff -N files/pear-install.in --- files/pear-install.in 13 Jan 2009 00:10:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/devel/pear-PHPUnit/files/pear-install.in,v 1.1 2009/01/13 00:10:33 miwi Exp $ -# -# Register the package $1 in the port registry and optionally add a -# non-standard channel. - -PREFIX=${PKG_PREFIX:=%%PREFIX%%} -PEAR=${PREFIX}/bin/pear -PKGREGDIR=${PREFIX}/share/pear/packages/$1 -CHANNEL=%%CHANNEL%% - -[ "x$1" = "x" ] && exit 1 -if [ "x$2" = "xPOST-INSTALL" ]; then - if [ "x${CHANNEL}" != "x" ]; then - ${PEAR} channel-add http://${CHANNEL}/channel.xml - fi - ${PEAR} install -r -n -f ${PKGREGDIR}/package.xml -fi --- pear-PHPUnit-1.3.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: