Tue Sep 2 17:37:59 2008 UTC ()
Change /tmp directory used on installation (fix for PR 39449)


(adrianp)
diff -r1.5 -r1.6 pkgsrc/lang/pear/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/pear/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/pear/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/lang/pear/Makefile (switch to unified diff)

--- pkgsrc/lang/pear/Makefile 2007/09/05 19:46:55 1.5
+++ pkgsrc/lang/pear/Makefile 2008/09/02 17:37:59 1.6
@@ -1,104 +1,105 @@ @@ -1,104 +1,105 @@
1# $NetBSD: Makefile,v 1.5 2007/09/05 19:46:55 jdolecek Exp $ 1# $NetBSD: Makefile,v 1.6 2008/09/02 17:37:59 adrianp Exp $
2# 2#
3 3
4DISTNAME= PEAR-1.5.4 4DISTNAME= PEAR-1.5.4
5PKGREVISION= 1 5PKGREVISION= 1
6PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} 6PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= http://download.pear.php.net/package/ 8MASTER_SITES= http://download.pear.php.net/package/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= adrianp@NetBSD.org 11MAINTAINER= adrianp@NetBSD.org
12HOMEPAGE= http://pear.php.net/ 12HOMEPAGE= http://pear.php.net/
13COMMENT= PEAR Base System for PHP 13COMMENT= PEAR Base System for PHP
14 14
15USE_LANGUAGES= # none 15USE_LANGUAGES= # none
16EXTRACT_ONLY= # none 16EXTRACT_ONLY= # none
17USE_TOOLS+= gzcat 17USE_TOOLS+= gzcat
18 18
19.include "../../lang/php/phpversion.mk" 19.include "../../lang/php/phpversion.mk"
20 20
21.if ${PKG_PHP_VERSION} == "4" 21.if ${PKG_PHP_VERSION} == "4"
22CONFLICTS+= php<4.4.6nb1 22CONFLICTS+= php<4.4.6nb1
23.elif ${PKG_PHP_VERSION} == "5" 23.elif ${PKG_PHP_VERSION} == "5"
24CONFLICTS+= php<5.2.1nb2 24CONFLICTS+= php<5.2.1nb2
25.endif 25.endif
26 26
27CONF_FILES= ${PREFIX}/share/examples/pear/pear.conf \ 27CONF_FILES= ${PREFIX}/share/examples/pear/pear.conf \
28 ${PKG_SYSCONFDIR}/pear.conf 28 ${PKG_SYSCONFDIR}/pear.conf
29 29
30BUNDLE= ${WRKSRC}/install/go-pear-bundle 30BUNDLE= ${WRKSRC}/install/go-pear-bundle
31 31
32# everything else that forms a part of the "base" PEAR install 32# everything else that forms a part of the "base" PEAR install
33# 33#
34PEAR_SRCS= PEAR-1.5.4${EXTRACT_SUFX} 34PEAR_SRCS= PEAR-1.5.4${EXTRACT_SUFX}
35DISTFILES+= ${PEAR_SRCS} 35DISTFILES+= ${PEAR_SRCS}
36EXTRACT_ONLY+= ${PEAR_SRCS} 36EXTRACT_ONLY+= ${PEAR_SRCS}
37 37
38ARCHIVE_SRCS= Archive_Tar-1.3.2${EXTRACT_SUFX} 38ARCHIVE_SRCS= Archive_Tar-1.3.2${EXTRACT_SUFX}
39ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//} 39ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//}
40DISTFILES+= ${ARCHIVE_SRCS} 40DISTFILES+= ${ARCHIVE_SRCS}
41EXTRACT_ONLY+= ${ARCHIVE_SRCS} 41EXTRACT_ONLY+= ${ARCHIVE_SRCS}
42 42
43CONSOLE_SRCS= Console_Getopt-1.2.2${EXTRACT_SUFX} 43CONSOLE_SRCS= Console_Getopt-1.2.2${EXTRACT_SUFX}
44CONSOLE_WRKSRC= ${WRKDIR}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}//} 44CONSOLE_WRKSRC= ${WRKDIR}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}//}
45DISTFILES+= ${CONSOLE_SRCS} 45DISTFILES+= ${CONSOLE_SRCS}
46EXTRACT_ONLY+= ${CONSOLE_SRCS} 46EXTRACT_ONLY+= ${CONSOLE_SRCS}
47 47
48STRUCTURES_SRCS= Structures_Graph-1.0.2${EXTRACT_SUFX} 48STRUCTURES_SRCS= Structures_Graph-1.0.2${EXTRACT_SUFX}
49DISTFILES+= ${STRUCTURES_SRCS} 49DISTFILES+= ${STRUCTURES_SRCS}
50# 50#
51# end of base components 51# end of base components
52 52
53SUBST_CLASSES+= config 53SUBST_CLASSES+= config
54SUBST_STAGE.config= post-patch 54SUBST_STAGE.config= post-patch
55SUBST_FILES.config= install/go-pear.php 55SUBST_FILES.config= install/go-pear.php
56SUBST_SED.config= -e "s|@PREFIX@|${PREFIX}|g" 56SUBST_SED.config= -e "s|@WRKSRC@|${WRKSRC}|g"
 57SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g"
57SUBST_SED.config+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 58SUBST_SED.config+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
58SUBST_MESSAGE.config= Fixing configuration files. 59SUBST_MESSAGE.config= Fixing configuration files.
59 60
60SUBST_CLASSES+= pear 61SUBST_CLASSES+= pear
61SUBST_STAGE.pear= post-patch 62SUBST_STAGE.pear= post-patch
62SUBST_FILES.pear= pear.sh 63SUBST_FILES.pear= pear.sh
63SUBST_SED.pear= -e "s|@php_bin@|${PREFIX}/bin/php|g" 64SUBST_SED.pear= -e "s|@php_bin@|${PREFIX}/bin/php|g"
64SUBST_SED.pear+= -e "s|@php_dir@|${PREFIX}/lib/php|g" 65SUBST_SED.pear+= -e "s|@php_dir@|${PREFIX}/lib/php|g"
65SUBST_SED.pear+= -e "s|@SH@|${SH}|g" 66SUBST_SED.pear+= -e "s|@SH@|${SH}|g"
66SUBST_MESSAGE.pear= Fixing pear installation script. 67SUBST_MESSAGE.pear= Fixing pear installation script.
67 68
68post-extract: 69post-extract:
69 ${RM} ${WRKSRC}/INSTALL 70 ${RM} ${WRKSRC}/INSTALL
70 ${MKDIR} ${WRKSRC}/install 71 ${MKDIR} ${WRKSRC}/install
71 ${MKDIR} ${BUNDLE} 72 ${MKDIR} ${BUNDLE}
72 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install 73 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install
73 ${CP} ${FILESDIR}/pear.sh ${WRKSRC} 74 ${CP} ${FILESDIR}/pear.sh ${WRKSRC}
74 75
75do-build: 76do-build:
76 ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \ 77 ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \
77 ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/} 78 ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/}
78 ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \ 79 ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \
79 ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/} 80 ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/}
80 ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \ 81 ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \
81 ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/} 82 ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/}
82 ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \ 83 ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \
83 ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/} 84 ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/}
84 85
85 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE} 86 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}
86 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE} 87 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
87 ${CP} ${WRKSRC}/PEAR.php ${BUNDLE} 88 ${CP} ${WRKSRC}/PEAR.php ${BUNDLE}
88 89
89do-install: 90do-install:
90 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pear 91 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pear
91 ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local 92 ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
92 ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${PREFIX}/bin/pear 93 ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${PREFIX}/bin/pear
93 ${CP} ${PKG_SYSCONFDIR}/pear.conf ${PREFIX}/share/examples/pear 94 ${CP} ${PKG_SYSCONFDIR}/pear.conf ${PREFIX}/share/examples/pear
94 ${RM} ${PKG_SYSCONFDIR}/pear.conf 95 ${RM} ${PKG_SYSCONFDIR}/pear.conf
95 96
96.include "${PHPPKGSRCDIR}/buildlink3.mk" 97.include "${PHPPKGSRCDIR}/buildlink3.mk"
97 98
98.if ${PKG_PHP_VERSION} == "4" 99.if ${PKG_PHP_VERSION} == "4"
99BUILDLINK_API_DEPENDS.php+= php>=4.4.6nb1 100BUILDLINK_API_DEPENDS.php+= php>=4.4.6nb1
100.elif ${PKG_PHP_VERSION} == "5" 101.elif ${PKG_PHP_VERSION} == "5"
101BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2 102BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2
102.endif 103.endif
103 104
104.include "../../mk/bsd.pkg.mk" 105.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/pear/distinfo (switch to unified diff)

--- pkgsrc/lang/pear/distinfo 2007/05/16 12:19:08 1.2
+++ pkgsrc/lang/pear/distinfo 2008/09/02 17:37:59 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.2 2007/05/16 12:19:08 adrianp Exp $ 1$NetBSD: distinfo,v 1.3 2008/09/02 17:37:59 adrianp Exp $
2 2
3SHA1 (Archive_Tar-1.3.2.tgz) = 40a16c6fe6cee12d9fd87d487785db2949ffa9ff 3SHA1 (Archive_Tar-1.3.2.tgz) = 40a16c6fe6cee12d9fd87d487785db2949ffa9ff
4RMD160 (Archive_Tar-1.3.2.tgz) = cec105d1cdefd502f209c24c217645cec723d7a2 4RMD160 (Archive_Tar-1.3.2.tgz) = cec105d1cdefd502f209c24c217645cec723d7a2
5Size (Archive_Tar-1.3.2.tgz) = 17150 bytes 5Size (Archive_Tar-1.3.2.tgz) = 17150 bytes
6SHA1 (Console_Getopt-1.2.2.tgz) = 3158237f6cd8ed34a269c67cbe546156c03cff0b 6SHA1 (Console_Getopt-1.2.2.tgz) = 3158237f6cd8ed34a269c67cbe546156c03cff0b
7RMD160 (Console_Getopt-1.2.2.tgz) = fb8a955ef2c41618305e03c9a4164c3a465c5e86 7RMD160 (Console_Getopt-1.2.2.tgz) = fb8a955ef2c41618305e03c9a4164c3a465c5e86
8Size (Console_Getopt-1.2.2.tgz) = 4252 bytes 8Size (Console_Getopt-1.2.2.tgz) = 4252 bytes
9SHA1 (PEAR-1.5.4.tgz) = f03a8bfbd68bd1834829a67346711fd157da3685 9SHA1 (PEAR-1.5.4.tgz) = f03a8bfbd68bd1834829a67346711fd157da3685
10RMD160 (PEAR-1.5.4.tgz) = 2e3ede082a7f6b085cfd414ddaf5b0d9dad1372f 10RMD160 (PEAR-1.5.4.tgz) = 2e3ede082a7f6b085cfd414ddaf5b0d9dad1372f
11Size (PEAR-1.5.4.tgz) = 293070 bytes 11Size (PEAR-1.5.4.tgz) = 293070 bytes
12SHA1 (Structures_Graph-1.0.2.tgz) = 300aa0a2effb0b39c4fa8a63a834748ae99c2855 12SHA1 (Structures_Graph-1.0.2.tgz) = 300aa0a2effb0b39c4fa8a63a834748ae99c2855
13RMD160 (Structures_Graph-1.0.2.tgz) = 8eb53f6da109b90bab5d8101e99183a1ae116404 13RMD160 (Structures_Graph-1.0.2.tgz) = 8eb53f6da109b90bab5d8101e99183a1ae116404
14Size (Structures_Graph-1.0.2.tgz) = 30947 bytes 14Size (Structures_Graph-1.0.2.tgz) = 30947 bytes
15SHA1 (patch-aa) = 5ff9804287e0fcea8eadf8b03f5292f11da3a5e6 15SHA1 (patch-aa) = 13701f071f8500da7365245e63fe6c6c2fc2b624
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/pear/patches/Attic/patch-aa (switch to unified diff)

--- pkgsrc/lang/pear/patches/Attic/patch-aa 2007/05/05 21:21:47 1.1.1.1
+++ pkgsrc/lang/pear/patches/Attic/patch-aa 2008/09/02 17:37:59 1.2
@@ -1,143 +1,143 @@ @@ -1,143 +1,143 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/05/05 21:21:47 adrianp Exp $ 1$NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $
2 2
3--- install/go-pear.php.orig 2007-04-15 23:09:15.000000000 +0100 3--- install/go-pear.php.orig 2007-04-15 23:09:15.000000000 +0100
4+++ install/go-pear.php 4+++ install/go-pear.php
5@@ -311,6 +311,8 @@ if (WEBINSTALLER) { 5@@ -311,6 +311,8 @@ if (WEBINSTALLER) {
6 $install_pfc = $_SESSION['go-pear']['install_pfc']; 6 $install_pfc = $_SESSION['go-pear']['install_pfc'];
7 } 7 }
8  8
9+/* 9+/*
10+ 10+
11 if (!WEBINSTALLER) { 11 if (!WEBINSTALLER) {
12 $tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r'); 12 $tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r');
13  13
14@@ -355,6 +357,8 @@ If you wish to abort, press Control-C no 14@@ -355,6 +357,8 @@ If you wish to abort, press Control-C no
15 } 15 }
16 } 16 }
17  17
18+*/ 18+*/
19+ 19+
20 $origpwd = getcwd(); 20 $origpwd = getcwd();
21  21
22 $config_vars = array_keys($config_desc); 22 $config_vars = array_keys($config_desc);
23@@ -426,6 +430,8 @@ we strongly recommand to use it. 23@@ -426,6 +430,8 @@ we strongly recommand to use it.
24 } 24 }
25 } 25 }
26  26
27+/* 27+/*
28+ 28+
29 while (!WEBINSTALLER) { 29 while (!WEBINSTALLER) {
30 print " 30 print "
31 Below is a suggested file layout for your new PEAR installation. To 31 Below is a suggested file layout for your new PEAR installation. To
32@@ -509,6 +515,8 @@ If you have a CLI (or CGI) php.exe avail 32@@ -509,6 +515,8 @@ If you have a CLI (or CGI) php.exe avail
33 } 33 }
34 } 34 }
35  35
36+*/ 36+*/
37+ 37+
38 foreach ($config_vars as $n => $var) { 38 foreach ($config_vars as $n => $var) {
39 for ($m = 1; $m <= count($config_vars); $m++) { 39 for ($m = 1; $m <= count($config_vars); $m++) {
40 $var2 = $config_vars[$m]; 40 $var2 = $config_vars[$m];
41@@ -576,6 +584,8 @@ Run this script as $root or pick another 41@@ -576,6 +584,8 @@ Run this script as $root or pick another
42 } 42 }
43 } 43 }
44  44
45+/* 45+/*
46+ 46+
47 if (!WEBINSTALLER) { 47 if (!WEBINSTALLER) {
48 $msg = "The following PEAR packages are bundled with PHP: " . 48 $msg = "The following PEAR packages are bundled with PHP: " .
49 implode(', ', $pfc_packages); 49 implode(', ', $pfc_packages);
50@@ -585,6 +595,8 @@ if (!WEBINSTALLER) { 50@@ -585,6 +595,8 @@ if (!WEBINSTALLER) {
51 print "\n"; 51 print "\n";
52 } 52 }
53  53
54+*/ 54+*/
55+ 55+
56 #### 56 ####
57 # Download 57 # Download
58 #### 58 ####
59@@ -595,6 +607,8 @@ if (function_exists('set_include_path')) 59@@ -595,6 +607,8 @@ if (function_exists('set_include_path'))
60 ini_set('include_path', $ptmp); 60 ini_set('include_path', $ptmp);
61 } 61 }
62  62
63+/* 63+/*
64+ 64+
65 if (!extension_loaded('zlib') && !WEBINSTALLER) { // In Web context we could be in multithread env which makes dl() end up with a fatal error. 65 if (!extension_loaded('zlib') && !WEBINSTALLER) { // In Web context we could be in multithread env which makes dl() end up with a fatal error.
66 if (WINDOWS) { 66 if (WINDOWS) {
67 @dl('php_zlib.dll'); 67 @dl('php_zlib.dll');
68@@ -620,6 +634,8 @@ if (!$have_gzip) { 68@@ -620,6 +634,8 @@ if (!$have_gzip) {
69 print "Downloading uncompressed packages\n"; 69 print "Downloading uncompressed packages\n";
70 }; 70 };
71  71
72+*/ 72+*/
73+ 73+
74 if ($install_pfc) { 74 if ($install_pfc) {
75 $to_install = array_merge($installer_packages, $pfc_packages); 75 $to_install = array_merge($installer_packages, $pfc_packages);
76 } else { 76 } else {
77@@ -776,7 +792,7 @@ include_once "PEAR/Command.php"; 77@@ -776,7 +792,7 @@ include_once "PEAR/Command.php";
78 include_once "PEAR/Registry.php"; 78 include_once "PEAR/Registry.php";
79  79
80 if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') { 80 if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
81- $config = &PEAR_Config::singleton($prefix."/pear.conf", ''); 81- $config = &PEAR_Config::singleton($prefix."/pear.conf", '');
82+ $config = &PEAR_Config::singleton("@PKG_SYSCONFDIR@"."/pear.conf", ''); 82+ $config = &PEAR_Config::singleton("@PKG_SYSCONFDIR@"."/pear.conf", '');
83 } else { 83 } else {
84 $config = &PEAR_Config::singleton(); 84 $config = &PEAR_Config::singleton();
85 } 85 }
86@@ -814,6 +830,8 @@ displayHTMLProgress($progress = 99); 86@@ -814,6 +830,8 @@ displayHTMLProgress($progress = 99);
87  87
88 // Base installation finished 88 // Base installation finished
89  89
90+/* 90+/*
91+ 91+
92 ini_restore("include_path"); 92 ini_restore("include_path");
93  93
94 if (!WEBINSTALLER) { 94 if (!WEBINSTALLER) {
95@@ -971,6 +989,9 @@ if ( WINDOWS ) { 95@@ -971,6 +989,9 @@ if ( WINDOWS ) {
96 if (WINDOWS && !WEBINSTALLER) { 96 if (WINDOWS && !WEBINSTALLER) {
97 win32CreateRegEnv(); 97 win32CreateRegEnv();
98 } 98 }
99+ 99+
100+*/ 100+*/
101+ 101+
102 // Set of functions following 102 // Set of functions following
103  103
104 // {{{ download_url() 104 // {{{ download_url()
105@@ -1367,16 +1388,18 @@ function detect_install_dirs($_prefix =  105@@ -1367,16 +1388,18 @@ function detect_install_dirs($_prefix =
106 } 106 }
107 } else { 107 } else {
108 if ($_prefix === null) { 108 if ($_prefix === null) {
109- $prefix = dirname(PHP_BINDIR); 109- $prefix = dirname(PHP_BINDIR);
110+ $prefix = "@PREFIX@"; 110+ $prefix = "@PREFIX@";
111 } else { 111 } else {
112 $prefix = $_prefix; 112 $prefix = $_prefix;
113 } 113 }
114 $bin_dir = '$prefix/bin'; 114 $bin_dir = '$prefix/bin';
115- $php_dir = '$prefix/share/pear'; 115- $php_dir = '$prefix/share/pear';
116- $doc_dir = '$php_dir/docs'; 116- $doc_dir = '$php_dir/docs';
117+ $php_dir = '$prefix/lib/php'; 117+ $php_dir = '$prefix/lib/php';
118+ $doc_dir = '$php_dir/doc'; 118+ $doc_dir = '$php_dir/doc';
119 $data_dir = '$php_dir/data'; 119 $data_dir = '$php_dir/data';
120- $test_dir = '$php_dir/tests'; 120- $test_dir = '$php_dir/tests';
121- $temp_dir = '$prefix/temp'; 121- $temp_dir = '$prefix/temp';
122+ $test_dir = '$php_dir/test'; 122+ $test_dir = '$php_dir/test';
123+ $temp_dir = '/tmp'; 123+ $temp_dir = '@WRKSRC@/tmp';
124+ 124+
125+/* 125+/*
126  126
127 // check if the user has installed PHP with PHP or GNU layout 127 // check if the user has installed PHP with PHP or GNU layout
128 if (@is_dir("$prefix/lib/php/.registry")) { 128 if (@is_dir("$prefix/lib/php/.registry")) {
129@@ -1389,6 +1412,9 @@ function detect_install_dirs($_prefix =  129@@ -1389,6 +1412,9 @@ function detect_install_dirs($_prefix =
130 } elseif (@is_dir("$prefix/share/php/.registry")) { 130 } elseif (@is_dir("$prefix/share/php/.registry")) {
131 $php_dir = '$prefix/share/php'; 131 $php_dir = '$prefix/share/php';
132 } 132 }
133+ 133+
134+*/ 134+*/
135+ 135+
136 } 136 }
137 } 137 }
138  138
139@@ -2494,3 +2520,4 @@ php.ini <$pathIni> include_path updated. 139@@ -2494,3 +2520,4 @@ php.ini <$pathIni> include_path updated.
140 } 140 }
141 return true; 141 return true;
142 } 142 }
143+?> 143+?>