From aa89128ee8d177df05cb5a6530ce1424e5269f45 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Wed, 17 May 2006 06:20:00 +0000
Subject: Use PKGNAME_NOREV for DIST_SUBDIR (instead of just PKGNAME).

As reported by Christopher W. Richardson on tech-pkg.
---
 lang/php5/Makefile | 4 ++--
 lang/php5/distinfo | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lang')

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 48afb4dbddb..bfefb720881 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/05/16 19:54:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.34 2006/05/17 06:20:00 reed Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 PKGREVISION=		1
@@ -32,7 +32,7 @@ CONF_FILES=		${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=		${PREFIX}/${PHP_EXTENSION_DIR}
 
 # This can be removed once 5.1.5 is released
-DIST_SUBDIR=		${PKGNAME}
+DIST_SUBDIR=		${PKGNAME_NOREV}
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 3f224178ce2..00751e9aa97 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2006/05/16 19:54:02 adrianp Exp $
+$NetBSD: distinfo,v 1.22 2006/05/17 06:20:00 reed Exp $
 
-SHA1 (php-5.1.4nb1/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394
-RMD160 (php-5.1.4nb1/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce
-Size (php-5.1.4nb1/php-5.1.4.tar.bz2) = 6356171 bytes
+SHA1 (php-5.1.4/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394
+RMD160 (php-5.1.4/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce
+Size (php-5.1.4/php-5.1.4.tar.bz2) = 6356171 bytes
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
-- 
cgit v1.2.3