Show
Ignore:
Timestamp:
13.10.2014 16:55:46 (5 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:
1 added
4 modified
1 moved

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/Makefile

    r27776 r29366  
    3838 
    3939PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 
    40         wget/wget-1.13.4 cpan/XML-Parser-2.41 \ 
     40        wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 
    4141        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4242 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r27776 r29366  
    3838 
    3939PACKAGEDIRS +=  rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 
    40         wget/wget-1.13.4 cpan/XML-Parser-2.41 \ 
     40        wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 
    4141        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
    4242 
  • main/trunk/greenstone2/build-src/packages/configure

    r27799 r29366  
    208208echo "" 
    209209cd "$PACKAGES/wget" 
    210 gzip -dc wget.tar.gz | tar -xf - 
     210gzip -dc wget-1.15-gs.tar.gz | tar -xf - 
    211211if test x$crossOS = "xandroid" ; 
    212212then 
     
    216216fi 
    217217 
    218 cd "$PACKAGES/wget/wget-1.13.4" && \ 
     218cd "$PACKAGES/wget/wget-1.15-gs" && \ 
    219219#./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
    220220./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 
  • main/trunk/greenstone2/build-src/packages/wget/README

    r29365 r29366  
    66The GNU wget homepage is http://www.cg.tuwien.ac.at/~prikryl/wget.html 
    77 
    8 A couple of very small changes were made to this package by Stefan Boddie 
     81) A couple of very small changes were made to this package by Stefan Boddie 
    99(sjboddie@cs.waikato.ac.nz). The USE_STDARG preprocessor definition was 
    1010added to the VC++ makefile as it appeared to need it to compile on either 
     
    1212mistakenly being converted to "@5c" on windows. 
    1313 
    14 2003/11/27 - sjboddie@cs.waikato.ac.nz made a few more small changes to fix 
     142) 2003/11/27 - sjboddie@cs.waikato.ac.nz made a few more small changes to fix 
    1515h_errno bug preventing code from compiling on latest versions of GCC. 
    1616 
    17 2004/06/30 - kjdon@cs.waikato.ac.nz replaced version 1.5.3 with version 1.9. 
     173) 2004/06/30 - kjdon@cs.waikato.ac.nz replaced version 1.5.3 with version 1.9. 
    1818It compiled as is under Windows XP, using VC++ 6.0, under Linux using GCC 3.2.3 
    1919and GCC 2.95.3. So I haven't made any changes.  
     
    2424it in. 
    2525 
    26 2008/07/03 - oranfry@cs.waikato.ac.nz replaced version 1.9 with version 1.11.4. 
     264) 2008/07/03 - oranfry@cs.waikato.ac.nz replaced version 1.9 with version 1.11.4. 
    2727Version 1.9 didn't compile statically with the new libraries which come with 
    2828fedora, so upgrading. Had to apply the patch at 
     
    3434 
    3535 
    36 2013/01/09 - davidb@cs.waikato.ac.nz Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux 
     365) 2013/01/09 - davidb@cs.waikato.ac.nz Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux 
    3737diff -r wget-1.13.4/src/Makefile.in wget-1.13.4.MINGW/src/Makefile.in 
    38381136a1137,1143 
     
    4545>  
    4646 
    47 2013/01/29 - davidb@cs.waikato.ac.nz added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv() 
     476) 2013/01/29 - davidb@cs.waikato.ac.nz added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv() 
    4848 
    4949diff wget-1.13.4-orig/src/utils.c wget-1.13.4-gs/src/utils.c 
     
    5757> #endif 
    5858 
     597) 2014/10/13 - ak19 
     60Moved to wget version 1.15.  
     61Only 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). 
     62The 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. 
     63