Changeset 29366 for main/trunk/greenstone2/build-src

Timestamp:

2014-10-13T16:55:46+13:00 (10 years ago)

Author:

ak19

Message:

Updating from wget-1.13.4 to wget-1.15. Both have Greenstone specific modifications, so this is now indicated in the naming of the package and untarred folder

Location:

main/trunk/greenstone2/build-src/packages

Files:

• Makefile (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• wget/README (modified) (6 diffs)
• wget/wget-1.13.4-gs.tar.gz (moved) (moved from main/trunk/greenstone2/build-src/packages/wget/wget.tar.gz )
• wget/wget-1.15-gs.tar.gz (added)

main/trunk/greenstone2/build-src/packages/Makefile

@@ -38 +38 @@
 
 PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
-        wget/wget-1.13.4 cpan/XML-Parser-2.41 \
+        wget/wget-1.15-gs cpan/XML-Parser-2.41 \
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
 

main/trunk/greenstone2/build-src/packages/Makefile.in

@@ -38 +38 @@
 
 PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
-        wget/wget-1.13.4 cpan/XML-Parser-2.41 \
+        wget/wget-1.15-gs cpan/XML-Parser-2.41 \
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
 

main/trunk/greenstone2/build-src/packages/configure

@@ -208 +208 @@
 echo ""
 cd "$PACKAGES/wget"
-gzip -dc wget.tar.gz | tar -xf -
+gzip -dc wget-1.15-gs.tar.gz | tar -xf -
 if test x$crossOS = "xandroid" ;
 then
@@ -216 +216 @@
 fi
 
-cd "$PACKAGES/wget/wget-1.13.4" && \
+cd "$PACKAGES/wget/wget-1.15-gs" && \
 #./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
 ./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs

main/trunk/greenstone2/build-src/packages/wget/README

@@ -6 +6 @@
 The GNU wget homepage is http://www.cg.tuwien.ac.at/~prikryl/wget.html
 
-A couple of very small changes were made to this package by Stefan Boddie
+1) A couple of very small changes were made to this package by Stefan Boddie
 ([email protected]). The USE_STDARG preprocessor definition was
 added to the VC++ makefile as it appeared to need it to compile on either
@@ -12 +12 @@
 mistakenly being converted to "@5c" on windows.
 
-2003/11/27 - [email protected] made a few more small changes to fix
+2) 2003/11/27 - [email protected] made a few more small changes to fix
 h_errno bug preventing code from compiling on latest versions of GCC.
 
-2004/06/30 - [email protected] replaced version 1.5.3 with version 1.9.
+3) 2004/06/30 - [email protected] replaced version 1.5.3 with version 1.9.
 It compiled as is under Windows XP, using VC++ 6.0, under Linux using GCC 3.2.3
 and GCC 2.95.3. So I haven't made any changes. 
@@ -24 +24 @@
 it in.
 
-2008/07/03 - [email protected] replaced version 1.9 with version 1.11.4.
+4) 2008/07/03 - [email protected] replaced version 1.9 with version 1.11.4.
 Version 1.9 didn't compile statically with the new libraries which come with
 fedora, so upgrading. Had to apply the patch at
@@ -34 +34 @@
 
 
-2013/01/09 - [email protected] Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux
+5) 2013/01/09 - [email protected] Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux
 diff -r wget-1.13.4/src/Makefile.in wget-1.13.4.MINGW/src/Makefile.in
 1136a1137,1143
@@ -45 +45 @@
 > 
 
-2013/01/29 - [email protected] added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv()
+6) 2013/01/29 - [email protected] added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv()
 
 diff wget-1.13.4-orig/src/utils.c wget-1.13.4-gs/src/utils.c
@@ -57 +57 @@
 > #endif
 
+7) 2014/10/13 - ak19
+Moved to wget version 1.15. 
+Only the changes numbered 5 and 6 above have been ported into it, following Dr Bainbridge's instructions, as there were both changes made to the previous wget version Greenstone used (1.13.4).
+The wget tar file name (wget-1.15-gs) now indicates the version number and that it has been modified by Greenstone, so the Makefile and configure file in build-src/packages/ have been updated to reflect this.
+