Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Jul 2011 12:44:50 +0200 (CEST)
From:      Martin Matuska <mm@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gerrit.beine@gmx.de
Subject:   ports/158799: [PATCH] devel/pear-PHPUnit: update to new pear channel infrastructure
Message-ID:  <201107111044.p6BAioAC070906@neo.vx.sk>
Resent-Message-ID: <201107111110.p6BBAD1G079125@freefall.freebsd.org>

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

>Number:         158799
>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:   Mon Jul 11 11:10:13 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:44:02 -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 <bsd.port.pre.mk>
 .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:



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