diff options
-rw-r--r-- | lang/pear/Makefile | 8 | ||||
-rw-r--r-- | lang/pear/distinfo | 4 | ||||
-rw-r--r-- | lang/pear/patches/patch-aa | 25 |
3 files changed, 22 insertions, 15 deletions
diff --git a/lang/pear/Makefile b/lang/pear/Makefile index da9dada5e02..e733b2c8912 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2008/09/02 17:37:59 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2008/09/15 11:54:21 adrianp Exp $ # DISTNAME= PEAR-1.5.4 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} CATEGORIES= lang MASTER_SITES= http://download.pear.php.net/package/ @@ -55,7 +55,6 @@ SUBST_STAGE.config= post-patch SUBST_FILES.config= install/go-pear.php SUBST_SED.config= -e "s|@WRKSRC@|${WRKSRC}|g" SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.config+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" SUBST_MESSAGE.config= Fixing configuration files. SUBST_CLASSES+= pear @@ -91,8 +90,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pear ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${PREFIX}/bin/pear - ${CP} ${PKG_SYSCONFDIR}/pear.conf ${PREFIX}/share/examples/pear - ${RM} ${PKG_SYSCONFDIR}/pear.conf + ${CP} ${WRKSRC}/pear.conf ${PREFIX}/share/examples/pear/pear.conf .include "${PHPPKGSRCDIR}/buildlink3.mk" diff --git a/lang/pear/distinfo b/lang/pear/distinfo index 01548f7cf18..6ba054ad573 100644 --- a/lang/pear/distinfo +++ b/lang/pear/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2008/09/02 17:37:59 adrianp Exp $ +$NetBSD: distinfo,v 1.4 2008/09/15 11:54:21 adrianp Exp $ SHA1 (Archive_Tar-1.3.2.tgz) = 40a16c6fe6cee12d9fd87d487785db2949ffa9ff RMD160 (Archive_Tar-1.3.2.tgz) = cec105d1cdefd502f209c24c217645cec723d7a2 @@ -12,4 +12,4 @@ Size (PEAR-1.5.4.tgz) = 293070 bytes SHA1 (Structures_Graph-1.0.2.tgz) = 300aa0a2effb0b39c4fa8a63a834748ae99c2855 RMD160 (Structures_Graph-1.0.2.tgz) = 8eb53f6da109b90bab5d8101e99183a1ae116404 Size (Structures_Graph-1.0.2.tgz) = 30947 bytes -SHA1 (patch-aa) = 13701f071f8500da7365245e63fe6c6c2fc2b624 +SHA1 (patch-aa) = b7938a5143f27f167a3065f6331bd34cd0d65153 diff --git a/lang/pear/patches/patch-aa b/lang/pear/patches/patch-aa index 5dd4f972395..785b7f32771 100644 --- a/lang/pear/patches/patch-aa +++ b/lang/pear/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ +$NetBSD: patch-aa,v 1.3 2008/09/15 11:54:21 adrianp Exp $ ---- install/go-pear.php.orig 2007-04-15 23:09:15.000000000 +0100 +--- install/go-pear.php.orig 2008-09-15 12:40:50.000000000 +0100 +++ install/go-pear.php @@ -311,6 +311,8 @@ if (WEBINSTALLER) { $install_pfc = $_SESSION['go-pear']['install_pfc']; @@ -79,11 +79,20 @@ $NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') { - $config = &PEAR_Config::singleton($prefix."/pear.conf", ''); -+ $config = &PEAR_Config::singleton("@PKG_SYSCONFDIR@"."/pear.conf", ''); ++ $config = &PEAR_Config::singleton("@WRKSRC@"."/pear.conf", ''); } else { $config = &PEAR_Config::singleton(); } -@@ -814,6 +830,8 @@ displayHTMLProgress($progress = 99); +@@ -810,10 +826,17 @@ foreach ($tarball as $pkg => $src) { + displayHTMLProgress($progress += round(29 / count($tarball))); + } + ++$config->set('download_dir', '/tmp' . '/download'); ++$config->set('temp_dir', '/tmp'); ++$config->store(); ++$install = &PEAR_Command::factory('install', $config); ++ + displayHTMLProgress($progress = 99); // Base installation finished @@ -92,7 +101,7 @@ $NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ ini_restore("include_path"); if (!WEBINSTALLER) { -@@ -971,6 +989,9 @@ if ( WINDOWS ) { +@@ -971,6 +994,9 @@ if ( WINDOWS ) { if (WINDOWS && !WEBINSTALLER) { win32CreateRegEnv(); } @@ -102,7 +111,7 @@ $NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ // Set of functions following // {{{ download_url() -@@ -1367,16 +1388,18 @@ function detect_install_dirs($_prefix = +@@ -1367,16 +1393,18 @@ function detect_install_dirs($_prefix = } } else { if ($_prefix === null) { @@ -126,7 +135,7 @@ $NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ // check if the user has installed PHP with PHP or GNU layout if (@is_dir("$prefix/lib/php/.registry")) { -@@ -1389,6 +1412,9 @@ function detect_install_dirs($_prefix = +@@ -1389,6 +1417,9 @@ function detect_install_dirs($_prefix = } elseif (@is_dir("$prefix/share/php/.registry")) { $php_dir = '$prefix/share/php'; } @@ -136,7 +145,7 @@ $NetBSD: patch-aa,v 1.2 2008/09/02 17:37:59 adrianp Exp $ } } -@@ -2494,3 +2520,4 @@ php.ini <$pathIni> include_path updated. +@@ -2494,3 +2525,4 @@ php.ini <$pathIni> include_path updated. } return true; } |