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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -43,27 +43,28 @@ EXTRACT_ONLY+= ${ARCHIVE_SRCS} @@ -43,27 +43,28 @@ EXTRACT_ONLY+= ${ARCHIVE_SRCS}
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
cvs diff -r1.2 -r1.3 pkgsrc/lang/pear/distinfo (expand / 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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -110,27 +110,27 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/05 2 @@ -110,27 +110,27 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/05 2
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 }