Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 May 2003 00:07:24 +0200 (CEST)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Norikatsu Shigemura <nork@FreeBSD.org>
Subject:   ports/52656: security/pear-Crypt_CBC: chasing php4 upgrade (follow-up to PR ports/52596).
Message-ID:  <20030524220724.3299B7672@graf.pompo.net>
Resent-Message-ID: <200305242210.h4OMAFRw078960@freefall.freebsd.org>

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

>Number:         52656
>Category:       ports
>Synopsis:       security/pear-Crypt_CBC: 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 15: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 security/pear-Crypt_CBC.

>How-To-Repeat:
	Install lang/php4, then try to build this port.

>Fix:
	Pre-requisite: to be applied after PR ports/52596.

	Removed files: pkg-deinstall (now parts of devel/pear-PEAR).

--- pear-Crypt_CBC.diff begins here ---
diff -urN security/pear-Crypt_CBC.orig/Makefile security/pear-Crypt_CBC/Makefile
--- security/pear-Crypt_CBC.orig/Makefile	Wed May 14 19:20:51 2003
+++ security/pear-Crypt_CBC/Makefile	Sat May 24 21:49:20 2003
@@ -7,39 +7,21 @@
 
 PORTNAME=	Crypt_CBC
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	security www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
 .include <bsd.port.pre.mk>
-
-.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:
 	@${MKDIR} ${PEARDIR}/Crypt
 	@${CP} -Rp ${WRKSRC}/CBC.php ${PEARDIR}/Crypt
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Crypt
-
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
 
 .include <bsd.port.post.mk>
diff -urN security/pear-Crypt_CBC.orig/pkg-deinstall security/pear-Crypt_CBC/pkg-deinstall
--- security/pear-Crypt_CBC.orig/pkg-deinstall	Mon Feb 24 06:27:41 2003
+++ security/pear-Crypt_CBC/pkg-deinstall	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/pear-Crypt_CBC/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 security/pear-Crypt_CBC.orig/pkg-descr security/pear-Crypt_CBC/pkg-descr
--- security/pear-Crypt_CBC.orig/pkg-descr	Thu Nov 28 21:40:07 2002
+++ security/pear-Crypt_CBC/pkg-descr	Sat May 24 21:47:11 2003
@@ -1,3 +1,3 @@
 A PEAR class to emulate Perl's Crypt::CBC module.
 
-WWW: http://pear.php.net/package-info.php?pacid=48
+WWW: http://pear.php.net/package-info.php?package=Crypt_CBC
diff -urN security/pear-Crypt_CBC.orig/pkg-plist security/pear-Crypt_CBC/pkg-plist
--- security/pear-Crypt_CBC.orig/pkg-plist	Wed May 14 19:20:51 2003
+++ security/pear-Crypt_CBC/pkg-plist	Sat May 24 21:50:34 2003
@@ -1,2 +1,4 @@
 %%PEARDIR%%/Crypt/CBC.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/Crypt
+@dirrm %%PKGREGDIR%%
--- pear-Crypt_CBC.diff ends here ---

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



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