Attachment 108708 Details for Bug 149615 – pear-1.9.1.patch

[patch] pear-1.9.1.patch

pear-1.9.1.patch (text/plain), 4.54 KB, created by Martin Matuska on 2010-08-13 14:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2010-08-13 14:30:05 UTC

Size: 4.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/pear/Makefile,v
>retrieving revision 1.33
>diff -u -r1.33 Makefile
>--- Makefile	3 Sep 2009 21:54:58 -0000	1.33
>+++ Makefile	13 Aug 2010 13:19:47 -0000
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	pear
>-PORTVERSION=	1.9.0
>+PORTVERSION=	1.9.1
> CATEGORIES=	devel
>-MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
>+MASTER_SITES=	${MASTER_SITE_LOCAL}
>+MASTER_SITE_SUBDIR=	mm
> 
> MAINTAINER=	miwi@FreeBSD.org
> COMMENT=	PEAR framework for PHP
>@@ -22,7 +23,10 @@
> PEARDIR=	${PREFIX}/share/pear
> 
> post-patch:
>-	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/go-pear
>+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
>+		-e "s|%%BUNDLEDIR%%|${WRKSRC}/go-pear-bundle|" \
>+		-e "s|%%TMPDIR%%|${TMPDIR}/go-pear|" \
>+		${WRKSRC}/go-pear
> 
> do-install:
> 	@${LOCALBASE}/bin/php -q ${WRKSRC}/go-pear
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/pear/distinfo,v
>retrieving revision 1.16
>diff -u -r1.16 distinfo
>--- distinfo	3 Sep 2009 21:54:58 -0000	1.16
>+++ distinfo	13 Aug 2010 13:19:47 -0000
>@@ -1,3 +1,3 @@
>-MD5 (pear-1.9.0.tar.bz2) = 669de1c6558d9ece26747acba248dd22
>-SHA256 (pear-1.9.0.tar.bz2) = 71302e423ca215d8881fcda4e4640b1e0289a8716a4c3a6e99679260710b5b69
>-SIZE (pear-1.9.0.tar.bz2) = 310681
>+MD5 (pear-1.9.1.tar.bz2) = d057053f4f3cb9380593c17b85feab91
>+SHA256 (pear-1.9.1.tar.bz2) = f1ee28f797ba02ad688e362488efdf7f8993c06b251cab896ecf510cae0e6cec
>+SIZE (pear-1.9.1.tar.bz2) = 325597
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/devel/pear/pkg-plist,v
>retrieving revision 1.17
>diff -u -r1.17 pkg-plist
>--- pkg-plist	26 Apr 2009 23:15:47 -0000	1.17
>+++ pkg-plist	13 Aug 2010 13:19:48 -0000
>@@ -143,13 +143,9 @@
> %%DATADIR%%/data/PEAR/package.dtd
> %%DATADIR%%/data/PEAR/template.spec
> %%DATADIR%%/data/Structures_Graph/LICENSE
>-%%DATADIR%%/data/Structures_Graph/genpackage.xml.pl
>-%%DATADIR%%/data/Structures_Graph/package.sh
>-%%DATADIR%%/data/Structures_Graph/publish.sh
> %%DATADIR%%/pearcmd.php
> %%DATADIR%%/peclcmd.php
>-%%DATADIR%%/tests/Structures_Graph/tests/README
>-%%DATADIR%%/tests/Structures_Graph/tests/all-tests.php
>+%%DATADIR%%/tests/Structures_Graph/tests/AllTests.php
> %%DATADIR%%/tests/Structures_Graph/tests/testCase/BasicGraph.php
> @dirrm %%DOCSDIR%%/Archive_Tar/docs
> @dirrm %%DOCSDIR%%/Archive_Tar
>Index: files/patch-go-pear
>===================================================================
>RCS file: /home/pcvs/ports/devel/pear/files/patch-go-pear,v
>retrieving revision 1.5
>diff -u -r1.5 patch-go-pear
>--- files/patch-go-pear	26 Apr 2009 23:15:47 -0000	1.5
>+++ files/patch-go-pear	13 Aug 2010 13:19:48 -0000
>@@ -1,5 +1,5 @@
>---- go-pear.orig	2009-04-08 12:20:28.000000000 +0200
>-+++ go-pear	2009-04-26 20:51:39.000000000 +0200
>+--- go-pear.orig	2010-08-05 23:26:55.000000000 +0200
>++++ go-pear	2010-08-13 15:05:29.753811744 +0200
> @@ -116,7 +116,7 @@
>  );
>  
>@@ -54,7 +54,7 @@
>  if (!WEBINSTALLER) {
>      $msg = "The following PEAR packages are bundled with PHP: " .
>          implode(', ', array_keys($pfc_packages));
>-@@ -571,7 +571,7 @@
>+@@ -571,17 +571,17 @@
>      $install_optional_packages = array();
>      print "\n";
>  }
>@@ -63,9 +63,13 @@
>  ####
>  # Download
>  ####
>-@@ -581,7 +581,7 @@
>+ 
>+ if (function_exists('set_include_path')) {
>+-   set_include_path($ptmp);
>++   set_include_path($ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%");
>  } else {
>-    ini_set('include_path', $ptmp);
>+-   ini_set('include_path', $ptmp);
>++   ini_set('include_path', $ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%");
>  }
> -
> +/*
>@@ -94,6 +98,18 @@
>  }
>  
>  // gopear_bundle usage
>+@@ -655,9 +656,9 @@
>+ if ($nobootstrap) {
>+     print('Using previously install ... ');
>+     if (function_exists('set_include_path')) {
>+-        set_include_path($php_dir);
>++        set_include_path($php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%");
>+     } else {
>+-        ini_set('include_path', $php_dir);
>++        ini_set('include_path', $php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%");
>+     }
>+     include_once 'PEAR.php';
>+     print "ok\n";
> @@ -750,7 +751,7 @@
>  if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
>      $config = &PEAR_Config::singleton($prefix."/pear.conf", '');
>@@ -140,7 +156,7 @@
>          $test_dir  = '$php_dir/tests';
> -        $temp_dir   = '$prefix/temp';
> -
>-+  	$temp_dir   = '/tmp/go-pear';
>++  	$temp_dir   = '%%TMPDIR%%';
> +/*
>          // check if the user has installed PHP with PHP or GNU layout
>          if (@is_dir("$prefix/lib/php/.registry")) {

Actions: View | Diff

Attachments on bug 149615: 108708