Skip to content

Commit c85f218

Browse files
committedSep 8, 2011
Fix build script sytax errors, update apache and perl modules.
1 parent 819a8f5 commit c85f218

File tree

3 files changed

+72
-50
lines changed

3 files changed

+72
-50
lines changed
 

‎build.sh

+21-17
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ buildUtils(){
358358
cd ../..
359359

360360
# xpdf
361-
buildProgram "xpdf-3.02" "$CFG_CACHE --without-x"
361+
buildProgram "xpdf-3.03" "$CFG_CACHE --without-x"
362362

363363
cd $WRE_BUILDDIR
364364
}
@@ -384,7 +384,7 @@ buildApache(){
384384
cd source
385385

386386
# apache
387-
cd httpd-2.2.17
387+
cd httpd-2.2.20
388388
if [ "$WRE_CLEAN" == 1 ]; then
389389
$WRE_MAKE distclean
390390
$WRE_MAKE clean
@@ -547,16 +547,16 @@ installPerlModules () {
547547
printHeader "Perl Modules"
548548
cd source/perlmodules
549549
export PERL_MM_USE_DEFAULT=1 # makes it so perl modules don't ask questions
550-
if [ "$WRE_OSTYPE" != "Leopard" && "$WRE_OSTYPE" != "Snow Leopard" ]; then
550+
if [ "$WRE_OSTYPE" != "Leopard" ] && [ "$WRE_OSTYPE" != "Snow Leopard" ]; then
551551
installPerlModule "Proc-ProcessTable-0.44"
552552
fi
553553
installPerlModule "Test-Tester-0.107"
554554
installPerlModule "Test-NoWarnings-1.02"
555555
installPerlModule "Test-Deep-0.103"
556-
installPerlModule "Test-MockObject-1.09"
556+
installPerlModule "Test-MockObject-1.20110612"
557557
buildPerlModule "UNIVERSAL-isa-1.03"
558558
buildPerlModule "UNIVERSAL-can-1.15"
559-
installPerlModule "common-sense-3.3"
559+
installPerlModule "common-sense-3.4"
560560
installPerlModule "Net-SSLeay-1.36" "$PREFIX"
561561
installPerlModule "Compress-Raw-Zlib-2.015"
562562
installPerlModule "IO-Compress-Base-2.015"
@@ -597,13 +597,14 @@ installPerlModules () {
597597
installPerlModule "Text-Balanced-v2.0.0"
598598
installPerlModule "Tie-IxHash-1.21"
599599
installPerlModule "Tie-CPHash-1.04"
600-
installPerlModule "Error-0.17015"
600+
installPerlModule "Error-0.17016"
601601
installPerlModule "HTML-Highlight-0.20"
602602
installPerlModule "HTML-TagFilter-1.03"
603603
installPerlModule "IO-String-1.08"
604604
installPerlModule "Archive-Tar-1.44"
605605
installPerlModule "Archive-Zip-1.26"
606606
installPerlModule "XML-NamespaceSupport-1.09"
607+
installPerlModule "XML-SAX-Base-1.02"
607608
installPerlModule "XML-Parser-2.36" "EXPATLIBPATH=$PREFIX/lib EXPATINCPATH=$PREFIX/include"
608609
installPerlModule "XML-SAX-0.96"
609610
installPerlModule "XML-SAX-Expat-0.40"
@@ -620,11 +621,13 @@ installPerlModules () {
620621
installPerlModule "JSON-2.17"
621622
installPerlModule "version-0.76"
622623
installPerlModule "Path-Class-0.16"
623-
installPerlModule "Config-JSON-1.5000"
624+
installPerlModule "Mouse-0.93"
625+
installPerlModule "Any-Moose-0.15"
626+
installPerlModule "Config-JSON-1.5100"
624627
installPerlModule "IO-Socket-SSL-1.22"
625-
installPerlModule "Text-Iconv-1.7"
628+
#installPerlModule "Text-Iconv-1.7" ##Replaced by Encode for XML::SAX::Writer
626629
installPerlModule "XML-Filter-BufferText-1.01"
627-
installPerlModule "XML-SAX-Writer-0.52"
630+
installPerlModule "XML-SAX-Writer-0.53"
628631
export AUTHEN_SASL_VERSION="Authen-SASL-2.12"
629632
$PREFIX/bin/perl -ni -e 'print unless /GSSAPI mechanism/ .. /\],/' $AUTHEN_SASL_VERSION/Makefile.PL
630633
installPerlModule $AUTHEN_SASL_VERSION
@@ -724,8 +727,8 @@ installPerlModules () {
724727
installPerlModule "Carp-Assert-0.20"
725728
installPerlModule "Test-Exception-0.27"
726729
installPerlModule "Carp-Assert-More-1.12"
727-
installPerlModule "HTTP-Server-Simple-0.38"
728-
installPerlModule "Test-LongString-0.11"
730+
installPerlModule "HTTP-Server-Simple-0.44"
731+
installPerlModule "Test-LongString-0.15"
729732
installPerlModule "HTTP-Response-Encoding-0.05"
730733
installPerlModule "Array-Compare-2.01"
731734
installPerlModule "Tree-DAG_Node-1.06"
@@ -742,12 +745,13 @@ installPerlModules () {
742745
installPerlModule "Class-Member-1.6"
743746
# detecting shared memory properly on 2.6 kernels
744747
if [ "$WRE_OSNAME" == "Linux" ]; then
745-
installPerlModule "Linux-Smaps-0.06"
748+
installPerlModule "Linux-Smaps-0.09"
746749
fi
747750
# 7.7.5
748-
installPerlModule "HTML-Packer-0.4"
749-
installPerlModule "JavaScript-Packer-0.04"
750-
installPerlModule "CSS-Packer-0.2"
751+
installPerlModule "Regexp-RegGrp-1.002"
752+
installPerlModule "HTML-Packer-1.002001"
753+
installPerlModule "JavaScript-Packer-1.004"
754+
installPerlModule "CSS-Packer-1.002"
751755
# 7.7.6
752756
installPerlModule "Business-Tax-VAT-Validation-0.20"
753757
installPerlModule "Scope-Guard-0.03"
@@ -772,7 +776,7 @@ IFS=$SAVED_IFS
772776
installPerlModule "Text-PDF-0.29"
773777
installPerlModule "CAM-PDF-1.52"
774778
installPerlModule "Text-Diff-HTML-0.06"
775-
installPerlModule "Locales-0.15"
779+
installPerlModule "Locales-0.19"
776780
installPerlModule "Test-Harness-3.17"
777781
# App-Nopaste
778782
installPerlModule "Params-Util-1.00"
@@ -791,7 +795,7 @@ CFLAGS=$SAVED_CFLAGS
791795
installPerlModule "Moose-0.93"
792796
installPerlModule "Getopt-Long-Descriptive-0.081"
793797
installPerlModule "MooseX-Getopt-0.25"
794-
installPerlModule "WWW-Pastebin-PastebinCom-Create-0.002"
798+
installPerlModule "WWW-Pastebin-PastebinCom-Create-0.003"
795799
installPerlModule "Class-Data-Accessor-0.04004"
796800
installPerlModule "WWW-Pastebin-RafbNet-Create-0.001"
797801
installPerlModule "Spiffy-0.30"

‎getperlmodules.sh

+46-28
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ tar zxf Test-Tester-0.107.tar.gz
1818
wget -t 4 -nv $CPANMIRROR/authors/id/A/AD/ADAMK/Test-NoWarnings-1.02.tar.gz
1919
tar zxf Test-NoWarnings-1.02.tar.gz
2020

21-
wget -t 4 -nv $CPANMIRROR/authors/id/M/ML/MLEHMANN/common-sense-3.3.tar.gz
22-
tar zxf common-sense-3.3.tar.gz
21+
wget -t 4 -nv $CPANMIRROR/authors/id/M/ML/MLEHMANN/common-sense-3.4.tar.gz
22+
tar zxf common-sense-3.4.tar.gz
2323

2424
wget -t 4 -nv $CPANMIRROR/authors/id/A/AN/ANDYA/Test-Harness-3.17.tar.gz
2525
tar zxf Test-Harness-3.17.tar.gz
2626

2727
# http://search.cpan.org/dist/Locales/
28-
wget -t 4 -nv $CPANMIRROR/authors/id/D/DM/DMUEY/Locales-0.15.tar.gz
29-
tar zxf Locales-0.15.tar.gz
28+
wget -t 4 -nv $CPANMIRROR/authors/id/D/DM/DMUEY/Locales-0.19.tar.gz
29+
tar zxf Locales-0.19.tar.gz
3030

3131
wget -t 4 -nv $CPANMIRROR/authors/id/D/DW/DWHEELER/Text-Diff-HTML-0.06.tar.gz
3232
tar zxf Text-Diff-HTML-0.06.tar.gz
@@ -60,8 +60,8 @@ wget -t 4 -nv $CPANMIRROR/authors/id/O/OP/OPI/Class-Member-1.6.tar.gz
6060
tar zxf Class-Member-1.6.tar.gz
6161

6262
# http://search.cpan.org/dist/Linux-Smaps/
63-
wget -t 4 -nv $CPANMIRROR/authors/id/O/OP/OPI/Linux-Smaps-0.06.tar.gz
64-
tar zxf Linux-Smaps-0.06.tar.gz
63+
wget -t 4 -nv $CPANMIRROR/authors/id/O/OP/OPI/Linux-Smaps-0.09.tar.gz
64+
tar zxf Linux-Smaps-0.09.tar.gz
6565

6666
# http://search.cpan.org/dist/GraphViz/
6767
wget -t 4 -nv $CPANMIRROR/authors/id/L/LB/LBROCARD/GraphViz-2.04.tar.gz
@@ -252,8 +252,8 @@ wget -t 4 -nv $CPANMIRROR/authors/id/C/CJ/CJM/Tie-CPHash-1.04.tar.gz
252252
tar zxf Tie-CPHash-1.04.tar.gz
253253

254254
# http://search.cpan.org/dist/Error/
255-
wget -t 4 -nv $CPANMIRROR/authors/id/S/SH/SHLOMIF/Error-0.17015.tar.gz
256-
tar zxf Error-0.17015.tar.gz
255+
wget -t 4 -nv $CPANMIRROR/authors/id/S/SH/SHLOMIF/Error-0.17016.tar.gz
256+
tar zxf Error-0.17016.tar.gz
257257

258258
# http://search.cpan.org/dist/HTML-Highlight/
259259
wget -t 4 -nv $CPANMIRROR/authors/id/T/TR/TRIPIE/HTML-Highlight-0.20.tar.gz
@@ -279,6 +279,10 @@ tar zxf Archive-Zip-1.26.tar.gz
279279
wget -t 4 -nv $CPANMIRROR/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz
280280
tar zxf XML-NamespaceSupport-1.09.tar.gz
281281

282+
# http://search.cpan.org/dist/XML-SAX-Base/
283+
wget -t 4 -nv $CPANMIRROR/authors/id/K/KH/KHAMPTON/XML-SAX-Base-1.02.tar.gz
284+
tar zxf XML-SAX-Base-1.02.tar.gz
285+
282286
# http://search.cpan.org/dist/XML-Parser/
283287
wget -t 4 -nv $CPANMIRROR/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
284288
tar zxf XML-Parser-2.36.tar.gz
@@ -343,9 +347,18 @@ tar zxf Path-Class-0.16.tar.gz
343347
#wget -t 4 -nv $CPANMIRROR/authors/id/R/RI/RIZEN/Config-JSON-1.3.1.tar.gz
344348
#tar zxf Config-JSON-1.3.1.tar.gz
345349

350+
# http://search.cpan.org/dist/Mouse/
351+
http://search.cpan.org/CPAN/
352+
wget -t 4 -nv $CPANMIRROR/authors/id/G/GF/GFUJI/Mouse-0.93.tar.gz
353+
tar zxf Mouse-0.93.tar.gz
354+
346355
# http://search.cpan.org/dist/Config-JSON/
347-
wget -t 4 -nv $CPANMIRROR/authors/id/R/RI/RIZEN/Config-JSON-1.5000.tar.gz
348-
tar zxf Config-JSON-1.5000.tar.gz
356+
wget -t 4 -nv $CPANMIRROR/authors/id/S/SA/SARTAK/Any-Moose-0.15.tar.gz
357+
tar zxf Any-Moose-0.15.tar.gz
358+
359+
# http://search.cpan.org/dist/Config-JSON/
360+
wget -t 4 -nv $CPANMIRROR/authors/id/R/RI/RIZEN/Config-JSON-1.5100.tar.gz
361+
tar zxf Config-JSON-1.5100.tar.gz
349362

350363
# http://search.cpan.org/dist/IO-Socket-SSL/
351364
wget -t 4 -nv $CPANMIRROR/authors/id/S/SU/SULLR/IO-Socket-SSL-1.22.tar.gz
@@ -476,8 +489,8 @@ wget -t 4 -nv $CPANMIRROR/authors/id/F/FD/FDALY/Test-Deep-0.103.tar.gz
476489
tar zxf Test-Deep-0.103.tar.gz
477490

478491
# http://search.cpan.org/dist/Test-MockObject/
479-
wget -t 4 -nv $CPANMIRROR/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz
480-
tar zxf Test-MockObject-1.09.tar.gz
492+
wget -t 4 -nv $CPANMIRROR/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20110612.tar.gz
493+
tar zxf Test-MockObject-1.20110612.tar.gz
481494

482495
# http://search.cpan.org/dist/UNIVERSAL-isa/
483496
wget -t 4 -nv $CPANMIRROR/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.03.tar.gz
@@ -612,12 +625,12 @@ wget -t 4 -nv $CPANMIRROR/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.12.tar.gz
612625
tar zxf Carp-Assert-More-1.12.tar.gz
613626

614627
# http://search.cpan.org/dist/HTTP-Server-Simple/
615-
wget -t 4 -nv $CPANMIRROR/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.38.tar.gz
616-
tar zxf HTTP-Server-Simple-0.38.tar.gz
628+
wget -t 4 -nv $CPANMIRROR/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.44.tar.gz
629+
tar zxf HTTP-Server-Simple-0.44.tar.gz
617630

618631
# http://search.cpan.org/dist/Test-LongString/
619-
wget -t 4 -nv $CPANMIRROR/authors/id/R/RG/RGARCIA/Test-LongString-0.11.tar.gz
620-
tar zxf Test-LongString-0.11.tar.gz
632+
wget -t 4 -nv $CPANMIRROR/authors/id/R/RG/RGARCIA/Test-LongString-0.15.tar.gz
633+
tar zxf Test-LongString-0.15.tar.gz
621634

622635
# http://search.cpan.org/dist/HTTP-Response-Encoding/
623636
wget -t 4 -nv $CPANMIRROR/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.05.tar.gz
@@ -663,17 +676,21 @@ tar zxf Test-WWW-Mechanize-1.24.tar.gz
663676
wget -t 4 -nv $CPANMIRROR/authors/id/O/OV/OVID/Test-JSON-0.06.tar.gz
664677
tar zxf Test-JSON-0.06.tar.gz
665678

679+
# http://search.cpan.org/dist/Regexp::RegGrp/
680+
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/Regexp-RegGrp-1.002.tar.gz
681+
tar zxf Regexp-RegGrp-1.002.tar.gz
682+
666683
# http://search.cpan.org/dist/HTML-Packer/
667-
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/HTML-Packer-0.4.tar.gz
668-
tar zxf HTML-Packer-0.4.tar.gz
684+
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/HTML-Packer-1.002001.tar.gz
685+
tar zxf HTML-Packer-1.002001.tar.gz
669686

670687
# http://search.cpan.org/dist/JavaScript-Packer/
671-
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/JavaScript-Packer-0.04.tar.gz
672-
tar zxf JavaScript-Packer-0.04.tar.gz
688+
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/JavaScript-Packer-1.004.tar.gz
689+
tar zxf JavaScript-Packer-1.004.tar.gz
673690

674691
# http://search.cpan.org/dist/CSS-Packer/
675-
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/CSS-Packer-0.2.tar.gz
676-
tar zxf CSS-Packer-0.2.tar.gz
692+
wget -t 4 -nv $CPANMIRROR/authors/id/N/NE/NEVESENIN/CSS-Packer-1.002.tar.gz
693+
tar zxf CSS-Packer-1.002.tar.gz
677694

678695
# http://search.cpan.org/dist/Business-Tax-VAT-Validation/
679696
wget -t 4 -nv $CPANMIRROR/authors/id/B/BP/BPGN/Business-Tax-VAT-Validation-0.20.tar.gz
@@ -712,12 +729,13 @@ wget -t 4 -nv $CPANMIRROR/authors/id/A/AD/ADIE/Test-Class-0.31.tar.gz
712729
tar zxf Test-Class-0.31.tar.gz
713730

714731
# http://search.cpan.org/dist/XML-SAX-Writer/
715-
wget -t 4 -nv $CPANMIRROR/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.52.tar.gz
716-
tar zxf XML-SAX-Writer-0.52.tar.gz
732+
wget -t 4 -nv $CPANMIRROR/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.53.tar.gz
733+
tar zxf XML-SAX-Writer-0.53.tar.gz
717734

718735
# http://search.cpan.org/dist/Text-Iconv/
719-
wget -t 4 -nv $CPANMIRROR/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
720-
tar zxf Text-Iconv-1.7.tar.gz
736+
##Replaced by Encode.
737+
#wget -t 4 -nv $CPANMIRROR/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
738+
#tar zxf Text-Iconv-1.7.tar.gz
721739

722740
# http://search.cpan.org/dist/XML-Filter-BufferText/
723741
wget -t 4 -nv $CPANMIRROR/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz
@@ -780,8 +798,8 @@ wget -t 4 -nv $CPANMIRROR/authors/id/B/BO/BOBTFISH/MooseX-Getopt-0.25.tar.gz
780798
tar zxf MooseX-Getopt-0.25.tar.gz
781799

782800
# http://search.cpan.org/dist/WWW-Pastebin-PastebinCom-Create/
783-
wget -t 4 -nv $CPANMIRROR/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-0.002.tar.gz
784-
tar zxf WWW-Pastebin-PastebinCom-Create-0.002.tar.gz
801+
wget -t 4 -nv $CPANMIRROR/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-0.003.tar.gz
802+
tar zxf WWW-Pastebin-PastebinCom-Create-0.003.tar.gz
785803

786804
# http://search.cpan.org/dist/Class-Data-Accessor/
787805
wget -t 4 -nv $CPANMIRROR/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz

‎getsource.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ wget -t 4 -nv ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.5.tar.bz2
6060
tar jxf gnutls-2.8.5.tar.bz2
6161

6262
# httpd apache webserver http://httpd.apache.org/
63-
wget -t 4 -nv http://www.apache.org/dist/httpd/httpd-2.2.17.tar.gz
64-
tar zxf httpd-2.2.17.tar.gz
63+
wget -t 4 -nv http://www.apache.org/dist/httpd/httpd-2.2.20.tar.gz
64+
tar zxf httpd-2.2.20.tar.gz
6565

6666
# lftp sophisticated ftp client http://lftp.yar.ru/
6767
wget -t 4 -nv http://ftp.yars.free.net/pub/source/lftp/old/lftp-4.2.0.tar.gz
@@ -79,7 +79,7 @@ mv jpeg-7 libjpeg-7
7979
# lcms color management http://www.littlecms.com/
8080
wget -t 4 -nv http://sourceforge.net/projects/lcms/files/lcms/1.19/lcms-1.19.tar.gz/download
8181
tar zxf lcms-1.19.tar.gz
82-
82+
.3
8383
# graphviz graph generator http://www.graphviz.org/
8484
wget -t 4 -nv http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.24.0.tar.gz
8585
tar xfz graphviz-2.24.0.tar.gz
@@ -148,8 +148,8 @@ wget -t 4 -nv http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz
148148
tar xfz rsync-3.0.6.tar.gz
149149

150150
# git http://git-scm.com/download
151-
wget -t 4 -nv http://kernel.org/pub/software/scm/git/git-1.6.5.3.tar.bz2
152-
tar jxf git-1.6.5.3.tar.bz2
151+
wget -t 4 -nv http://kernel.org/pub/software/scm/git/git-1.7.6.tar.bz2
152+
tar jxf git-1.7.6.tar.bz2
153153

154154
# http://curl.haxx.se/
155155
wget -t 4 -nv http://curl.haxx.se/download/curl-7.19.7.tar.bz2

0 commit comments

Comments
 (0)
Please sign in to comment.