From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 24 06:10:16 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29DEC37B401 for ; Sat, 24 May 2003 06:10:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF3343FAF for ; Sat, 24 May 2003 06:10:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4ODAEUp050474 for ; Sat, 24 May 2003 06:10:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4ODAEr3050473; Sat, 24 May 2003 06:10:14 -0700 (PDT) Resent-Date: Sat, 24 May 2003 06:10:14 -0700 (PDT) Resent-Message-Id: <200305241310.h4ODAEr3050473@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, Thierry Thomas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D662D37B401; Sat, 24 May 2003 06:07:35 -0700 (PDT) Received: from postfix4-2.free.fr (postfix4-2.free.fr [213.228.0.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id 111AE43F85; Sat, 24 May 2003 06:07:35 -0700 (PDT) (envelope-from thierry@pompo.net) Received: from graf.pompo.net (unknown [81.56.186.139]) by postfix4-2.free.fr (Postfix) with ESMTP id 6A685C125; Sat, 24 May 2003 15:07:33 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id 4BED87521; Sat, 24 May 2003 15:04:20 +0200 (CEST) Message-Id: <20030524130420.4BED87521@graf.pompo.net> Date: Sat, 24 May 2003 15:04:20 +0200 (CEST) From: Thierry Thomas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Norikatsu Shigemura Subject: ports/52641: mail/pear-Mail_Mime: chasing php4 upgrade (follow-up to PR ports/52596). X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Thierry Thomas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2003 13:10:16 -0000 >Number: 52641 >Category: ports >Synopsis: mail/pear-Mail_Mime: chasing php4 upgrade (follow-up to PR ports/52596). >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 24 06:10:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.8-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue Apr 29 18:16:35 CEST 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: Idem PR ports/52596, for mail/pear-Mail_Mime. >How-To-Repeat: N/A. >Fix: Pre-requisite: to be applied after PR ports/52596. Removed files: pkg-deinstall and pkg-install (now parts of devel/pear-PEAR). --- pear-Mail_Mime.diff begins here --- diff -urN mail/pear-Mail_Mime.orig/Makefile mail/pear-Mail_Mime/Makefile --- mail/pear-Mail_Mime.orig/Makefile Tue Feb 25 22:36:30 2003 +++ mail/pear-Mail_Mime/Makefile Sat May 24 14:32:23 2003 @@ -7,32 +7,17 @@ PORTNAME= Mail_Mime PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR classes to create and decode MIME messages -BUILD_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR -RUN_DEPENDS= ${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install - -NO_BUILD= yes +BUILD_DEPENDS= ${PEARDIR}/Mail/mail.php:${PORTSDIR}/mail/pear-Mail +RUN_DEPENDS= ${BUILD_DEPENDS} .include - -.if exists(${LOCALBASE}/bin/php-config) -PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix -.else -PHP_BASE= ${LOCALBASE} -.endif -PEAR= ${LOCALBASE}/bin/pear -LPHP_LIB= lib/php -PEARDIR= ${PHP_BASE}/${LPHP_LIB} -PLIST_SUB= PEARDIR=${LPHP_LIB} +.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common" do-install: @${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Mail @@ -40,9 +25,5 @@ .for BUGMODE in mimeDecode.php mimePart.php xmail.dtd xmail.xsl @${CHMOD} a-x ${PEARDIR}/Mail/${BUGMODE} .endfor - -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml .include diff -urN mail/pear-Mail_Mime.orig/pkg-deinstall mail/pear-Mail_Mime/pkg-deinstall --- mail/pear-Mail_Mime.orig/pkg-deinstall Mon Feb 24 06:27:41 2003 +++ mail/pear-Mail_Mime/pkg-deinstall Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/mail/pear-Mail_Mime/pkg-deinstall,v 1.1 2003/02/24 05:27:41 edwin Exp $ -# -# Remove package declaration from PEAR's registry. - -if [ x$2 != xDEINSTALL ]; then - exit -fi -PKG_NAME=${1%%-[0-9._]*} -PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') - -${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true diff -urN mail/pear-Mail_Mime.orig/pkg-install mail/pear-Mail_Mime/pkg-install --- mail/pear-Mail_Mime.orig/pkg-install Thu Jan 1 01:00:00 1970 +++ mail/pear-Mail_Mime/pkg-install Tue Apr 8 22:16:30 2003 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Register the package $1 in the port registry + +PREFIX=${PKG_PREFIX:-/usr/local} +PEAR=${PREFIX}/bin/pear +PKGREGDIR=${PREFIX}/.PEAR.pkg/$1 + +[ "x$1" = "x" ] && exit 1 +if [ "x$2" = "xPOST-INSTALL" ]; then + ${PEAR} install -r -f ${PKGREGDIR}/package.xml +fi --- pear-Mail_Mime.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: