fix

plainblack · Dec 13, 2011 · ca28628 · ca28628
1 parent 3cb9a03
commit ca28628
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 27 deletions.
diff --git a/Task-WebGUI/dist.ini b/Task-WebGUI/dist.ini
@@ -3,7 +3,7 @@ author  = JT Smith <jt@plainblack.com>
 license = Perl_5
 copyright_holder = Plain Black Corporation
 copyright_year   = 2011
-version = 0.0100
+version = 0.0101
 [@Classic]
 
 [MetaResources]
@@ -28,7 +28,6 @@ Crypt::DH = 0.06
 Math::BigInt::FastCalc = 0.19
 YAML = 0.68
 Class::Member = 1.6
-Linux::Smaps = 0.09
 GraphViz = 2.04
 IPC::Run = 0.82
 Readonly = 1.03
@@ -39,10 +38,7 @@ XML::TreePP = 0.38
 XML::FeedPP = 0.40
 Net::SSLeay = 1.36
 Compress::Raw::Zlib = 2.015
-IO::Compress::Base = 2.015
-IO::Compress::Zlib = 2.015
 Compress::Zlib = 2.015
-Proc::ProcessTable = 0.44
 BSD::Resource = 1.2902
 URI = 1.51
 IO::Zlib = 1.09
@@ -66,7 +62,7 @@ Pod::Escapes = 1.04
 ExtUtils::CBuilder = 0.24
 Pod::Coverage = 0.19
 Pod::Simple = 3.10
-podlators = 2.2.2
+Pod::Text = 2.2.2
 DateTime = 0.4501
 DateTime::Format::Strptime = 1.0800
 HTML::Template = 2.9
@@ -111,17 +107,17 @@ POE::Component::IKC = 0.2002
 String::CRC32 = 1.4
 ExtUtils::XSBuilder = 0.28
 ExtUtils::MakeMaker = 6.48
-trace = 0.551
+Devel::XRay = 0.95
 Clone = 0.31
 Test::Pod = 1.26
 Data::Structure::Util = 0.15
 Parse::RecDescent = 1.96.0
-MailTools = 2.04
-IO::stringy = 2.110
-MIME::tools = 5.427
+Mail::Mailer = 2.04
+IO::Stringy = 2.110
+MIME::Tools = 5.427
 HTML::Template::Expr = 0.07
-Template::Toolkit = 2.22
-Scalar::List::Utils = 1.19
+Template = 2.22
+List::Util = 1.19
 Graphics::ColorNames = 2.11
 Module::Load = 0.16
 Color::Calc = 1.05
@@ -153,11 +149,10 @@ DateTime::Event::Recurrence = 0.16
 DateTime::Event::ICal = 0.09
 MIME::Types = 1.27
 File::MMagic = 1.27
-PathTools = 3.29
+File::Spec = 3.29
 Module::Find = 0.06
 Archive::Any = 0.0932
 Image::ExifTool = 8.00
-Text::Aspell = 0.09
 MySQL::Diff = 0.33
 List::MoreUtils = 0.22
 Devel::StackTrace = 1.20
@@ -217,5 +212,6 @@ Clipboard = 0.09
 Mixin::Linewise = 0.002
 Config::INI = 0.014
 App::Nopaste = 0.17
-Business::PayPal::API::rel = 0.69
+Business::PayPal::API = 0.69
 Plack = 0.9985
+
diff --git a/build.sh b/build.sh
@@ -330,6 +330,17 @@ buildUtils(){
     # xpdf
     buildProgram "xpdf-3.03" "$CFG_CACHE --without-x"
 
+    # aspell
+    buildProgram "aspell-0.60.6" "" "exec_prefix=$PREFIX"
+    cd aspell6-en-6.0-0
+    if [ "$WRE_CLEAN" == 1 ]; then
+        $WRE_MAKE distclean
+        $WRE_MAKE clean
+    fi  
+    ./configure --vars ASPELL=$PREFIX/bin/aspell WORD_LIST_COMPRESS=$PREFIX/bin/word-list-compress; checkError $? "aspell-en configure"
+    $WRE_MAKE; checkError $? "aspell-en make"
+    $WRE_MAKE install ; checkError $? "aspell-en make install"
+
     cd $WRE_BUILDDIR
 }
 
@@ -446,21 +457,27 @@ installPerlModule() {
     cd ..
 }
 
-# some other perl modules are installed the same way
-# param1: module directory
-# param2: parameters to pass to Makefile.PL
-buildPerlModule() {
-    cd $1
-    printHeader "PM $1"
-    if [ "$WRE_CLEAN" == 1 ]; then
-        perl Build clean
+installPerlModules () {
+    printHeader "Perl Modules"
+    cd source/perlmodules
+    export PERL_MM_USE_DEFAULT=1 # makes it so perl modules don't ask questions
+    cpan App::cpanminus
+    cpanm Task::WebGUI
+    if [ "$WRE_OSTYPE" != "Leopard" ] && [ "$WRE_OSTYPE" != "Snow Leopard" ]; then
+        cpanm Proc::ProcessTable
     fi
-    perl Build.PL $2; checkError $? "$1 Build.PL"
-    perl Build; checkError $? "$1 Build"
-    perl Build install; checkError $? "$1 Build install"
-    cd ..
+    installPerlModule "Text-Aspell-0.09" "LIBS='-laspell'"
+    # detecting shared memory properly on 2.6 kernels
+    if [ "$WRE_OSNAME" == "Linux" ]; then
+        cpanm Linux::Smaps
+    fi
+
+    cd $WRE_BUILDDIR
 }
 
+
+
+
 #awstats
 installAwStats(){
     printHeader "AWStats"