Update specs

gub/specs/alien.py

@@ -1,7 +1,7 @@
 from gub import tools
 
 class Alien (tools.CpanBuild):
-    source = "http://www.kitenet.net/programs/alien/alien_8.60.tar.gz",
+    source = 'https://launchpad.net/ubuntu/+archive/primary/+files/alien_8.60.tar.gz'
     srcdir_build_broken = True
     def srcdir (self):
         return '%(allsrcdir)s/alien'

gub/specs/base-passwd.py

@@ -1,6 +1,6 @@
 from gub import target
 
 class Base_passwd (target.AutoBuild):
-    source = 'ftp://ftp.nl.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.11.tar.gz'
+    source = 'https://launchpad.net/ubuntu/+archive/primary/+files/base-passwd_3.5.11.tar.gz'
     srcdir_build_broken = True
     subpackage_names = ['']

gub/specs/binutils.py

@@ -5,7 +5,7 @@
 from gub import loggedos
 
 class Binutils__tools (tools.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/binutils/binutils-2.19.1.tar.gz'
+    source = 'http://ftp.gnu.org/pub/gnu/binutils/binutils-2.19.1.tar.bz2'
     dependencies = ['system::gcc']
         # binutils' makefile uses:
         #     MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`

gub/specs/boost.py

@@ -53,6 +53,11 @@ def build_bjam (self):
                 + ' -sNO_BZIP2=1'
                 + ' -sNO_ZLIB=1'
                 + ' --with-'.join ([''] + boost_modules))
+    install_command = (target.BjamBuild_v2.install_command
+                .replace ('bjam ', '%(builddir)s/bjam ')
+                + ' -sNO_BZIP2=1'
+                + ' -sNO_ZLIB=1'
+                + ' --with-'.join ([''] + boost_modules))
     license_files = ['%(srcdir)s/LICENSE_1_0.txt']
     def install (self):
         target.BjamBuild_v2.install (self)

gub/specs/dhcp.py

@@ -3,7 +3,7 @@
 
 class Dhcp (target.AutoBuild):
     #source = 'http://ftp.isc.org/isc/dhcp/dhcp-4.1.0a2.tar.gz'
-    source = 'http://ftp.isc.org/isc/dhcp/dhcp-3.0.7.tar.gz&strip=2'
+    source = 'http://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-3.0.7.tar.gz&strip=2'
     srcdir_build_broken = True
     subpackage_names = ['']
     configure_command = '%(srcdir)s/configure linux-2.2'

gub/specs/epdfview.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Epdfview (target.AutoBuild):
-    source = 'http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.7.tar.gz'
+    source = 'https://launchpad.net/ubuntu/+archive/primary/+files/epdfview_0.1.7.orig.tar.gz'
     dependencies = [
             'tools::automake',
             'tools::gettext',

gub/specs/gtkmm.py

@@ -1,5 +1,5 @@
 from gub import target
 
 class Gtkmm (target.AutoBuild):
-    source = 'http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.3.tar.gz'
+    source = 'http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.4.tar.gz'
     dependencies = ['cairomm-devel', 'gtk+-devel', 'pangomm-devel']

gub/specs/inkscape-installer.py

@@ -10,14 +10,14 @@
 #   bin/gib --platform= --branch=PACKAGE=BRANCH PACKAGE
 # not really a 'python driver'.
 class Inkscape_installer (target.AutoBuild):
-    source = Inkscape.source
+    source = inkscape.Inkscape.source
     never_install = 'True'
     def __init__ (self, settings, source):
         target.AutoBuild.__init__ (self, settings, source)
         source.is_tracking = misc.bind_method (lambda x: True, source)
         source.is_downloaded = misc.bind_method (lambda x: True, source)
         source.update_workdir = misc.bind_method (lambda x: True, source)
-    dependencies = [self.settings.target_platform + '::inkscape']
+        self.dependencies = [settings.target_platform + '::inkscape']
     subpackage_names = ['']
     def stages (self):
         return ['compile', 'install', 'package']
@@ -28,6 +28,6 @@ def compile (self):
 bin/gib
 --platform=%(target_platform)s
 --branch=inkscape=%(inkscape_branch)s
-lilypond
+inkscape
 '''), locals ())
     install_command = 'true'

gub/specs/inkscape.py

@@ -4,7 +4,7 @@
 from gub import target
 
 class Inkscape (target.AutoBuild):
-    source = 'svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape&module=inkscape&branch=trunk&revision=22714'
+    source = 'svn:http://svn.code.sf.net/p/inkscape/code/inkscape?branch=trunk&revision=22714'
     branch = 'trunk'
     dependencies = [
         'cross/gcc-c++-runtime',

gub/specs/jack.py

@@ -1,6 +1,6 @@
 from gub import target
 
 class Jack (target.WafBuild):
-    source = 'svn+http://subversion.jackaudio.org/jack/trunk/jack'
-    source = 'http://www.grame.fr/~letz/jack-1.9.2.tar.bz2'
+    source = 'http://jackaudio.org/downloads/jack-1.9.9.5.tar.bz2'
+    # requires python 2.6
     dependencies = ['tools::automake', 'tools::pkg-config',]

gub/specs/lash.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Lash (target.AutoBuild):
-    source = 'http://www.very-clever.com/download/nongnu/lash/lash-0.6.0~rc2.tar.bz2'
+    source = 'http://download.savannah.gnu.org/releases/lash/lash-0.6.0~rc2.tar.bz2'
     patches = ['lash-0.6.0.rc2.patch']
     dependencies = ['tools::automake', 'tools::pkg-config',
                 'e2fsprogs-devel',

gub/specs/lcms.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Lcms (target.AutoBuild):
-    source = 'http://www.littlecms.com/lcms-1.17.tar.gz'
+    source = 'http://downloads.sourceforge.net/project/lcms/lcms/1.17/lcms-1.17.tar.gz'
     dependencies = ['tools::libtool']
     def configure (self):
         target.AutoBuild.configure (self)

gub/specs/libapr-util.py

@@ -1,7 +1,7 @@
 from gub import tools
 
 class Libapr_util__tools (tools.AutoBuild):
-    source = 'http://apache.cs.uu.nl/dist/apr/apr-util-1.3.9.tar.gz'
+    source = 'http://archive.apache.org/dist/apr/apr-util-1.3.9.tar.gz'
     dependencies = [
             'libapr-devel',
             ]

gub/specs/libapr.py

@@ -2,4 +2,4 @@
 from gub import tools
 
 class Libapr__tools (tools.AutoBuild):
-    source = 'http://apache.cs.uu.nl/dist/apr/apr-1.3.9.tar.gz'
+    source = 'http://archive.apache.org/dist/apr/apr-1.3.9.tar.gz'

gub/specs/libfftw.py

@@ -1,5 +1,5 @@
 from gub import target
 
 class Libfftw (target.AutoBuild):
-    source = 'http://www.fftw.org/fftw-3.2.1.tar.gz'
+    source = 'http://www.fftw.org/fftw-3.2.2.tar.gz'
     dependencies = ['tools::automake', 'tools::libtool', 'tools::pkg-config',]

gub/specs/libgc.py

@@ -7,6 +7,7 @@ class Libgc (target.AutoBuild):
 
 class Libgc__freebsd (Libgc):
     make_flags = 'THREADDLLIBS=-pthread'
+    patches = ['libgc_6.8-1.2ubuntu2.diff']
 
 class Libgc__freebsd__x86 (Libgc__freebsd):
     source = 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz&version=6.8'

gub/specs/libgd.py

@@ -3,7 +3,7 @@
 from gub import tools
 
 class Libgd (target.AutoBuild):
-    source = 'http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz'
+    source = 'http://bitbucket.org/libgd/gd-libgd/downloads/libgd-2.1.0.tar.gz'
     dependencies = [
             'tools::libtool',
             'fontconfig',

gub/specs/libpcre.py

@@ -2,7 +2,7 @@
 from gub import target
 
 class Libpcre (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/prce/pcre-7.8.tar.bz2'
+    source = 'http://downloads.sourceforge.net/project/pcre/pcre/7.8/pcre-7.8.tar.bz2'
     def name (self):
         return 'libpcre'
 

gub/specs/libsndfile.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Libsndfile (target.AutoBuild):
-    source = 'http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.21.tar.gz'
+    source = 'http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.23.tar.gz'
     dependencies = [
         'tools::automake',
         'tools::pkg-config',

gub/specs/neon.py

@@ -0,0 +1,11 @@
+from gub import tools
+
+class Neon__tools (tools.AutoBuild):
+    source = 'http://www.webdav.org/neon/neon-0.28.4.tar.gz'
+    dependencies = [
+            'expat',
+            'openssl',
+            'zlib',
+            ]
+    configure_flags = tools.AutoBuild.configure_flags \
+                    + ' --with-ssl'

gub/specs/openssl.py

@@ -0,0 +1,16 @@
+from gub import build
+
+class OpenSSL__tools (build.AutoBuild):
+    source = 'http://www.openssl.org/source/openssl-0.9.8y.tar.gz'
+    dependencies = [
+            'perl',
+            ]
+    # The configure script is named config
+    configure_binary = '%(autodir)s/config'
+    # Out-of-tree builds are not supported
+    configure_command = 'cp -r %(autodir)s/* %(builddir)s && ' \
+                    + build.AutoBuild.configure_command
+    configure_flags = build.AutoBuild.configure_flags \
+                    + ' --install-prefix=%(install_root)s'
+
+Openssl__tools = OpenSSL__tools

gub/specs/perl-extutils-makemaker.py

@@ -1,5 +1,5 @@
 from gub import tools
 
 class Perl_extutils_makemaker (tools.CpanBuild):
-    source = 'http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz'
+    source = 'http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.56.tar.gz'
 

gub/specs/pixman.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Pixman (target.AutoBuild):
-    source = 'http://www.cairographics.org/releases/pixman-0.13.2.tar.gz'
+    source = 'http://www.cairographics.org/releases/pixman-0.14.0.tar.gz'
     dependencies = ['libtool']
 
 class Pixman__linux__ppc (Pixman):

gub/specs/psmisc.py

@@ -1,6 +1,10 @@
 from gub import target
 
 class Psmisc (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/psmisc/psmisc-22.2.tar.gz'
+    source = 'http://downloads.sourceforge.net/project/psmisc/psmisc/Archive/psmisc-22.7.tar.gz'
     subpackage_names = ['']
     dependencies = ['ncurses']
+    config_cache_overrides = target.AutoBuild.config_cache_overrides + '''
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
+'''

gub/specs/qtopia-core.py

@@ -7,13 +7,15 @@
 #       sort-out what exactly is Qmake build, qt, and qtopia-core specific
 
 class Qtopia_core (target.AutoBuild):
-    source = 'ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.2.tar.gz'
-    dict = {
-        'CC': 'gcc',
-        'CXX': 'g++',
-        #'LINK': '%(toolchain_prefix)sg++',
+    source = 'ftp://ftp.uni-bayreuth.de/X11/gui/qt/source/qtopia-core-opensource-src-4.2.2.tar.gz'
+    def __init__ (self, settings, source):
+        target.AutoBuild.__init__ (self, settings, source)
+        self.compile_dict = {
+            'CC': 'gcc',
+            'CXX': 'g++',
+            #'LINK': '%(toolchain_prefix)sg++',
         }
-    build.change_dict (self, dict)
+        build.change_dict (self, self.compile_dict)
     dependencies = ['freetype-devel', 'tslib-devel']
     def patch (self):
         self.file_sub ([('pkg-config', '$PKG_CONFIG')],

gub/specs/subversion.py

@@ -5,6 +5,7 @@ class Subversion__tools (tools.AutoBuild):
     source = 'http://subversion.tigris.org/downloads/subversion-1.6.4.tar.gz'
     dependencies = [
             'libapr-util-devel',
+            'neon',
             'sqlite',
             'libxml2'
             ]

gub/specs/sysvinit.py

@@ -1,7 +1,8 @@
+from gub import misc
 from gub import target
 
 class Sysvinit (target.MakeBuild):
-    source = 'ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz'
+    source = 'http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2'
     subpackage_names = ['']
     make_flags = 'CC=%(toolchain_prefix)sgcc ROOT=%(install_root)s'
     compile_command = 'cd %(builddir)s/src && make %(make_flags)s'

gub/specs/tslib.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Tslib (target.AutoBuild):
-    source = 'http://download.berlios.de/tslib/tslib-1.0.bz2'
+    source = 'http://download.berlios.de/tslib/tslib-1.0.tar.bz2'
     def configure (self):
         target.AutoBuild.configure (self)
         self.file_sub ([('#define malloc', '#define urg_malloc')],

gub/specs/util-linux.py

@@ -2,7 +2,7 @@
 from gub import tools
 
 class Util_linux__tools (tools.AutoBuild):
-    source = 'http://www.nl.kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.gz'
+    source = 'http://www.kernel.org/pub/linux/utils/util-linux/v2.16/util-linux-ng-2.16.tar.gz'
     dependencies = ['libtool']
     configure_flags = (tools.AutoBuild.configure_flags
                 + ' --disable-tls'

gub/specs/xulrunner.py

@@ -1,7 +1,7 @@
 from gub import target
 
 class Xulrunner (target.AutoBuild):
-    source = 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.0.3/source/xulrunner-1.9.0.3-source.tar.bz2'
+    source = 'http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.0.3/source/xulrunner-1.9.0.3-source.tar.bz2'
     config_cache_flag_broken = True
 
 class Xulrunner__mingw (Xulrunner):

gub/target.py

@@ -238,8 +238,10 @@ def patch (self):
 > tools/build/v2/user-config.jam
 '''
         gcc_version = '' #don't care
+        python_version = ''
         self.dump ('''
 using gcc : %(gcc_version)s : %(system_prefix)s%(cross_dir)s/bin/%(CXX)s ;
+using python : %(python_version)s : %(system_prefix)s/bin/python ;
 ''',
                    '%(srcdir)s/tools/build/v2/user-config.jam',
                    env=locals ())

inkscape.make

@@ -6,9 +6,8 @@ all: inkscape inkscape-installer print-success
 include gub.make
 
 
-INKSCAPE_BRANCH=trunk?revision=20605
-INKSCAPE_REPO_URL=svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape?module=inkscape
-#source = 'svn:https://inkscape.svn.sourceforge.net/svnroot/inkscape&module=inkscape&branch=trunk&revision=20605'
+INKSCAPE_BRANCH=trunk?revision=22714
+INKSCAPE_REPO_URL=svn:http://svn.code.sf.net/p/inkscape/code/inkscape
 
 PLATFORMS=linux-x86
 # Cocoa/Carbon?