From 95ceb586e31391ad5574a9cfa06fa17ee319d636 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 17 Aug 2012 23:40:47 -0500
Subject: development/parrot: Use icu4c regardless during build

icu4c is now part of Slackware 14.0

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 development/parrot/README            | 10 +---------
 development/parrot/parrot.SlackBuild | 14 ++------------
 2 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'development/parrot')

diff --git a/development/parrot/README b/development/parrot/README
index 8489d471dc..d307a163e0 100644
--- a/development/parrot/README
+++ b/development/parrot/README
@@ -1,14 +1,6 @@
-        Parrot VM - a VM for dynamic languages
+Parrot VM - a VM for dynamic languages
 
 Parrot is a virtual machine designed to efficiently compile and  
 execute bytecode for dynamic languages. Parrot currently hosts
 a variety of dynamic languages such as Tcl, Javascript, Ruby, 
 Lua, Scheme, PHP, Python, Perl 6, APL, and a .NET bytecode translator.
- 
-<http://parrot.org> 
-
-If you want to compile parrot with icu4c run the SlackBuild as below. 
-You'll need of course to install icu4c. A build script for this is available
-at SlackBuilds.org.
-
-ICU=yes ./parrot.SlackBuild
diff --git a/development/parrot/parrot.SlackBuild b/development/parrot/parrot.SlackBuild
index 2678aad3b8..2a03676300 100644
--- a/development/parrot/parrot.SlackBuild
+++ b/development/parrot/parrot.SlackBuild
@@ -5,7 +5,7 @@
 
 PRGNAM=parrot
 VERSION=${VERSION:-2.6.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -24,9 +24,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Standard build without ICU
-ICU=${ICU:-no}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -56,13 +53,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Do we want to compile this with icu4c support?
-if [ "$ICU" = "yes" ]; then
-    ICUCONFIG="--icu-config=/usr/bin/icu-config"
-else
-    ICUCONFIG="--without-icu"
-fi
-
 perl Configure.pl \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -71,7 +61,7 @@ perl Configure.pl \
   --mandir=/usr/man \
   --pkgconfigdir=pkgconfig \
   --parrot_is_shared \
-  $ICUCONFIG
+  --icu-config=/usr/bin/icu-config
 
 make 
 make install DESTDIR=$PKG 
-- 
cgit v1.2.3