From c2cd8ef0a80556cbd686f5db429f0a269944c414 Mon Sep 17 00:00:00 2001
From: adrianp <adrianp@pkgsrc.org>
Date: Sat, 20 Dec 2008 14:42:50 +0000
Subject: Fix some pkglint warnings Apply a fix for PR#39284

---
 lang/pear/MESSAGE       | 4 ++--
 lang/pear/Makefile      | 7 ++++---
 lang/pear/files/pear.sh | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lang')

diff --git a/lang/pear/MESSAGE b/lang/pear/MESSAGE
index 965ac4125e3..7ea01b6b27b 100644
--- a/lang/pear/MESSAGE
+++ b/lang/pear/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2008/08/17 18:40:36 adrianp Exp $
+$NetBSD: MESSAGE,v 1.3 2008/12/20 14:42:50 adrianp Exp $
 
 In order to use PEAR packages you may want to alter the default
 include_path of PHP to include the PEAR installation directory where the
@@ -12,6 +12,6 @@ Change the "include_path" directive to read as follows:
 
 	include_path = ".:${PREFIX}/lib/php"
 
-This is done automatically if you are running either php>=4.4.9 or 
+This is done automatically if you are running either php>=4.4.9 or
 php>=5.2.6nb2.
 ===========================================================================
diff --git a/lang/pear/Makefile b/lang/pear/Makefile
index e733b2c8912..b4bc32e153c 100644
--- a/lang/pear/Makefile
+++ b/lang/pear/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/09/15 11:54:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2008/12/20 14:42:50 adrianp Exp $
 #
 
 DISTNAME=	PEAR-1.5.4
-PKGREVISION=	2
+PKGREVISION=	3
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
 CATEGORIES=	lang
 MASTER_SITES=	http://download.pear.php.net/package/
@@ -90,7 +90,8 @@ 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} ${WRKSRC}/pear.conf ${PREFIX}/share/examples/pear/pear.conf
+	${INSTALL_DATA} ${WRKSRC}/pear.conf \
+		${PREFIX}/share/examples/pear/pear.conf
 
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
 
diff --git a/lang/pear/files/pear.sh b/lang/pear/files/pear.sh
index f61c8cc0cc5..513b638a38b 100644
--- a/lang/pear/files/pear.sh
+++ b/lang/pear/files/pear.sh
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $Id: pear.sh,v 1.1.1.1 2007/05/05 21:21:47 adrianp Exp $
+# $Id: pear.sh,v 1.2 2008/12/20 14:42:50 adrianp Exp $
 
 # first find which PHP binary to use
 if test "x$PHP_PEAR_PHP_BIN" != "x"; then
@@ -27,4 +27,4 @@ else
   fi
 fi
 
-exec $PHP -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d memory_limit=12M $INCDIR/pearcmd.php "$@"
+exec $PHP -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@"
-- 
cgit v1.2.3