--- a/README	Sun May 29 12:49:02 2011 +0200
+++ b/README	Sun Mar 08 21:59:33 2015 +0900
@@ -70,7 +70,7 @@
    shar archive for Linux/PowerPC
 
 freebsd-x86
-   shar archive for FreeBSD 4/x86
+   shar archive for FreeBSD 6/x86
 
 freebsd-64
    shar archive for FreeBSD 6/x86_64
@@ -492,6 +492,8 @@
 In addition to the requirements for GUB, you need
 
   • A TeX installation
+  • texinfo
+  • zip
 
 Build everything
 

--- a/bin/cygwin-packager	Sun May 29 12:49:02 2011 +0200
+++ b/bin/cygwin-packager	Sun Mar 08 21:59:33 2015 +0900
@@ -41,7 +41,7 @@
 from gub import context
 from gub import cygwin
 from gub import gup
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import runner
 import gub.settings
@@ -77,7 +77,6 @@
         p = self.package_manager.get_all_packages ()[0]
         if not self.settings.build:
             self.settings.build = self.build_number (p)
-        self.settings.build = '2'
 
     def build_number (self, package):
         from gub import versiondb
@@ -107,7 +106,7 @@
     def re_ball (self, hdr):
         cyg_split = cygwin.gub_to_distro_dict.get (hdr['split_name'],
                                                    [hdr['split_name']])[0]
-        logging.info ('creating cygwin package: ' + cyg_split + '\n')
+        gub_log.info ('creating cygwin package: ' + cyg_split + '\n')
         main_p = hdr['name'] == hdr['split_name']
         subdir = ''
         if not main_p:
@@ -140,7 +139,7 @@
         ball = (self.expand ('%(cygwin_uploads)s/%(name)s/') + '%(cyg_ball)s'
                 % locals ())
 
-        logging.info ('creating cygwin src package: ' + cyg_ball + '\n')
+        gub_log.info ('creating cygwin src package: ' + cyg_ball + '\n')
         #self._untar (dir, '%(src_package_ball)s')
         self._untar (dir, self.expand ('%(src_package_ball)s'))
         self._mv ('%(dir)s/%(gub_dir)s', '%(dir)s/%(cyg_dir)s', locals ())
@@ -396,8 +395,8 @@
     c = Cygwin_package (settings, commands[0],
                         branches.get (commands[0], 'HEAD'))
     
-    logging.default_logger.threshold = options.verbosity
-    c.connect_command_runner (runner.CommandRunner (logging.default_logger))
+    gub_log.default_logger.threshold = options.verbosity
+    c.connect_command_runner (runner.CommandRunner (gub_log.default_logger))
     c.create ()
     
 if __name__ == '__main__':

--- a/bin/gib	Sun May 29 12:49:02 2011 +0200
+++ b/bin/gib	Sun Mar 08 21:59:33 2015 +0900
@@ -42,7 +42,7 @@
 import gub.settings
 
 from gub import locker
-from gub import logging
+from gub import gub_log
 from gub import runner
 from gub import versiondb
 
@@ -123,7 +123,7 @@
          for p in install_manager.installed_packages ()])
 
 def build_installer (installer_obj):
-    logger = logging.default_logger
+    logger = gub_log.default_logger
 
     # theoretically, we could run DeferredRunner but we would have to
     # CommandRunner-ify PackageManager too. - that does not seem worth
@@ -160,26 +160,26 @@
     for s in options.settings:
         (k, v) = tuple (s.split ('='))
         if k in settings.__dict__:
-            logging.warn ('overwriting %s = %s with %s\n'
+            gub_log.warn ('overwriting %s = %s with %s\n'
                                         % (k, settings.__dict__[k], v))
         settings.__dict__[k] = v
 
     db = versiondb.VersionDataBase (options.version_db)
     branch_dict = dict ([tuple (branch_setting.split ('='))
                          for branch_setting in options.branches])
-    log = logging.set_default_log (settings.expand ('%(logdir)s/installer.log'),
+    log = gub_log.set_default_log (settings.expand ('%(logdir)s/installer.log'),
                                    options.verbosity)
 
     installer_obj = installer.get_installer (settings, args, db, branch_dict)
     try:
         build_installer (installer_obj)
     except locker.LockedError:
-        logging.error ('another build in progress.  Skipping.')
+        gub_log.error ('another build in progress.  Skipping.')
         if options.skip_if_locked:
             sys.exit (0)
         raise
-    logging.stage ('done\n')
-    logging.default_logger.show_logfile ()
+    gub_log.stage ('done\n')
+    gub_log.default_logger.show_logfile ()
 
 if __name__ == '__main__':
     main ()

--- a/bin/gpkg	Sun May 29 12:49:02 2011 +0200
+++ b/bin/gpkg	Sun Mar 08 21:59:33 2015 +0900
@@ -43,7 +43,7 @@
 #
 from gub.syntax import printf
 from gub import gup
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub.settings import Settings
 
@@ -193,9 +193,9 @@
     options.root = settings.system_root
     options.platform = settings.platform
 
-    logging.default_logger.threshold = options.verbosity
-    logging.verbose ('root: ' + settings.system_root + '\n')
-    logging.verbose ('platform: ' + settings.platform + '\n')
+    gub_log.default_logger.threshold = options.verbosity
+    gub_log.verbose ('root: ' + settings.system_root + '\n')
+    gub_log.verbose ('platform: ' + settings.platform + '\n')
 
     # TODO: hook log into target/PLAT/log
     target_manager = gup.DependencyManager (options.root,

--- a/bin/gub	Sun May 29 12:49:02 2011 +0200
+++ b/bin/gub	Sun Mar 08 21:59:33 2015 +0900
@@ -44,7 +44,7 @@
 from gub import cross
 from gub import gup
 from gub import locker
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import repository
 from gub.syntax import printf
@@ -166,7 +166,7 @@
 
 #FIXME: move to BuildRunner?
 def build (settings, options, files):
-    logging.stage ('calculating dependencies\n')
+    gub_log.stage ('calculating dependencies\n')
     (names, specs) = gup.get_source_packages (settings, files)
     if options.no_dependencies:
         names = list ()
@@ -182,13 +182,13 @@
         printf ('dependencies[%(platform)s]: %(dep_str)s' % locals ())
         sys.exit (0)
     dep_str.replace (misc.with_platform ('', platform), '')
-    logging.info ('dependencies[%(platform)s]: %(dep_str)s\n' % locals ())
+    gub_log.info ('dependencies[%(platform)s]: %(dep_str)s\n' % locals ())
 
     if options.fresh:
         for spec in list (specs.values()):
             status = spec.get_stamp_file ()
             if os.path.exists (status):
-                logging.info ('Removing status file: %(status)s\n' % locals ())
+                gub_log.info ('Removing status file: %(status)s\n' % locals ())
                 os.unlink (status)
 
     if options.download_only:
@@ -208,7 +208,7 @@
         manager = gup.DependencyManager (settings.system_root)
         ## Todo: have a readonly lock for tools platform
     except locker.LockedError:
-        logging.error ('another build in progress.  Skipping.')
+        gub_log.error ('another build in progress.  Skipping.')
         if options.skip_if_locked:
             sys.exit (0)
         raise
@@ -224,7 +224,7 @@
             printf (b.checksums[name])
         sys.exit (0)
         
-    configure.test_required (logging.default_logger.error)
+    configure.test_required (gub_log.default_logger.error)
 
     b.build_source_packages (names)
 
@@ -268,7 +268,7 @@
     log = os.path.join (log_dir, 'gub.log')
     if os.path.isfile (log):
         misc.rename_append_time (log)
-    logger = logging.set_default_log (log, options.verbosity)
+    logger = gub_log.set_default_log (log, options.verbosity)
     buildrunner.logger = logger
     logger.write_log ('root: %s\n' % settings.system_root, 'verbose')
     logger.write_log ('platform: %s\n' % settings.platform, 'verbose')
@@ -331,9 +331,9 @@
     if options.dry_run:
         loggedos.dry_run ()
 
-    logging.default_logger.threshold = options.verbosity
-    logging.info ('files: %(files)s\n' % locals ())
-    logging.info ('CLEANED env: ' + str (os.environ) + '\n')
+    gub_log.default_logger.threshold = options.verbosity
+    gub_log.info ('files: %(files)s\n' % locals ())
+    gub_log.info ('CLEANED env: ' + str (os.environ) + '\n')
 
     if not options.platform and len (files):
         options.platform, x = misc.split_platform (files[0])
@@ -345,7 +345,7 @@
         sys.exit (0)
 
     if not files:
-        logging.error ('error: nothing to do\n')
+        gub_log.error ('error: nothing to do\n')
         cli_parser.print_help ()
         sys.exit (2)
         

--- a/bin/gub-tester	Sun May 29 12:49:02 2011 +0200
+++ b/bin/gub-tester	Sun Mar 08 21:59:33 2015 +0900
@@ -23,7 +23,7 @@
 from gub.syntax import printf
 from gub import misc
 from gub import repository
-from gub import logging
+from gub import gub_log
 from gub.db import bsd as db_bsd
 
 def canonicalize_string (target):
@@ -217,7 +217,7 @@
     tag_db = repository.TagDb (options.result_dir)
     recheck = ''
     if release_hash in done_db:
-        logging.info ('release %(release_hash)s has already been checked\n'
+        gub_log.info ('release %(release_hash)s has already been checked\n'
                       % locals ())
         if not options.force:
             RESULT = CACHED_SUCCESS
@@ -225,20 +225,20 @@
                 RESULT = CACHED_FAIL
             return RESULT, ['cached %(RESULT)s of %(release_hash)s' % locals ()]
         recheck = ' (forced recheck of %(release_hash)s)' % locals ()
-        logging.info ('recheck forced\n' % locals ())
+        gub_log.info ('recheck forced\n' % locals ())
     
     log = 'test-%(canonicalize)s.log' %  locals ()
     log = os.path.join (options.result_dir, log)
     
     cmd = 'nice time sh -c "(%(target)s)"' % locals ()
-    logging.command (cmd + '\n')
-    logging.error ('Logging test output to %(log)s\n' % locals ())
+    gub_log.command (cmd + '\n')
+    gub_log.error ('Logging test output to %(log)s\n' % locals ())
 
     if options.dry_run:
         return (SUCCESS, ['dryrun'])
 
-    logging.set_default_log (log, options.verbosity)
-    logger = logging.default_logger
+    gub_log.set_default_log (log, options.verbosity)
+    logger = gub_log.default_logger
     stat = loggedos.system (logger, cmd, ignore_errors=True)
     base_tag = 'success-%(canonicalize)s-' % locals ()
     result = 'unknown'
@@ -261,7 +261,7 @@
         tag_db.tag (base_tag, repo)
         if repo.is_distributed ():
             tag = repo.tag (base_tag)
-            logging.action ('tagging with %(tag)s\n' % locals ())
+            gub_log.action ('tagging with %(tag)s\n' % locals ())
             if options.tag_repo:
                 repo.push (tag, options.tag_repo)
 
@@ -275,13 +275,13 @@
     attachments = [message % locals ()]
     if diff:
         attachments.append (diff)
-    logging.info ('%(target)s: %(RESULT)s\n' % locals ())
+    gub_log.info ('%(target)s: %(RESULT)s\n' % locals ())
     done_db[release_hash] = time.ctime () + ' ' + RESULT
     return (RESULT, attachments)
     
 def send_message (options, msg):
     if not options.address:
-        logging.info ('No recipients for result mail\n')
+        gub_log.info ('No recipients for result mail\n')
         # FIXME: what about env[EMAIL]?
         return False
     
@@ -311,9 +311,9 @@
     if options.dry_run:
         log = '/dev/stdout'
 
-    logging.set_default_log (log, options.verbosity)
-    logging.info (' *** %s\n' % time.ctime ())
-    logging.info (' *** Starting tests:\n %s\n' % '\n  '.join (args))
+    gub_log.set_default_log (log, options.verbosity)
+    gub_log.info (' *** %s\n' % time.ctime ())
+    gub_log.info (' *** Starting tests:\n %s\n' % '\n  '.join (args))
 
     repo = repository.get_repository_proxy (options.repository,
                                             options.url,
@@ -324,7 +324,7 @@
         repo.download ()
         repo.update_workdir ('.')
 
-    logging.info ('Repository %s\n' % str (repo))
+    gub_log.info ('Repository %s\n' % str (repo))
     
     last_patch = repo.get_revision_description ()
     release_hash = repo.get_checksum ()
@@ -405,7 +405,7 @@
     p = opt_parser ()
     (options, args) = p.parse_args ()
     if not args:
-        logging.error ('error: nothing to do\n')
+        gub_log.error ('error: nothing to do\n')
         p.print_help ()
         sys.exit (2)
 

--- a/gub/build.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/build.py	Sun Mar 08 21:59:33 2015 +0900
@@ -8,7 +8,7 @@
 from gub import context
 from gub import guppackage
 from gub import loggedos
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import octal
 
@@ -66,7 +66,7 @@
         context.RunnableContext.__init__ (self, settings)
         self.source = source
         self.settings = settings
-        self.source.connect_logger (logging.default_logger)
+        self.source.connect_logger (gub_log.default_logger)
         if self.destdir_install_broken:
             self.install_command = 'make %(make_flags)s %(install_flags_destdir_broken)s %(install_flags)s'
 
@@ -137,7 +137,7 @@
 
 to skip this check and risk a defective build.
 ''')
-                logging.error (msg)
+                gub_log.error (msg)
                 self.system ('false')
             try:
                 (available[stage]) ()
@@ -239,7 +239,7 @@
 
     def download (self):
         if not self.source.is_downloaded ():
-            logging.default_logger.write_log (self.stage_message ('download'),
+            gub_log.default_logger.write_log (self.stage_message ('download'),
                                                                   'stage')
         self.source.download ()
 

--- a/gub/buildrunner.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/buildrunner.py	Sun Mar 08 21:59:33 2015 +0900
@@ -31,7 +31,7 @@
 from gub import misc
 from gub import gup
 from gub import loggedos
-from gub import logging
+from gub import gub_log
 from gub import runner
 import gub.settings   # otherwise naming conflict with settings local vars.
 
@@ -45,7 +45,7 @@
                                             fromfiledate,
                                             tofiledate))
 
-logger = logging.default_logger
+logger = gub_log.default_logger
 
 # FIXME s/spec/build/, but we also have two definitions of package/pkg
 # here: sub packages and name of global package under build
@@ -53,7 +53,7 @@
 #FIXME: split spec_* into SpecBuiler?
 class BuildRunner:
     def __init__ (self, manager, settings, options, specs):
-        info = logging.default_logger.harmless
+        info = gub_log.default_logger.harmless
         info.write ('MANAGER: ' + settings.platform + '\n')
         self.managers = {settings.platform : manager }
         self.settings = settings
@@ -74,7 +74,7 @@
 
     def manager (self, platform):
         if platform not in self.managers:
-            info = logging.default_logger.harmless
+            info = gub_log.default_logger.harmless
             info.write ('MANAGER for platform: ' + platform + '\n')
             settings = gub.settings.Settings (platform)
             self.managers[platform] = gup.DependencyManager (settings.system_root)
@@ -88,10 +88,10 @@
                 self.manager (package.platform ()).register_package_dict (package.dict ())
 
     def calculate_checksums (self):
-        logging.verbose ('calculating checksums\n')
+        gub_log.verbose ('calculating checksums\n')
         for spec in list (self.specs.values ()):
             name = spec.platform_name ()
-            logger = logging.NullCommandLogger ()
+            logger = gub_log.NullCommandLogger ()
 
             command_runner = runner.DeferredRunner (logger)
             spec.connect_command_runner (command_runner)
@@ -227,7 +227,7 @@
         global logger
         if self.options.log == 'build':
             # This is expecially broken with multi-platform builds...
-            logger = logging.default_logger
+            logger = gub_log.default_logger
         else:
             if self.options.log == 'platform':
                 log = os.path.join (spec.settings.logdir, 'build.log')
@@ -236,7 +236,7 @@
                                     misc.strip_platform (spec_name)) + '.log'
             if os.path.isfile (log):
                 misc.rename_append_time (log)
-            logger = logging.CommandLogger (log, logging.default_logger.threshold)
+            logger = gub_log.CommandLogger (log, gub_log.default_logger.threshold)
         if checksum_fail_reason:
             rebuild = 'must'
             if self.options.lax_checksums:
@@ -245,7 +245,7 @@
         else:
             logger.write_log ('checksum ok: %(spec_name)s\n' % locals (), 'verbose')
 
-        if logging.get_numeric_loglevel ('verbose') > logger.threshold:
+        if gub_log.get_numeric_loglevel ('verbose') > logger.threshold:
             logger.write_log ('\n'.join (checksum_fail_reason.split ('\n')[:10]), 'verbose')
         logger.write_log (checksum_fail_reason, 'output')
 
@@ -269,12 +269,12 @@
                 if os.path.isfile (checksum_file):
                     misc.rename_append_time (checksum_file)
                 open (checksum_file, 'w').write (self.checksums[spec_name])
-            loggedos.system (logging.default_logger, spec.expand ('rm -f %(stamp_file)s'))
+            loggedos.system (gub_log.default_logger, spec.expand ('rm -f %(stamp_file)s'))
         # Ugh, pkg_install should be stage
         if spec.install_after_build and not self.spec_all_installed (spec):
             logger.write_log (spec.stage_message ('pkg_install'), 'stage')
             self.spec_install (spec)
-        logging.default_logger.write_log ('\n', 'stage')
+        gub_log.default_logger.write_log ('\n', 'stage')
 
     def is_installed_spec (self, spec_name):
         spec = self.specs[spec_name]
@@ -317,7 +317,7 @@
                     .replace (misc.with_platform ('', platform), ''))
         if not fail_str:
             fail_str = '<nothing to be done>.'
-        logging.default_logger.write_log ('must rebuild[%(platform)s]: %(fail_str)s\n' % locals (), 'stage')
+        gub_log.default_logger.write_log ('must rebuild[%(platform)s]: %(fail_str)s\n' % locals (), 'stage')
         if self.options.dry_run:
             sys.exit (0)
         outdated_installed = [x for x in list (reversed (outdated))
@@ -326,13 +326,13 @@
             platform = self.settings.platform
             outdated_str = (' '.join (outdated_installed)
                             .replace (misc.with_platform ('', platform), ''))
-            logging.default_logger.write_log ('removing outdated[%(platform)s]: %(outdated_str)s\n' % locals (), 'stage')
+            gub_log.default_logger.write_log ('removing outdated[%(platform)s]: %(outdated_str)s\n' % locals (), 'stage')
             self.uninstall_specs (outdated_installed)
         global target
         for spec_name in deps:
             target = spec_name
             self.spec_build (spec_name)
-            logger = logging.default_logger
+            logger = gub_log.default_logger
         target = None
 
 target = None

--- a/gub/cross.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/cross.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,7 +5,7 @@
 from gub.syntax import printf
 from gub import build
 from gub import context
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import repository
 from gub import target
@@ -197,7 +197,7 @@
         if os.path.exists (file_name):
             break
 
-    logging.info ('module name: ' + name + '\n')
+    gub_log.info ('module name: ' + name + '\n')
     module = misc.load_module (file_name, base)
 
     cross_module_checksums[platform] = md5.md5 (open (file_name).read ()).hexdigest ()
@@ -254,8 +254,8 @@
                  + package.settings.cross_dir)
     x86_bindir = x86_cross + '/bin'
     x86_cross_bin = x86_cross + '/i686-linux' + '/bin'
-    env['CC'] = x86_cross_bin + '/gcc'
-    env['CXX'] = x86_cross_bin + '/g++'
+    env['CC'] = x86_bindir + '/i686-linux-gcc'
+    env['CXX'] = x86_bindir + '/i686-linux-g++'
     # FIXME: should only remove any %(tools_prefix)s elements from these...
     env['C_INCLUDE_PATH'] = ''
     env['CPLUS_INCLUDE_PATH'] = ''

--- a/gub/darwin.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/darwin.py	Sun Mar 08 21:59:33 2015 +0900
@@ -14,7 +14,11 @@
     def __init__ (self, settings):
         context.RunnableContext.__init__ (self,settings)
         self.ignore_libs = None
-        self.skip = ['libgcc_s']
+        self.skip = [
+            'libgcc_s.10.',
+            'libgcc_s_',
+            'libgcc_ext.10.',
+        ]
 
     def get_libaries (self, name):
         lib_str = loggedos.read_pipe (
@@ -58,12 +62,16 @@
 
             for o in orig_libs:
                 if o in f:
-                    newpath = re.sub (o, '@executable_path/../lib/', f);
+                    newpath = re.sub (o, '@executable_path/../lib', f);
                     subs.append ((f, newpath))
                 elif self.expand ('%(targetdir)s') in f:
                     must_skip = [s for s in self.skip if s in f]
                     if not must_skip:
-                        raise Exception ('found targetdir in linkage[%(name)s]: %(f)s' % locals ())
+                        if 'libgcc_s.1.dylib' in f:
+                            newpath = '@executable_path/../lib/libgcc_s.1.dylib'
+                            subs.append ((f, newpath))
+                        else:
+                            raise Exception ('found targetdir in linkage[%(name)s]: %(f)s' % locals ())
                     printf ('FIXME: skipping[%(name)s]: %(f)s, hope this is ok' % locals ())
 
         self.rewire_mach_o_object (name, subs)
@@ -139,7 +147,8 @@
     @context.subst_method
     def rpath (foo):
         return ''
-    package.rpath = misc.MethodOverrider (package.nop, rpath)
+    if not isinstance (package, cross.AutoBuild):
+        package.rpath = misc.MethodOverrider (package.nop, rpath)
 
     @context.subst_method
     def so_extension (foo):

--- a/gub/debian.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/debian.py	Sun Mar 08 21:59:33 2015 +0900
@@ -12,13 +12,13 @@
 
 # http://ftp.de.debian.org/debian/pool/main/l/linux-kernel-headers/
 
-gcc_version = '4.1.1'
+gcc_version = '4.8.2'
 glibc_version='2.3.2.ds1-22sarge4'
 linux_version = '2.5.999-test7-bk-17'
 def get_cross_build_dependencies (settings):
     global gcc_version, glibc_version, linux_version
     #FIXME too late
-    gcc_version = '4.1.1'
+    gcc_version = '4.8.2'
     if settings.debian_branch == 'stable':
         glibc_version='2.3.2.ds1-22sarge4'
         linux_version = '2.5.999-test7-bk-17'

--- a/gub/dependency.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/dependency.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,7 +3,7 @@
 #
 from gub.syntax import printf
 from gub import cross
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import repository
 from gub import system
@@ -13,7 +13,7 @@
 
 def get_build_from_file (platform, file_name, name):
     gub_name = file_name.replace (os.getcwd () + '/', '')
-    logging.verbose ('reading spec: %(gub_name)s\n' % locals ())
+    gub_log.verbose ('reading spec: %(gub_name)s\n' % locals ())
     # Ugh, FIXME
     # This loads gub/specs/darwin/python.py in PYTHON. namespace,
     # overwriting the PYTHON. namespace from gub/specs/python.py
@@ -29,7 +29,7 @@
                   .replace ('++', '_xx_')
                   .replace ('+', '_x_')
                   + ('-' + platform).replace ('-', '__'))
-    logging.debug ('LOOKING FOR: %(class_name)s\n' % locals ())
+    gub_log.debug ('LOOKING FOR: %(class_name)s\n' % locals ())
     cls = misc.most_significant_in_dict (module.__dict__, class_name, '__')
     if (platform == 'tools32'
         and (not cls or issubclass (cls, target.AutoBuild))):
@@ -44,7 +44,7 @@
 def get_build_class (settings, flavour, name):
     cls = get_build_from_module (settings, name)
     if not cls:
-        logging.verbose ('making spec:  %(name)s\n' % locals ())
+        gub_log.verbose ('making spec:  %(name)s\n' % locals ())
         cls = get_build_without_module (flavour, name)
     if cls:
         cls._created_name = name
@@ -105,7 +105,7 @@
         source = self.url ()
         if not isinstance (source, repository.Repository):
             source = repository.get_repository_proxy (dir, source, branch)
-        logging.default_logger.write_log ('cls:' + str (self.build_class ()) + '\n', 'output')
+        gub_log.default_logger.write_log ('cls:' + str (self.build_class ()) + '\n', 'output')
         return self.build_class () (self.settings, source)
 
     def build_class (self):
@@ -129,7 +129,7 @@
         if not self._url:
             self._url = self.build_class ().source
         if not self._url:
-            logging.warning ('no source specified in class: '
+            gub_log.warning ('no source specified in class: '
                              + self.build_class ().__name__ + '\n')
         if not self._url:
             self._url = self.settings.dependency_url (self.name ())

--- a/gub/freebsd.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/freebsd.py	Sun Mar 08 21:59:33 2015 +0900
@@ -11,21 +11,22 @@
     @context.subst_method
     def rpath (foo):
         return ''
-    package.rpath = misc.MethodOverrider (package.nop, rpath)
+    if not isinstance (package, cross.AutoBuild):
+        package.rpath = misc.MethodOverrider (package.nop, rpath)
 
 # FIXME: download from sane place; or rather download only kernel
 # headers and build full toolchain from source?
 def get_sdk ():
     '''
-#! /bin/sh
+#! /bin/bash
 
 if test $# != '3'; then
     cat <<EOF
 Usage: get-freebsd ARCH VERSION BUILD
 
 Example:
-  get-freebsd i386 4.11 1
-  get-freebsd amd64 6.2 2
+  bash get-freebsd i386 6.2 1
+  bash get-freebsd amd64 6.2 2
 EOF
     exit 2
 fi
@@ -36,11 +37,10 @@
 
 tmp=tmp-freebsd-$arch-$version-$build
 mkdir -p $tmp && cd $tmp
-wget ftp://ftp.surfnet.nl/pub/os/FreeBSD/releases/$arch/$version-RELEASE/base/base.??
-wget ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/$arch/$version-RELEASE/bin/bin.??
+wget ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/$arch/$version-RELEASE/base/base.??
 rm -rf root
 mkdir -p root
-cat base.?? bin.?? | tar --unlink -xpzf - -C root
+cat base.?? | tar --unlink -xpzf - -C root
 cd root && tar --exclude=zlib.h --exclude=zconf.h --exclude=gmp.h --exclude=curses.h --exclude=ncurses.h --exclude=c++ --exclude=g++ -czf ../../downloads/freebsd-runtime/freebsd-runtime-$version-$build.$arch.tar.gz {,usr/}lib/{lib{c,c_r,m,pthread}{.a,.so{,.*}},crt{i,n,1}.o} usr/include
 #rm -rf $tmp
 '''

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/gub_log.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,225 @@
+import time
+import sys
+import os
+#
+from gub import misc
+
+'''
+TODO: if we need more granularity, it is better to look at the stack
+trace during a log call (), and have per .py file settings.
+'''
+
+default_logger = None
+default_logger_interface = None
+
+name_to_loglevel_mapping = {'quiet': 0,
+         'error': 0,
+         'stage': 0,
+         'info': 1,
+         'harmless': 2,
+         'verbose': 2,
+         'warning': 1,
+         'command': 3,
+         'action': 2,
+         'output': 4,
+         'debug': 5}
+
+def now ():
+    return time.asctime (time.localtime ())
+
+
+class AbstractCommandLogger:
+    """A logger takes care of the mechanics of storing and/or showing
+    messages when approppriate.
+    """
+    def __init__ (self):
+        class Writer:
+            def __init__ (this, level):
+                this.level = level
+            def write (this, message):
+                self.write_log (message, this.level)
+        self.error = Writer ('error')
+        self.stage = Writer ('stage')
+        self.info = Writer ('info')
+        self.harmless = Writer ('harmless')
+        self.verbose = Writer ('verbose')
+        self.warning = Writer ('warning')
+        self.command = Writer ('command')
+        self.output = Writer ('output')
+        self.debug = Writer ('debug')
+    def verbose_flag (self):
+        return ''
+    def read_tail (self, size=0, lines=0):
+        return ['tail']
+    def write_log (self, message, message_level):
+        pass
+    def log_env (self, env):
+        pass
+    def write_multilevel_message (self, message_types):
+        pass
+    
+class NullCommandLogger (AbstractCommandLogger):
+    pass
+
+class CommandLogger (AbstractCommandLogger):
+    def __init__ (self, log_file_name, threshold):
+        AbstractCommandLogger.__init__ (self)
+        # only print message under THRESHOLD.
+        self.threshold = threshold
+        self.log_file = None
+        self.log_file_name = log_file_name
+        self.relative_log_name = log_file_name
+
+        if log_file_name:
+            self.relative_log_name = log_file_name.replace (os.getcwd () + '/', '')
+            if default_logger_interface:
+                log_name = self.relative_log_name
+                default_logger_interface.info ('Log file: %(log_name)s\n' % locals ())
+            
+            directory = os.path.split (log_file_name)[0]
+            if not os.path.isdir (directory):
+                os.makedirs (directory)
+            self.log_file = open (self.log_file_name, 'a')
+        self.start_marker = ' * Starting build: %s\n' %  now ()
+        self.write_log_file ('\n\n' + self.start_marker)
+
+    # ugh: the following should not be in the base class.
+    def read_tail (self, size=0, lines=0):
+        if not size or not lines:
+            lines = 5 + 10 * self.threshold
+            size = 200 * lines
+        if self.log_file:
+            return misc.read_tail (self.log_file_name, size, lines,
+                                   self.start_marker)
+        else:
+            return ['(no log)']
+
+    def dump_tail (self, output):
+        indent = '    '
+        tail = ('%(indent)s' % locals ()
+                + ('\n%(indent)s' % locals ()).join (self.read_tail ())
+                .rstrip ())
+        log_name = self.relative_log_name
+        output.write ('Tail of %(log_name)s >>>>>>>>\n%(tail)s\n<<<<<<<< Tail of %(log_name)s\n' % locals ())
+
+    def write_multilevel_message (self, message_types):
+        """Given a set of messages display the one fitting with our
+        log level."""
+        leveled = [(name_to_loglevel_mapping[type], message)
+                   for (message, type) in message_types]
+        leveled.sort ()
+        leveled.reverse ()
+        self.write_log_file (leveled[0][1])
+
+        leveled = [msg for (l, msg) in leveled
+                   if l <= self.threshold]
+        if leveled:
+            sys.stderr.write (leveled[0])
+            
+    def write_log_file (self, message):
+        if self.log_file:
+            self.log_file.write (message)
+            self.log_file.flush ()
+
+    def write_log (self, message, message_type):
+        assert type (message_type) == str
+        if not message:
+            return 0
+        message_level = name_to_loglevel_mapping[message_type]
+        if message_level <= self.threshold:
+            sys.stderr.write (message)
+
+        self.write_log_file (message)
+
+    def verbose_flag (self):
+        if self.threshold >= name_to_loglevel_mapping['output']:
+            return ' -v'
+        return ''
+
+    def log_env (self, env):
+        if self.threshold >= name_to_loglevel_mapping['debug']:
+            keys = list (env.keys ())
+            keys.sort ()
+            for k in keys:
+                self.write_log ('%s=%s\n' % (k, env[k]), 'debug')
+            self.write_log ('export %s\n' % ' '.join (keys), 'debug')
+
+    def show_logfile (self):
+        if self.log_file_name:
+            sys.stdout.write ('Logfile: %s\n' % self.log_file_name)
+
+
+class LoggerInterface:
+    """LoggerInterface provides syntacic sugar for different types of messages."""
+    
+    def __init__ (self, logger):
+        self.logger = logger
+        
+    # fixme: repetitive code.
+    def action (self, str):
+        self.logger.write_log (str, 'action')
+
+    def stage (self, str):
+        self.logger.write_log (str, 'stage')
+
+    def error (self, str):
+        self.logger.write_log (str, 'error')
+
+    def info (self, str):
+        self.logger.write_log (str, 'info')
+
+    def command (self, str):
+        self.logger.write_log (str, 'command')
+
+    def debug (self, str):
+        self.logger.write_log (str, 'debug')
+
+    def warning (self, str):
+        self.logger.write_log (str, 'warning')
+
+    def harmless (self, str):
+        self.logger.write_log (str, 'harmless')
+
+    def verbose (self, str):
+        self.logger.write_log (str, 'verbose')
+
+    def output (self, str):
+        self.logger.write_log (str, 'output')
+
+    def verbose_flag (self):
+        return self.logger.verbose_flag ()
+    # end fixme
+
+def get_numeric_loglevel (name):
+    return name_to_loglevel_mapping[name]
+
+default_logger = None
+default_logger_interface = None
+action = None
+command = None
+debug = None
+error = None
+harmless = None
+info = None
+stage = None
+verbose = None
+warning = None
+
+def set_default_log (name, level):
+    global default_logger, default_logger_interface
+    global action, command, debug, error, harmless, info, stage, verbose, warning
+    default_logger = CommandLogger (name, level)
+    default_logger_interface = LoggerInterface (default_logger)
+    action = default_logger_interface.action
+    command = default_logger_interface.command
+    debug = default_logger_interface.debug
+    error = default_logger_interface.error
+    harmless = default_logger_interface.harmless
+    info = default_logger_interface.info
+    stage = default_logger_interface.stage
+    verbose = default_logger_interface.verbose
+    warning = default_logger_interface.warning
+    return default_logger
+
+# ugh, makeme optional?
+set_default_log ('', 0)

--- a/gub/gup.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/gup.py	Sun Mar 08 21:59:33 2015 +0900
@@ -19,7 +19,7 @@
 from gub.db import db
 from gub import dependency
 from gub import locker
-from gub import logging
+from gub import gub_log
 from gub import loggedos
 from gub import misc
 import gub.settings
@@ -51,7 +51,7 @@
         self.lock_file = self.root + '.lock'
         self.lock = locker.Locker (self.lock_file)
         if clean:
-            loggedos.system (logging.default_logger,
+            loggedos.system (gub_log.default_logger,
                              'rm -fr %s' % self.config)
         self.make_dirs ()
         files_db = self.config + '/files.db'
@@ -71,10 +71,10 @@
 
     def make_dirs (self):
         if not os.path.isdir (self.config):
-            loggedos.system (logging.default_logger,
+            loggedos.system (gub_log.default_logger,
                              'mkdir -p %s' % self.config)
         if not os.path.isdir (self.root):
-            loggedos.system (logging.default_logger,
+            loggedos.system (gub_log.default_logger,
                              'mkdir -p %s' % self.root)
 
     def package_installed_files (self, name):
@@ -96,11 +96,11 @@
         return name in self.installed_files ()
 
     def install_tarball (self, ball, name, prefix_dir):
-        logging.action ('untarring: %(ball)s\n' % locals ())
+        gub_log.action ('untarring: %(ball)s\n' % locals ())
 
         _z = misc.compression_flag (ball)
         _v = '' # self.os_interface.verbose_flag ()
-        lst = loggedos.read_pipe (logging.default_logger,
+        lst = loggedos.read_pipe (gub_log.default_logger,
                                   'tar -t%(_z)s -f "%(ball)s"'
                                   % locals ()).split ('\n')
         conflicts = False
@@ -111,14 +111,14 @@
             if (':' + f + ':' in installed_files_string
                 and not os.path.isdir (os.path.join (self.root, f))):
                 package = self._file_package_db[f]
-                logging.error ('already have file %(f)s: %(package)s\n'
+                gub_log.error ('already have file %(f)s: %(package)s\n'
                                % locals ())
                 conflicts = True
-        logging.command ('GUP: for f in lst:' + misc.timing () + '\n')
+        gub_log.command ('GUP: for f in lst:' + misc.timing () + '\n')
         if conflicts and not self.is_distro:
             raise Exception ('Duplicate files found.')
         root = self.root
-        loggedos.system (logging.default_logger,
+        loggedos.system (gub_log.default_logger,
                          # cd %(root)s to avoid open(2) of cwd, see
                          # http://lists.gnu.org/archive/html/lilypond-devel/2009-03/msg00304.html
                          'cd %(root)s && tar -C %(root)s -p -x%(_z)s%(_v)s -f %(ball)s'
@@ -136,7 +136,7 @@
                 self._file_package_db[f] = name
 
         if os.path.exists ('%(root)s/usr/etc/postinstall/%(name)s' % locals ()):
-            loggedos.system (logging.default_logger,
+            loggedos.system (gub_log.default_logger,
                              'PATH=%(root)s/usr/bin:$PATH %(root)s/usr/etc/postinstall/%(name)s && mv %(root)s/usr/etc/postinstall/%(name)s %(root)s/usr/etc/postinstall/%(name)s.done || :' % locals ())
 
     def libtool_la_fixup (self, root, file):
@@ -145,7 +145,7 @@
         if file.startswith ('./'):
             file = file[2:]
         dir = os.path.dirname (file)
-        loggedos.file_sub (logging.default_logger,
+        loggedos.file_sub (gub_log.default_logger,
                            [('^libdir=.*',
                              """libdir='%(root)s/%(dir)s'""" % locals ()
                              ),],
@@ -163,14 +163,14 @@
         dir = os.path.dirname (file)
         if '%' in prefix_dir or not prefix_dir:
             barf
-        loggedos.file_sub (logging.default_logger,
+        loggedos.file_sub (gub_log.default_logger,
                            [('(-I|-L) */usr',
                              '''\\1%(root)s%(prefix_dir)s''' % locals ()
                              ),],
                            '%(root)s/%(file)s' % locals ())
 
     def uninstall_package (self, name):
-        logging.action ('uninstalling package: %s\n' % name)
+        gub_log.action ('uninstalling package: %s\n' % name)
 
         lst = self.package_installed_files (name)
 
@@ -196,7 +196,7 @@
             try:
                 os.rmdir (d)
             except OSError:
-                logging.verbose ('warning: %(d)s not empty\n' % locals ())
+                gub_log.verbose ('warning: %(d)s not empty\n' % locals ())
         for f in lst:
             ## fixme (?)  -- when is f == ''
             if not f or f.endswith ('/'):
@@ -224,16 +224,16 @@
             nm = d['split_name']
         if 0 and (nm in self._packages):
             if self._packages[nm]['spec_checksum'] != d['spec_checksum']:
-                logging.info ('******** checksum of %s changed!\n\n' % nm)
+                gub_log.info ('******** checksum of %s changed!\n\n' % nm)
 
             if self._packages[nm]['cross_checksum'] != d['cross_checksum']:
-                logging.info ('******** checksum of cross changed for %s\n' % nm)
+                gub_log.info ('******** checksum of cross changed for %s\n' % nm)
             return
         self._packages[nm] = d
         
     def register_package_header (self, package_hdr, branch_dict):
         if self.verbose:
-            logging.info ('reading package header: %s\n'
+            gub_log.info ('reading package header: %s\n'
                           % package_hdr.__repr__ ())
 
         str = open (package_hdr).read ()
@@ -247,13 +247,13 @@
             if ':' in branch:
                 (remote_branch, branch) = tuple (branch.split (':'))
             if branch != vc_branch:
-                logging.error ('package of branch: %(vc_branch)s, expecting: %(branch)s\n' % locals ())
-                logging.error ('ignoring header: %(header_name)s\n' % locals ())
+                gub_log.error ('package of branch: %(vc_branch)s, expecting: %(branch)s\n' % locals ())
+                gub_log.error ('ignoring header: %(header_name)s\n' % locals ())
                 return
         elif d['vc_branch']:
-            logging.error ('no branch for package: %(name)s\n' % locals ())
-            logging.error ('ignoring header: %(header_name)s\n' % locals ())
-            logging.error ('available branch: %(vc_branch)s\n' % locals ())
+            gub_log.error ('no branch for package: %(name)s\n' % locals ())
+            gub_log.error ('ignoring header: %(header_name)s\n' % locals ())
+            gub_log.error ('available branch: %(vc_branch)s\n' % locals ())
             return
         
         name = d['split_name']
@@ -261,7 +261,7 @@
           ## FIXME ?
           if name in self._package_dict_db:
               if str != self._package_dict_db[name]:
-                  logging.info ("package header changed for %s\n" % name)
+                  gub_log.info ("package header changed for %s\n" % name)
 
               return
 
@@ -326,10 +326,10 @@
     def install_package (self, name):
         if self.is_installed (name):
             return
-        logging.action ('installing package: %s\n' % name)
+        gub_log.action ('installing package: %s\n' % name)
         if self.is_installed (name):
             message = 'already have package: ' + name + '\n'
-            logging.error (message)
+            gub_log.error (message)
             raise Exception (message)
         d = self._packages[name]
         ball = '%(split_ball)s' % d
@@ -359,7 +359,7 @@
             return [misc.strip_platform (x)
                     for x in self.dict_dependencies (self._packages[name])]
         except KeyError:
-            logging.error ('no such package: %(name)s\n' % locals ())
+            gub_log.error ('no such package: %(name)s\n' % locals ())
             return list ()
 
     def dict_dependencies (self, dict):
@@ -427,15 +427,17 @@
     # FIXME: rename packages, fragile
     if [True for x in [
             'freebsd-runtime',
-            'mingw-runtime',
             'lilypond-doc',
             'cygwin::',
             ] if x in name]:
         return name
+    if re.search('mingw-w64-runtime$', name):
+        return name
     name = re.sub ('(gcc(-.*)?)-c[+][+]-runtime', r'\1', name)
     name = re.sub ('-devel$', '', name)
     name = re.sub ('-runtime$', '', name)
     name = re.sub ('-doc$', '', name)
+    name = re.sub ('(mingw-w64-runtime(-.*)?)-winpthread-dll', r'\1', name)
     return name
 
 def get_source_packages (settings, const_todo):

--- a/gub/installer.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/installer.py	Sun Mar 08 21:59:33 2015 +0900
@@ -326,7 +326,7 @@
 rm -f %(bundle_zip)s 
 rm -rf %(darwin_bundle_dir)s
 # FIXME: ask TarBall where source lives
-tar -C %(installerdir)s -zxf %(downloads)s/osx-lilypad/osx-lilypad-universal-%(osx_lilypad_version)s.tar.gz
+LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/tar tar -C %(installerdir)s -zxf %(downloads)s/osx-lilypad/osx-lilypad-universal-%(osx_lilypad_version)s.tar.gz
 mkdir -p %(darwin_bundle_dir)s/Contents/Resources
 touch %(darwin_bundle_dir)s/Contents/Info.plist # FIXME - this may need content
 touch %(darwin_bundle_dir)s/Contents/Resources/Credits.html # FIXME - this may need content

--- a/gub/loggedos.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/loggedos.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,13 +3,13 @@
 import subprocess
 import sys
 #
-from gub import logging
+from gub import gub_log
 from gub import misc
 
 ########
 # logged aliases to misc.py
 def logged_function (logger, function, *args, **kwargs):
-    if not isinstance (logger, logging.AbstractCommandLogger):
+    if not isinstance (logger, gub_log.AbstractCommandLogger):
         raise Exception ('NOT a logger:' + str (logger))
     logger.write_multilevel_message (
         [('Running %s\n' % function.__name__, 'action'),
@@ -97,14 +97,14 @@
 
 def test ():
     import unittest
-    from gub import logging
+    from gub import gub_log
 
     # This is not a unittest, it only serves as a smoke test
 
     class Test_loggedos (unittest.TestCase):
         def setUp (self):
             # Urg: global??
-            self.logger = logging.set_default_log ('downloads/test/test.log', 5)
+            self.logger = gub_log.set_default_log ('downloads/test/test.log', 5)
             self.loggedos = Module('loggedos')
         def testDumpFile (self):
             self.loggedos.dump_file (self.logger, 'boe', 'downloads/test/a')

--- a/gub/logging.py	Sun May 29 12:49:02 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-import time
-import sys
-import os
-#
-from gub import misc
-
-'''
-TODO: if we need more granularity, it is better to look at the stack
-trace during a log call (), and have per .py file settings.
-'''
-
-default_logger = None
-default_logger_interface = None
-
-name_to_loglevel_mapping = {'quiet': 0,
-         'error': 0,
-         'stage': 0,
-         'info': 1,
-         'harmless': 2,
-         'verbose': 2,
-         'warning': 1,
-         'command': 3,
-         'action': 2,
-         'output': 4,
-         'debug': 5}
-
-def now ():
-    return time.asctime (time.localtime ())
-
-
-class AbstractCommandLogger:
-    """A logger takes care of the mechanics of storing and/or showing
-    messages when approppriate.
-    """
-    def __init__ (self):
-        class Writer:
-            def __init__ (this, level):
-                this.level = level
-            def write (this, message):
-                self.write_log (message, this.level)
-        self.error = Writer ('error')
-        self.stage = Writer ('stage')
-        self.info = Writer ('info')
-        self.harmless = Writer ('harmless')
-        self.verbose = Writer ('verbose')
-        self.warning = Writer ('warning')
-        self.command = Writer ('command')
-        self.output = Writer ('output')
-        self.debug = Writer ('debug')
-    def verbose_flag (self):
-        return ''
-    def read_tail (self, size=0, lines=0):
-        return ['tail']
-    def write_log (self, message, message_level):
-        pass
-    def log_env (self, env):
-        pass
-    def write_multilevel_message (self, message_types):
-        pass
-    
-class NullCommandLogger (AbstractCommandLogger):
-    pass
-
-class CommandLogger (AbstractCommandLogger):
-    def __init__ (self, log_file_name, threshold):
-        AbstractCommandLogger.__init__ (self)
-        # only print message under THRESHOLD.
-        self.threshold = threshold
-        self.log_file = None
-        self.log_file_name = log_file_name
-        self.relative_log_name = log_file_name
-
-        if log_file_name:
-            self.relative_log_name = log_file_name.replace (os.getcwd () + '/', '')
-            if default_logger_interface:
-                log_name = self.relative_log_name
-                default_logger_interface.info ('Log file: %(log_name)s\n' % locals ())
-            
-            directory = os.path.split (log_file_name)[0]
-            if not os.path.isdir (directory):
-                os.makedirs (directory)
-            self.log_file = open (self.log_file_name, 'a')
-        self.start_marker = ' * Starting build: %s\n' %  now ()
-        self.write_log_file ('\n\n' + self.start_marker)
-
-    # ugh: the following should not be in the base class.
-    def read_tail (self, size=0, lines=0):
-        if not size or not lines:
-            lines = 5 + 10 * self.threshold
-            size = 200 * lines
-        if self.log_file:
-            return misc.read_tail (self.log_file_name, size, lines,
-                                   self.start_marker)
-        else:
-            return ['(no log)']
-
-    def dump_tail (self, output):
-        indent = '    '
-        tail = ('%(indent)s' % locals ()
-                + ('\n%(indent)s' % locals ()).join (self.read_tail ())
-                .rstrip ())
-        log_name = self.relative_log_name
-        output.write ('Tail of %(log_name)s >>>>>>>>\n%(tail)s\n<<<<<<<< Tail of %(log_name)s\n' % locals ())
-
-    def write_multilevel_message (self, message_types):
-        """Given a set of messages display the one fitting with our
-        log level."""
-        leveled = [(name_to_loglevel_mapping[type], message)
-                   for (message, type) in message_types]
-        leveled.sort ()
-        leveled.reverse ()
-        self.write_log_file (leveled[0][1])
-
-        leveled = [msg for (l, msg) in leveled
-                   if l <= self.threshold]
-        if leveled:
-            sys.stderr.write (leveled[0])
-            
-    def write_log_file (self, message):
-        if self.log_file:
-            self.log_file.write (message)
-            self.log_file.flush ()
-
-    def write_log (self, message, message_type):
-        assert type (message_type) == str
-        if not message:
-            return 0
-        message_level = name_to_loglevel_mapping[message_type]
-        if message_level <= self.threshold:
-            sys.stderr.write (message)
-
-        self.write_log_file (message)
-
-    def verbose_flag (self):
-        if self.threshold >= name_to_loglevel_mapping['output']:
-            return ' -v'
-        return ''
-
-    def log_env (self, env):
-        if self.threshold >= name_to_loglevel_mapping['debug']:
-            keys = list (env.keys ())
-            keys.sort ()
-            for k in keys:
-                self.write_log ('%s=%s\n' % (k, env[k]), 'debug')
-            self.write_log ('export %s\n' % ' '.join (keys), 'debug')
-
-    def show_logfile (self):
-        if self.log_file_name:
-            sys.stdout.write ('Logfile: %s\n' % self.log_file_name)
-
-
-class LoggerInterface:
-    """LoggerInterface provides syntacic sugar for different types of messages."""
-    
-    def __init__ (self, logger):
-        self.logger = logger
-        
-    # fixme: repetitive code.
-    def action (self, str):
-        self.logger.write_log (str, 'action')
-
-    def stage (self, str):
-        self.logger.write_log (str, 'stage')
-
-    def error (self, str):
-        self.logger.write_log (str, 'error')
-
-    def info (self, str):
-        self.logger.write_log (str, 'info')
-
-    def command (self, str):
-        self.logger.write_log (str, 'command')
-
-    def debug (self, str):
-        self.logger.write_log (str, 'debug')
-
-    def warning (self, str):
-        self.logger.write_log (str, 'warning')
-
-    def harmless (self, str):
-        self.logger.write_log (str, 'harmless')
-
-    def verbose (self, str):
-        self.logger.write_log (str, 'verbose')
-
-    def output (self, str):
-        self.logger.write_log (str, 'output')
-
-    def verbose_flag (self):
-        return self.logger.verbose_flag ()
-    # end fixme
-
-def get_numeric_loglevel (name):
-    return name_to_loglevel_mapping[name]
-
-default_logger = None
-default_logger_interface = None
-action = None
-command = None
-debug = None
-error = None
-harmless = None
-info = None
-stage = None
-verbose = None
-warning = None
-
-def set_default_log (name, level):
-    global default_logger, default_logger_interface
-    global action, command, debug, error, harmless, info, stage, verbose, warning
-    default_logger = CommandLogger (name, level)
-    default_logger_interface = LoggerInterface (default_logger)
-    action = default_logger_interface.action
-    command = default_logger_interface.command
-    debug = default_logger_interface.debug
-    error = default_logger_interface.error
-    harmless = default_logger_interface.harmless
-    info = default_logger_interface.info
-    stage = default_logger_interface.stage
-    verbose = default_logger_interface.verbose
-    warning = default_logger_interface.warning
-    return default_logger
-
-# ugh, makeme optional?
-set_default_log ('', 0)

--- a/gub/misc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/misc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -211,12 +211,18 @@
         return ' -z'
     elif ball.endswith ('bz2'):
         return ' -j'
+    elif (ball.endswith ('xz')
+        or ball.endswith ('lzma')
+        or ball.endswith ('txz')
+        or ball.endswith ('tlz')):
+        return ' -J'
     return ''
 
 def unzip_command (ball):
     return {
         '-z' : 'gzip -dc',
         '-j' : 'bzip2 -dc',
+        '-J' : 'xz -dc',
         '': 'cat'
         }[compression_flag (ball).strip ()]
         

--- a/gub/repository.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/repository.py	Sun Mar 08 21:59:33 2015 +0900
@@ -42,7 +42,7 @@
 from gub import misc
 from gub import locker
 from gub import tztime
-from gub import logging
+from gub import gub_log
 from gub import loggedos
 
 class UnknownVcSystem (Exception):
@@ -158,7 +158,7 @@
     def __init__ (self, dir, source):
         self.settings = None
         self.source = source
-        self.logger = logging.default_logger
+        self.logger = gub_log.default_logger
         self.system = self.logged_indirection (loggedos.system)
         self._read_file = self.logged_indirection (loggedos.read_file)
         self.download_url = self.logged_indirection (loggedos.download_url)
@@ -237,6 +237,8 @@
         return os.path.splitext (os.path.basename (self.source))[0]
     def download (self):
         pass
+    def post_download_hook (self):
+        pass
     def checksum (self):
         '''A checksum that characterizes the entire repository.
 
@@ -355,6 +357,7 @@
         else:
             dir = self.dir
             self.system ('darcs get %(source)s %(dir)s' % locals ())
+        self.post_download_hook ()
         
     def is_tracking (self):
         return True
@@ -414,7 +417,11 @@
          return url and (url.endswith (rety.vc_system)
                          or url.endswith (rety.vc_system + '.gz')
                          or url.endswith ('.tgz')
-                         or url.endswith (rety.vc_system + '.bz2'))
+                         or url.endswith (rety.vc_system + '.bz2')
+                         or url.endswith (rety.vc_system + '.xz')
+                         or url.endswith ('.txz')
+                         or url.endswith (rety.vc_system + '.lzma')
+                         or url.endswith ('.tlz'))
 
     def migrate (self, dir, dir_slash_vcs):
         pass
@@ -449,6 +456,7 @@
         if self.is_downloaded ():
             return
         self.download_url (self.source, self.dir)
+        self.post_download_hook ()
 
     def checksum (self):
         return misc.ball_basename (self._file_name ())
@@ -536,6 +544,31 @@
 
 RepositoryProxy.register (ZipFile)
 
+class SevenZFile (TarBall):
+    vc_system = '.7z'
+
+    @staticmethod
+    def create (rety, dir, source, branch='', module='', revision='', parameters=list ()):
+        return SevenZFile (dir, source)
+
+    @staticmethod
+    def check_suffix (rety, url):
+         return url and url.endswith (rety.vc_system)
+
+    # TODO: s/url/source
+    def __init__ (self, dir, url, version=None, strip_components=0):
+        TarBall.__init__ (self, dir, url, version, strip_components)
+
+    def _unpack (self, destdir, tarball):
+        strip_components = self.strip_components
+        # fixme
+        #if self.oslog:  #urg, will be fixed when .source is mandatory
+        #    _v = self.oslog.verbose_flag ()
+        _v = ''   #     self.oslog.verbose_flag ()
+        self.system ('7za x %(_v)s %(tarball)s -o%(destdir)s' % locals ())
+
+RepositoryProxy.register (SevenZFile)
+
 class Git (Repository):
     vc_system = '.git'
 
@@ -573,7 +606,8 @@
         # We cannot do a shallow download if we're not tracking
         # we have to get at least enough history to include the
         # fixed committish ... :-)
-        self.shallow = self.is_tracking ()
+        #no shallow# self.shallow = self.is_tracking ()
+        self.shallow = False
         assert self.url_host
         assert self.url_dir
     def version (self):
@@ -643,6 +677,7 @@
         if self.branch and not (self.revision and self.is_downloaded ()):
             self.git ('fetch %(source)s %(branch)s:refs/heads/%(url_host)s/%(url_dir)s/%(branch)s' % self.__dict__)
         self.checksums = {}
+        self.post_download_hook ()
     def get_ref (self):
         if not self.revision:
             return self.branch_dir ().replace ('//', '/')
@@ -848,6 +883,7 @@
 
         open (dir + '/.vc-checksum', 'w').write (cs)
         open (dir + '/.vc-timestamp', 'w').write ('%d' % stamp)
+        self.post_download_hook ()
         
     def cvs_dirs (self, branch_dir):
         retval =  []
@@ -916,6 +952,7 @@
             self._checkout ()
         elif self._current_revision () != self.revision:
             self._update (self.revision)
+        self.post_download_hook ()
         self.info ('downloaded version: ' + self.version ())
 
     def _copy_working_dir (self, dir, copy):

--- a/gub/settings.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/settings.py	Sun Mar 08 21:59:33 2015 +0900
@@ -9,7 +9,7 @@
 from gub import misc
 from gub import sources
 from gub import loggedos
-from gub import logging
+from gub import gub_log
 
 platforms = {
     'debian': 'i686-linux',
@@ -17,13 +17,13 @@
     'debian-mipsel': 'mipsel-linux',
     'debian-x86': 'i686-linux',
     'cygwin': 'i686-cygwin',
-    'darwin-ppc': 'powerpc-apple-darwin7',
+    'darwin-ppc': 'powerpc-apple-darwin8',
     'darwin-x86': 'i686-apple-darwin8',
 
     'freebsd4-x86': 'i686-freebsd4',
     'freebsd6-x86': 'i686-freebsd6',
 
-    'freebsd-x86': 'i686-freebsd4',
+    'freebsd-x86': 'i686-freebsd6',
     'freebsd-64': 'x86_64-freebsd6',
 
     'linux-arm': 'arm-linux',
@@ -167,7 +167,7 @@
         self.uploads = self.workdir_prefix + '/uploads'
         self.platform_uploads = self.uploads + '/' + self.platform
 
-        info = logging.default_logger.harmless
+        info = gub_log.default_logger.harmless
         info.write ('\n')
         info.write ('SYSTEM_ROOT=%(system_root)s\n' % self.__dict__)
         info.write ('SYSTEM_PREFIX=%(system_prefix)s\n' % self.__dict__)
@@ -234,7 +234,7 @@
                 self.build_hardware_bits = '64'
         except:
             try:
-                cpu = misc.read_pipe ('sysctl -b hw.machine', logger=logging.default_logger.harmless)
+                cpu = misc.read_pipe ('sysctl -b hw.machine', logger=gub_log.default_logger.harmless)
                 if cpu in ('amd64', 'ia64'):
                     self.build_hardware_bits = '64'
             except:
@@ -282,7 +282,7 @@
             ):
             dir = self.__dict__[a]
             if not os.path.isdir (dir):
-                loggedos.makedirs (logging.default_logger, dir)
+                loggedos.makedirs (gub_log.default_logger, dir)
 
     def dependency_url (self, string):
         # FIXME: read from settings.rc, take platform into account

--- a/gub/specs/cross/binutils.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cross/binutils.py	Sun Mar 08 21:59:33 2015 +0900
@@ -4,10 +4,11 @@
 from gub.specs import binutils
 
 class Binutils (cross.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.25.tar.bz2'
     patches = []
     dependencies = [
         'tools::zlib',
+        'tools::texinfo',
             ]
     # Block usage of libz.so during configure, which may not be
     # available in the library path.
@@ -36,15 +37,16 @@
         binutils.install_missing_plain_binaries (self)
         binutils.install_librestrict_stat_helpers (self)
         binutils.remove_fedora9_untwanted_but_mysteriously_built_libiberies (self)
+        remove_fedora17_untwanted_but_mysteriously_built_libiberies (self)
 
-class Binutils__linux__ppc (Binutils):
-    patches = Binutils.patches + [
-        'binutils-2.18-werror-ppc.patch'
-        ]
+def remove_fedora17_untwanted_but_mysteriously_built_libiberies (self):
+    self.system ('rm -f %(install_prefix)s%(cross_dir)s/lib/libiberty.a')
+    self.system ('rm -f %(install_prefix)s%(cross_dir)s/lib64/libiberty.a')
 
 class Binutils__mingw (Binutils):
     dependencies = Binutils.dependencies + [
             'tools::libtool',
+            'system::iconv',
             ]
     def configure (self):
         Binutils.configure (self)

--- a/gub/specs/cross/gcc-core.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cross/gcc-core.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,7 +3,6 @@
 from gub import misc
         
 class Gcc_core (gcc.Gcc__from__source):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2'
     dependencies = [x for x in gcc.Gcc__from__source.dependencies
                     if x != 'glibc-core']
     subpackage_names = ['']
@@ -24,12 +23,19 @@
 --enable-threads=no
 --without-headers
 --disable-shared
+--disable-decimal-float
 '''))
-    make_flags = gcc.Gcc.make_flags + ' all-gcc'
+    make_flags = gcc.Gcc.make_flags + ' all-gcc all-target-libgcc'
     install_flags = (gcc.Gcc.install_flags
-                     .replace (' install', ' install-gcc'))
+                     .replace (' install',
+                               ' install-gcc install-target-libgcc'))
     # Gcc moves libs into system lib places, which will
     # make gcc-core conflict with gcc.
-    install = cross.AutoBuild.install
+    def install (self):
+        cross.AutoBuild.install (self)
+        self.system('''
+mkdir -p %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/
+ln -s ../include-fixed/limits.h %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/limits.h
+''')
     def languages (self):
         return  ['c']

--- a/gub/specs/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -8,8 +8,19 @@
 from gub.specs import gcc
 
 class Gcc (cross.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2'
-    dependencies = ['cross/binutils']
+    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2'
+    dependencies = [
+        'cross/binutils',
+        'system::gcc',
+        'system::g++',
+        'tools::gmp',
+        'tools::mpfr',
+        'tools::mpc',
+        'tools::gawk',
+    ]
+    patches = ['gcc-4.8.2-libstdc++-debug-path.patch']
+    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
+                         + cross.AutoBuild.configure_command)
     configure_flags = (cross.AutoBuild.configure_flags
                 + '%(enable_languages)s'
                 + ' --enable-static'
@@ -33,7 +44,10 @@
     def get_subpackage_definitions (self):
         d = cross.AutoBuild.get_subpackage_definitions (self)
         prefix_dir = self.settings.prefix_dir
-        d['c++-runtime'] = [prefix_dir + '/lib/libstdc++.so*']
+        d['c++-runtime'] = [
+            prefix_dir + '/lib/libstdc++.so*',
+            prefix_dir + '/lib/libgcc_s.so*',
+        ]
         return d
     def languages (self):
         return ['c', 'c++']
@@ -58,12 +72,20 @@
 class Gcc__from__source (Gcc):
     dependencies = (Gcc.dependencies
                     + ['cross/gcc-core', 'glibc-core'])
+    def __init__ (self, settings, source):
+        Gcc.__init__ (self, settings, source)
+        if 'i686-linux' in self.settings.build_architecture:
+            if 'i686-linux' in self.settings.target_architecture:
+                self.configure_flags += ' --build=i686-unknown-linux-gnu '
     #FIXME: merge all configure_command settings with Gcc
     configure_flags = (Gcc.configure_flags
                 + misc.join_lines ('''
 --with-local-prefix=%(system_prefix)s
 --disable-multilib
 --disable-nls
+--disable-libitm
+--disable-libsanitizer
+--disable-libcilkrts
 --enable-threads=posix
 --enable-__cxa_atexit
 --enable-symvers=gnu
@@ -73,39 +95,43 @@
 '''))
     def get_conflict_dict (self):
         return {'': ['cross/gcc-core'], 'doc': ['cross/gcc-core'], 'runtime': ['cross/gcc-core']}
+    def install (self):
+        Gcc.install (self)
+        self.system('''
+mkdir -p %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/
+ln -s ../include-fixed/limits.h %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/limits.h
+''')
 
 Gcc__linux = Gcc__from__source
 
+class Gcc__linux__ppc (Gcc__linux):
+    configure_flags = (Gcc__linux.configure_flags
+                + misc.join_lines ('''
+--disable-libatomic
+--disable-libgomp
+'''))
+
 class Gcc__mingw (Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2'
     dependencies = (Gcc.dependencies
-                + ['mingw-runtime', 'w32api']
+                + ['mingw-w64-runtime']
                 + ['tools::libtool'])
-    def patch (self):
-        Gcc.patch (self)
-        for f in ['%(srcdir)s/gcc/config/i386/mingw32.h',
-                  '%(srcdir)s/gcc/config/i386/t-mingw32']:
-            self.file_sub ([('/mingw/include','%(prefix_dir)s/include'),
-                            ('/mingw/lib','%(prefix_dir)s/lib'),
-                            ], f)
-    def STATIC_GXX_WIP_REMOVE_THIS_PREFIX_configure (self):
-        # leave this for now.
-        # lots of undefined refs.
-        # possibly try static libstc++ with gcc > 4.1.1
-        '''.libs/bitmap_allocator.o: In function `__gthread_mutex_init_function':
-/home/janneke/vc/gub/target/mingw/build/cross/gcc-4.1.1/i686-mingw32/libstdc++-v3/include/i686-mingw32/bits/gthr-default.h:463: undefined reference to `___gthr_win32_mutex_init_function'
-.libs/bitmap_allocator.o: In function `_ZN9__gnu_cxx9free_list6_M_getEj':
-/home/janneke/vc/gub/target/mingw/src/cross/gcc-4.1.1/libstdc++-v3/src/bitmap_allocator.cc:53: undefined reference to `__Unwind_SjLj_Register'
-
+    configure_flags = (Gcc.configure_flags
+                + misc.join_lines ('''
+--enable-threads=posix
+'''))
+    def get_subpackage_definitions (self):
+        d = cross.AutoBuild.get_subpackage_definitions (self)
+        prefix_dir = self.settings.prefix_dir
+        d['c++-runtime'] = [
+            prefix_dir + '/bin/libstdc++-*.dll',
+            prefix_dir + '/bin/libgcc_s_*.dll',
+        ]
+        return d
+    def install (self):
+        Gcc.install (self)
+        self.system('''
+mkdir -p %(install_prefix)s/bin/
+cp %(install_prefix)s/lib/libgcc_s_*.dll %(install_prefix)s/bin/
+cp %(install_prefix)s%(cross_dir)s/%(target_architecture)s/lib/libstdc++-*.dll %(install_prefix)s/bin/
 '''
-        Gcc.configure (self)
-        # Configure all subpackages, makes
-        # w32.libtool_fix_allow_undefined to find all libtool files
-        self.system ('cd %(builddir)s && make %(compile_flags)s configure-host configure-target')
-        # Must ONLY do target stuff, otherwise cross executables cannot find their libraries
-        # self.map_locate (lambda logger,file: build.libtool_update (logger, self.expand ('%(tools_prefix)s/bin/libtool'), file), '%(builddir)s/', 'libtool')
-        #self.map_locate (lambda logger, file: build.libtool_update (logger, self.expand ('%(tools_prefix)s/bin/libtool'), file), '%(builddir)s/i686-mingw32', 'libtool')
-        vars = ['CC', 'CXX', 'LTCC', 'LD', 'sys_lib_search_path_spec', 'sys_lib_dlsearch_path_spec', 'predep_objects', 'postdep_objects', 'predeps', 'postdeps', 'old_striplib', 'striplib']
-        self.map_locate (lambda logger, file: build.libtool_update_preserve_vars (logger, self.expand ('%(tools_prefix)s/bin/libtool'), vars, file), '%(builddir)s/i686-mingw32', 'libtool')
-        self.map_locate (lambda logger, file: build.libtool_force_infer_tag (logger, 'CXX', file), '%(builddir)s/i686-mingw32', 'libtool')
-
+        )

--- a/gub/specs/curl.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/curl.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,7 +3,7 @@
 from gub import tools
 
 class Curl (target.AutoBuild):
-    source = 'http://curl.haxx.se/download/curl-7.19.0.tar.gz'
+    source = 'http://curl.haxx.se/download/curl-7.22.0.tar.gz'
     dependencies = ['tools::libtool']
     configure_flags = (tools.AutoBuild.configure_flags
                        + ' --without-openssl')

--- a/gub/specs/cygwin/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cygwin/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -6,15 +6,12 @@
 # http://gcc.gnu.org/PR24196
 #class this_works_but_has_string_exception_across_dll_bug_Gcc__cygwin (cross_gcc.Gcc__mingw):
 class Gcc__cygwin (cross_gcc.Gcc__mingw):
-#    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2'
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2'
-    patches = cross_gcc.Gcc__mingw.patches + [
-        'gcc-4.3.4-strsignal-cygwin.patch',
-        ]
+    patches = []
     dependencies = (cross_gcc.Gcc__mingw.dependencies
                     + ['cygwin',
                        'libiconv',
                        'libmpfr-devel',
+#                       'tools::mpfr', # ugh: use apt-get install libmpfr-dev
                        'w32api-in-usr-lib'])
     configure_flags = (cross_gcc.Gcc__mingw.configure_flags
                        + misc.join_lines ('''
@@ -28,8 +25,7 @@
 
 #class okGcc__cygwin (cross_gcc.Gcc):
 class above_is_okay_now_cygwin_has_switched_Gcc__cygwin (cross_gcc.Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2'
-    patches = ['gcc-3.4.4-cygwin-3.patch']
+    patches = []
     dependencies = (cross_gcc.Gcc.dependencies
                     + ['cygwin', 'w32api-in-usr-lib'])
     # We must use --with-newlib, otherwise configure fails:

--- a/gub/specs/cygwin/gmp.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cygwin/gmp.py	Sun Mar 08 21:59:33 2015 +0900
@@ -4,7 +4,7 @@
 from gub.specs import gmp
 
 class Gmp (gmp.Gmp):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.1.4.tar.gz'
-    patches = ['gmp-4.1.4-1.patch']
+    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.1.tar.gz'
+    patches = []
     dependencies = gup.gub_to_distro_deps (gmp.Gmp.dependencies,
                                            cygwin.gub_to_distro_dict)

--- a/gub/specs/cygwin/lilypond.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/cygwin/lilypond.py	Sun Mar 08 21:59:33 2015 +0900
@@ -9,7 +9,7 @@
 LilyPond lets you create music notation.  It produces beautiful
 sheet music from a high-level description file.'''
     subpackage_names = ['doc', '']
-    source = 'http://lilypond.org/download/source/v2.13/lilypond-2.13.39.tar.gz'
+    source = 'http://lilypond.org/download/source/v2.14/lilypond-2.14.1.tar.gz'
 #    source = 'git://git.sv.gnu.org/lilypond.git'
     dependencies = gup.gub_to_distro_deps (lilypond.LilyPond.dependencies,
                                            cygwin.gub_to_distro_dict) + [
@@ -48,6 +48,8 @@
         self.system ('''
 mkdir -p %(install_prefix)s/share/doc/lilypond
 cd %(install_prefix)s && LIBRESTRICT_ALLOW=/ tar -C %(install_prefix)s -jxf %(docball)s
+cd %(install_prefix)s/share/doc/lilypond/html && mv offline-root/Documentation .
+cd %(install_prefix)s/share/doc/lilypond/html && rm -rf offline-root
 cd %(install_prefix)s && rm -rf license
 ''',
                   locals ())

--- a/gub/specs/darwin/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/darwin/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,18 +5,14 @@
 from gub import cross
 
 class Gcc__darwin (cross_gcc.Gcc):
-    source = 'ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.1.1/gcc-4.1.1.tar.bz2'
     dependencies = ['odcctools']
-#    dependencies = ([x for x in cross_gcc.Gcc.dependencies
-#                     if 'cross/binutils' not in x]
-#                    + ['odcctools'])
-    def patch (self):
-        self.file_sub ([('/usr/bin/libtool', '%(cross_prefix)s/bin/%(target_architecture)s-libtool')],
-                       '%(srcdir)s/gcc/config/darwin.h')
-
-        self.file_sub ([('--strip-underscores', '--strip-underscore')],
-                       '%(srcdir)s/libstdc++-v3/scripts/make_exports.pl')
-        cross.AutoBuild.patch (self)
+    patches = cross_gcc.Gcc.patches + [
+        'gcc-4.8.2-darwin-fixinc.patch',
+        'gcc-4.8.2-darwin-libgcc.patch',
+    ]
+    configure_flags = (cross_gcc.Gcc.configure_flags
+                       + ' --disable-libcilkrts'
+    )
     def languages (self):
         # objective-c is used for quartz's Carbon/Carbon.h in pango, gtk+
         return cross_gcc.Gcc.languages (self) + ['objc', 'obj-c++']
@@ -27,7 +23,11 @@
 /home/janneke/vc/gub/target/darwin-x86/root/usr/cross/bin/i686-apple-darwin8-ld: warning can't open dynamic library: /home/janneke/vc/gub/target/darwin-x86/root/home/janneke/vc/gub/target/darwin-x86/root/usr/cross/i686-apple-darwin8/lib/libgcc_s.1.dylib referenced from: /home/janneke/vc/gub/target/darwin-x86/root/usr/lib/libstdc++.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 '''
         # let's try adding libstdc++.dylib?, nah, let's not
-        skip_libs = ['libgcc_s'] #, 'libstdc++']
+        skip_libs = [
+            'libgcc_s.10.',
+            'libgcc_s_',
+            'libgcc_ext.10.'
+        ] #, 'libstdc++']
 
         def rewire_one (logger, file):
             found_skips = [s for s in skip_libs if file.find (s) >= 0]
@@ -45,23 +45,24 @@
         self.map_locate (rewire_one,
                          self.expand ('%(install_prefix)s/lib/'),
                          '*.dylib')
+    def get_subpackage_definitions (self):
+        d = cross.AutoBuild.get_subpackage_definitions (self)
+        prefix_dir = self.settings.prefix_dir
+        d['c++-runtime'] = [
+            prefix_dir + '/lib/libstdc++.6.dylib',
+            prefix_dir + '/lib/libgcc_s.1.dylib',
+        ]
+        return d
     def install (self):
         cross_gcc.Gcc.install (self)
         # conflicts with darwin-SDK
         self.system ('mv %(install_prefix)s/lib/libsupc++.a %(install_prefix)s/lib/libsupc++.a-')
         self.rewire_gcc_libs ()
-    
-class Gcc__darwin__x86 (Gcc__darwin):
-    source = 'ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.3.2/gcc-4.3.2.tar.bz2'
-    patches = ['gcc-4.3.2-no-fixed-includes.patch']
-    dependencies = Gcc__darwin.dependencies + ['tools::mpfr']
 
-class Version_bump_builds_but_needs_a_test_Gcc__darwin__ppc (Gcc__darwin__x86):
-    pass
-
-class Not_used__Gcc__darwin (Gcc__darwin):
-    def configure (self):
-        cross_gcc.Gcc.configure (self)
-    def install (self):
-        cross_gcc.Gcc.install (self)
-        self.rewire_gcc_libs ()
+class Gcc__darwin__ppc (Gcc__darwin):
+    patches = Gcc__darwin.patches + [
+        'gcc-4.9.2-darwin-powerpc.patch', # This patch will not be needed from gcc 4.9.3.
+    ]
+    configure_flags = (Gcc__darwin.configure_flags
+                       + ' --disable-libitm'
+    )

--- a/gub/specs/darwin/darwin-sdk.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/darwin/darwin-sdk.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,7 +1,7 @@
 from gub import build
 
 class Darwin_sdk (build.SdkBuild):
-    source = 'http://lilypond.org/download/gub-sources/darwin7-sdk-0.4.tar.gz'
+    source = 'http://lilypond.org/download/gub-sources/darwin8-sdk/darwin8-sdk-0.4.tar.gz'
     def patch (self):
         self.system ('''
 rm %(srcdir)s/usr/lib/libgcc*
@@ -26,6 +26,3 @@
         pat = self.expand ('%(srcdir)s/usr/lib/*.la')
         for a in glob.glob (pat):
             self.file_sub ([(r' (/usr/lib/.*\.la)', r'%(system_root)s\1')], a)
-
-class Darwin_sdk__darwin__x86 (Darwin_sdk):
-    source = 'http://lilypond.org/download/gub-sources/darwin8-sdk-0.4.tar.gz'

--- a/gub/specs/darwin/odcctools.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/darwin/odcctools.py	Sun Mar 08 21:59:33 2015 +0900
@@ -9,10 +9,10 @@
               '&branch=odcctools'
               '&revision=278')
     # let's use cached tarball
-    source = 'http://lilypond.org/download/gub-sources/odcctools-iphone-dev-278.tar.gz'
+    source = 'http://lilypond.org/gub/download/odcctools-iphone-dev/odcctools-iphone-dev-278.tar.gz'
     patches = ['odcctools-r211-word.patch',
                'odcctools-config-Wno-long-double.patch']
-    dependencies = ['darwin-sdk', 'tools::flex']
+    dependencies = ['darwin-sdk', 'tools::flex', 'tools::automake']
     def __init__ (self, settings, source):
         cross.AutoBuild.__init__ (self, settings, source)
         if 'x86_64-linux' in self.settings.build_architecture:
@@ -20,9 +20,7 @@
             cross.change_target_package_x86 (self, self.add_linux_x86_env ())
         if 'x86_64-linux' in self.settings.build_architecture:
             self.dependencies += ['linux-x86::glibc']
-        if (self.settings.build_bits == '32'
-            and self.settings.build_hardware_bits == '64'):
-            self.configure_variables = (cross.AutoBuild.configure_variables
+        self.configure_variables = (cross.AutoBuild.configure_variables
                                         + ' CFLAGS=-D_FORTIFY_SOURCE=0')
     def autoupdate (self):
         # PROMOTEME: run aclocal if ^AM_ macros inside configure.*

--- a/gub/specs/debian/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/debian/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,10 +2,6 @@
 from gub import debian
 
 class Gcc__debian (cross_gcc.Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-' + debian.gcc_version + '/gcc-' + debian.gcc_version + '.tar.bz2'
     dependencies = ['cross/binutils', 'libc6', 'libc6-dev', 'linux-kernel-headers']
     ## TODO: should detect whether libc supports TLS 
     configure_flags = cross_gcc.Gcc.configure_flags + ' --disable-tls '
-
-class Gcc__debian__arm (Gcc__debian):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2'

--- a/gub/specs/expat.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/expat.py	Sun Mar 08 21:59:33 2015 +0900
@@ -4,30 +4,12 @@
 from gub import tools
 
 class Expat (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz'
-    patches = ['expat-2.0.1-mingw.patch']
+    source = 'http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz'
     dependencies = ['libtool', 'tools::expat']
-    make_flags = misc.join_lines ('''
-CFLAGS='-O2 -DHAVE_EXPAT_CONFIG_H'
-EXEEXT=
-RUN_FC_CACHE_TEST=false
-''')
-    if 'stat' in misc.librestrict (): # 40 lines of sh code from 1993 implementing `mkdir -p', statting components of DESTDIR: /home, ...
-        make_flags = make_flags + ''' 'mkinstalldirs=mkdir -p' '''
-    def patch (self):
-        target.AutoBuild.patch (self)
-        #FIXME: should have configure.ac/in vs configure timestamp test
-        self.system ('rm %(srcdir)s/configure')
-        self.system ('touch %(srcdir)s/tests/xmltest.sh.in')
-
-class Expat__mingw (Expat):
-    # mingw's expat libtool build breaks with DASH
-    configure_variables = (Expat.configure_variables
-                .replace ('SHELL=', 'XSHELL='))
 
 class Expat__linux__arm__vfp (Expat):
     patches = []
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.0.tar.gz'
+    source = 'http://sourceforge.net/projects/expat/files/expat/2.0.0/expat-2.0.0.tar.gz'
     def patch (self):
         self.system ('touch %(srcdir)s/tests/xmltest.sh.in')
         target.AutoBuild.patch (self)

--- a/gub/specs/flex.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/flex.py	Sun Mar 08 21:59:33 2015 +0900
@@ -4,7 +4,7 @@
 from gub import tools
 
 class Flex (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/flex/flex-2.5.35.tar.gz'
+    source = 'http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.gz'
 #    if 'stat' in misc.librestrict (): # too broken to fix
 #        # configure [gettext, flex] blindly look for /USR/include/libi*
 #        configure_variables = (target.configure_variables

--- a/gub/specs/fontconfig.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/fontconfig.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,7 @@
 #
 from gub import build
 from gub import context
-from gub import logging
+from gub import gub_log
 from gub import misc
 from gub import octal
 from gub import target
@@ -52,7 +52,7 @@
         # of freetype.
         base_config_cmd = self.settings.expand ('%(tools_prefix)s/bin/freetype-config')
         cmd =  base_config_cmd + ' --cflags'
-        logging.command ('pipe %s\n' % cmd)
+        gub_log.command ('pipe %s\n' % cmd)
         # ugh, this is utterly broken.  we're reading from the
         # filesystem init time, when freetype-config does not exist
         # yet.
@@ -62,7 +62,7 @@
     def freetype_libs (self):
         base_config_cmd = self.settings.expand ('%(tools_prefix)s/bin/freetype-config')
         cmd =  base_config_cmd + ' --libs'
-        logging.command ('pipe %s\n' % cmd)
+        gub_log.command ('pipe %s\n' % cmd)
         # return misc.read_pipe (cmd).strip ()
         return '-lfreetype -lz'
     def configure (self):

--- a/gub/specs/fontforge.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/fontforge.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,7 +5,8 @@
     # 20100501 breaks flags
     #source = 'http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge-source/fontforge_full-20100501.tar.bz2'
     #source = ':pserver:anonymous@fontforge.cvs.sourceforge.net:/cvsroot/fontforge&module=fontforge&tag=HEAD'
-    source = 'git://git.debian.org/pkg-fonts/fontforge.git&revision=4ab4fe9a81a8e15c1c7d479dc710c54335083042'
+#    source = 'git://git.debian.org/pkg-fonts/fontforge.git&revision=4ab4fe9a81a8e15c1c7d479dc710c54335083042'
+    source = 'http://kent.dl.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-20110222.tar.bz2'
     parallel_build_broken = True
     srcdir_build_broken = True
     dependencies = ['freetype', 'libpng', 'libjpeg', 'libxml2']

--- a/gub/specs/freebsd-runtime.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/freebsd-runtime.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,7 +1,7 @@
 from gub import build
 
 class Freebsd_runtime (build.BinaryBuild, build.SdkBuild):
-    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime-4.11-1.%(package_arch)s.tar.gz&strip=0'
+    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime/freebsd-runtime-6.2-1.%(package_arch)s.tar.gz&strip=0'
     def untar (self):
         build.BinaryBuild.untar (self)
         self.system ('''
@@ -11,17 +11,5 @@
 rm -f %(srcdir)s%(prefix_dir)s/include/FlexLexer.h
 ''')
 
-class Freebsd_runtime__freebsd__x86 (Freebsd_runtime):
-    patches = ['freebsd4-runtime.patch']
-    def untar (self):
-        Freebsd_runtime.untar (self)
-        self.patch ()
-        # FIXME: check if empty? (on freebsds4 it is...)
-        # cpp -P ~/vc/gub/target/freebsd-x86/root/usr/include/wctype.h
-        self.system ('''
-#breaks boost#rm %(srcdir)s%(prefix_dir)s/include/wctype.h
-cp %(sourcefiledir)s/stdint-32.h %(srcdir)s%(prefix_dir)s/include/stdint.h
-''')
-
 class Freebsd_runtime__freebsd__64 (Freebsd_runtime):
-    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime-6.2-2.%(package_arch)s.tar.gz&strip=0'
+    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime/freebsd-runtime-6.2-2.%(package_arch)s.tar.gz&strip=0'

--- a/gub/specs/freebsd/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/freebsd/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,9 +2,9 @@
 from gub import misc
 
 class Gcc__freebsd (cross_gcc.Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2'
-    dependencies = cross_gcc.Gcc.dependencies + ['tools::mpfr']
     configure_flags = (cross_gcc.Gcc.configure_flags
                 + misc.join_lines ('''
 --program-prefix=%(toolchain_prefix)s
+--disable-libcilkrts
+--disable-__cxa_atexit
 '''))

--- a/gub/specs/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -11,7 +11,6 @@
         return 'GNU C compiler; 4.x is strongly recommended'
 
 class Gcc__tools (tools.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2'
     dependencies = [
             'binutils',
             ]

--- a/gub/specs/gettext.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/gettext.py	Sun Mar 08 21:59:33 2015 +0900
@@ -53,9 +53,6 @@
                 ],
                        '%(builddir)s/gettext-tools/Makefile')
 
-class Gettext__freebsd__x86 (Gettext):
-    dependencies = (Gettext.dependencies + ['libgnugetopt'])
-
 class Gettext__mingw (Gettext):
     patches = ['gettext-0.15-mingw.patch']
     config_cache_overrides = (Gettext.config_cache_overrides

--- a/gub/specs/ghostscript.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/ghostscript.py	Sun Mar 08 21:59:33 2015 +0900
@@ -23,7 +23,7 @@
     exe = ''
     revision = 'b35333cf3579e85725bd7d8d39eacc9640515eb8'
     #source = 'git://git.infradead.org/ghostscript.git?branch=refs/remotes/git-svn&revision=' + revision
-    source = 'http://mirror2.cs.wisc.edu/pub/mirrors/ghost/GPL/gs902/ghostscript-9.02.tar.gz'
+    source = 'http://sourceforge.net/projects/ghostscript/files/GPL%%20Ghostscript/9.02/ghostscript-9.02.tar.gz'
     patches = [
         'ghostscript-9.00-make.patch',
         'ghostscript-9.00-cygwin.patch',
@@ -57,7 +57,8 @@
                 + ' mandir=%(prefix_dir)s/share/man/ '
                 + ' docdir=%(prefix_dir)s/share/doc/ghostscript/doc '
                 + ' exdir=%(prefix_dir)s/share/doc/ghostscript/examples ')
-    make_flags = target.AutoBuild.make_flags + ' TARGET=%(target_os)s'
+    # Ghostscript's check for sys/time.h is buggy: it only looks in /usr/include.
+    make_flags = target.AutoBuild.make_flags + ' TARGET=%(target_os)s CFLAGS+="-DHAVE_SYS_TIME_H=1"'
     obj = 'obj'
     @staticmethod
     def static_version (self=False):
@@ -295,6 +296,13 @@
                             ('^(EXTRALIBS *=.*)(-shared )', r'\1 -dynamic'),
                             ('^(CC_SHARED *=.*)( -shared)', r'\1 -dynamic')],
                            '%(builddir)s/Makefile')
+    def install (self):
+        Ghostscript.install (self)
+        if shared:
+            self.system ('''
+%(cross_prefix)s/bin/%(target_architecture)s-install_name_tool -id /usr/lib/libgs.8.70.dylib %(install_prefix)s/lib/libgs.8.70.dylib
+%(cross_prefix)s/bin/%(target_architecture)s-install_name_tool -change ./bin/../sobin/libgs.8.70.dylib /usr/lib/libgs.8.70.dylib %(install_prefix)s/bin/gs
+''')
 
 class Ghostscript__tools (tools.AutoBuild, Ghostscript_static):
     parallel_build_broken = True

--- a/gub/specs/git.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/git.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,8 @@
 from gub import tools
 
 class Git (target.AutoBuild):
-    source = 'http://kernel.org/pub/software/scm/git/git-1.6.4.4.tar.gz'
+    ## source = 'http://kernel.org/pub/software/scm/git/git-1.6.4.4.tar.gz'
+    source = 'http://git-core.googlecode.com/files/git-1.7.7.tar.gz'
     srcdir_build_broken = True
     subpackage_names = ['']
     dependencies = ['zlib-devel']

--- a/gub/specs/glib.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/glib.py	Sun Mar 08 21:59:33 2015 +0900
@@ -41,6 +41,9 @@
                        '%(builddir)s/libtool')
 
 class Glib__darwin__x86 (Glib__darwin):
+    # LIBS bugfix from:
+    #   https://bugzilla.gnome.org/show_bug.cgi?id=586150
+    configure_variables = Glib.configure_variables + ' LIBS=-lresolv'
     def compile (self):
         self.file_sub ([('(SUBDIRS = .*) tests', r'\1'),
                         (r'GTESTER = \$.*', ''),

--- a/gub/specs/glibc-core.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/glibc-core.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,8 +5,11 @@
 # Hmm? TARGET_CFLAGS=-O --> target.py
 
 class Glibc_core (glibc.Glibc):
-    source = 'http://lilypond.org/download/gub-sources/glibc-2.3-20070416.tar.bz2'
-    patches = glibc.Glibc.patches + ['glibc-2.3-core-install.patch']
+    source = 'http://lilypond.org/download/gub-sources/glibc/glibc-2.3-20070416.tar.bz2'
+    patches = glibc.Glibc.patches + [
+        'glibc-2.3-core-install.patch',
+        'glibc-2.3-core-libgcc.patch',
+    ]
     dependencies = ['cross/gcc-core', 'linux-headers', 'tools::bison']
     configure_flags = (glibc.Glibc.configure_flags
                        + misc.join_lines ('''
@@ -32,9 +35,15 @@
 cp %(srcdir)s/include/features.h %(install_prefix)s/include
 mkdir -p %(install_prefix)s/include/bits
 cp %(builddir)s/bits/stdio_lim.h %(install_prefix)s/include/bits
+touch %(install_prefix)s/include/bits/syscall.h
 ''')
 
 class Glibc_core__linux__ppc (Glibc_core):
+    patches = Glibc_core.patches + [
+        'glibc-2.3-linux-ppc-sysdeps-generic-strtol_l.patch',
+        'glibc-2.3-powerpc-unwind-find-fde.patch',
+        'glibc-2.3-powerpc-linuxthreads-librt_multiple_threads.patch',
+        ]
         # ugh, but the gnulib=-lgcc hack does something else on ppc...
         # it (huh?) drops *-lgcc* (instead of -lgcc_eh) from libc.so
         # linkage, which then fails.

--- a/gub/specs/glibc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/glibc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -40,7 +40,7 @@
 # automagically depend on it, which is nice.
 # See cross.py:set_cross_dependencies ()
 class Glibc (target.AutoBuild, cross.AutoBuild):
-    source = 'http://lilypond.org/download/gub-sources/glibc-2.3-20070416.tar.bz2'
+    source = 'http://lilypond.org/download/gub-sources/glibc/glibc-2.3-20070416.tar.bz2'
     patches = [
         'glibc-2.3-powerpc-initfini.patch',
         'glibc-2.3-powerpc-socket-weakalias.patch',
@@ -49,6 +49,14 @@
         'glibc-2.3-slibdir.patch',
         'glibc-2.3-assert-dl_next_tls_modid.patch',
         'glibc-2.3-binutils-2.19-i386.patch',
+        'glibc-2.3-binutils-version-check.patch',
+        'glibc-2.3-sysdeps-general-initfini.patch',
+        'glibc-2.3-sysdeps-i386-Makefile.patch',
+        'glibc-2.3-i386-crti-crtn.patch',
+        'glibc-2.3-misc-sys-cdefs-inline.patch',
+        'glibc-2.3-elf-Makefile.patch',
+        'glibc-2.3-linuxthreads-crti-crtn.patch',
+        'glibc-2.3-powerpc-sysdeps-Makefile.patch',
         ]
     dependencies = ['cross/gcc', 'glibc-core', 'tools::bison', 'tools::gzip', 'tools::perl', 'linux-headers']
     configure_flags = (target.AutoBuild.configure_flags + misc.join_lines ('''
@@ -81,6 +89,9 @@
         return {'': ['glibc-core'], 'devel': ['glibc-core'], 'doc': ['glibc-core'], 'runtime': ['glibc-core']}
     def patch (self):
         target.AutoBuild.patch (self)
+        self.system('''
+rm %(srcdir)s/sysdeps/i386/i686/memcmp.S
+''')
     def get_add_ons (self):
         return ('linuxthreads', 'nptl')
     @context.subst_method
@@ -105,6 +116,11 @@
     def LD_PRELOAD (self):
         return ''
 
+class Glibc__linux__ppc (Glibc):
+    patches = Glibc.patches + [
+        'glibc-2.3-linux-ppc-sysdeps-generic-strtol_l.patch',
+        ]
+
 class Glibc__linux__mipsel (Glibc):
     patches = Glibc.patches + [
         'glibc-2.3-mips-syscall.patch',

--- a/gub/specs/gmp.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/gmp.py	Sun Mar 08 21:59:33 2015 +0900
@@ -6,14 +6,14 @@
 from gub import tools
 
 class Gmp (target.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.1.tar.gz'
+    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-6.0.0a.tar.xz'
     def __init__ (self, settings, source):
         target.AutoBuild.__init__ (self, settings, source)
         if not self.settings.platform.startswith ('darwin'):
             self.target_architecture = re.sub ('i[0-9]86-', 'i386-', settings.target_architecture)
         if 'stat' in misc.librestrict ():
             build.add_dict (self, {'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/bash'})
-    dependencies = ['libtool', 'tools::autoconf', 'tools::automake', 'tools::bison', 'tools::flex', 'tools::libtool']
+    dependencies = ['libtool', 'tools::autoconf', 'tools::automake', 'tools::bison', 'tools::flex', 'tools::libtool', 'tools::xzutils']
     configure_flags = (target.AutoBuild.configure_flags
                        + ' --disable-cxx ')
     def configure (self):
@@ -40,11 +40,8 @@
         self.file_sub ([('using std::FILE;','')],
                        '%(install_prefix)s/include/gmp.h')
 
-class Gmp__darwin__x86 (Gmp__darwin):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz'
-
 class Gmp__mingw (Gmp):
-    patches = ['gmp-4.1.4-1.patch']
+    patches = []
     def __init__ (self, settings, source):
         Gmp.__init__ (self, settings, source)
         # Configure (compile) without -mwindows for console
@@ -55,12 +52,8 @@
 mv %(install_prefix)s/lib/*dll %(install_prefix)s/bin || true
 ''')
 
-class Gmp__freebsd (Gmp):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz'
-
 class Gmp__tools (tools.AutoBuild, Gmp):
-    dependencies = ['bison', 'flex', 'libtool']
-    patches = ['gmp-4.2.1-no-stack-protector.patch']
+    dependencies = ['bison', 'flex', 'libtool', 'xzutils']
     configure_variables = (tools.AutoBuild.configure_variables
                            # avoid __isoc99_fscanf@@GLIBC_2.7 etc
                            + ' CPPFLAGS=-D_GNU_SOURCE')

--- a/gub/specs/guile.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/guile.py	Sun Mar 08 21:59:33 2015 +0900
@@ -187,12 +187,10 @@
         self.map_locate (dylib_link,
                          self.expand ('%(install_prefix)s/lib/'),
                          'libguile-srfi*.dylib')
- 
-class Guile__darwin__x86 (Guile__darwin):
     def configure (self):
         self.file_sub ([('guile-readline', '')],
                        '%(srcdir)s/Makefile.in')
-        Guile__darwin.configure (self)
+        Guile.configure (self)
 
 class Guile__linux__x86 (Guile):
     patches = Guile.patches + ['guile-1.8.6-pthreads-cross.patch']

--- a/gub/specs/hello.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/hello.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,4 +1,4 @@
 from gub import target
 
 class Hello (target.AutoBuild):
-    source = 'http://lilypond.org/download/gub-sources/hello-1.0.tar.gz'
+    source = 'http://lilypond.org/download/gub-sources/hello/hello-1.0.tar.gz'

--- a/gub/specs/libjpeg.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/libjpeg.py	Sun Mar 08 21:59:33 2015 +0900
@@ -7,7 +7,7 @@
 from gub import tools
 
 class Libjpeg (target.AutoBuild):
-    source = 'ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz'
+    source = 'http://www.ijg.org/files/jpegsrc.v6b.tar.gz'
     config_cache_flag_broken = True
     def __init__ (self, settings, source):
         target.AutoBuild.__init__ (self, settings, source)

--- a/gub/specs/libpng.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/libpng.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,7 @@
 from gub import tools 
 
 class Libpng (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.8-config.tar.gz'
+    source = 'http://sourceforge.net/projects/libpng/files/libpng12/older-releases/1.2.8/libpng-1.2.8-config.tar.gz'
     patches = ['libpng-pngconf.h-setjmp.patch']
     dependencies = ['zlib-devel', 'tools::autoconf', 'tools::automake', 'tools::libtool']
     def name (self):

--- a/gub/specs/lilypad.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/lilypad.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,10 +2,9 @@
 from gub import target
 
 class LilyPad (target.AutoBuild):
-    source = 'http://lilypond.org/download/gub-sources/lilypad-0.0.8-1-src.tar.bz2'
+    source = 'http://lilypond.org/download/gub-sources/lilypad/lilypad-0.1.1.0-src.tar.bz2'
+    dependencies = [ 'tools::automake' ]
     destdir_install_broken = True
-    # FIXME: -DUNICODE is broken, notably for opening files.
-    make_flags = ' CPPFLAGS=-UUNICODE'
     license_files = ['']
 
 Lilypad = LilyPad

--- a/gub/specs/lilypond-doc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/lilypond-doc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -12,6 +12,8 @@
                 'tools::imagemagick',
                 'tools::rsync', # ugh, we depend on *rsync* !?
                 #'tools::texlive',
+                'system::makeinfo',
+                'system::zip',
                 ])
     make_flags = misc.join_lines ('''
 CROSS=no
@@ -20,7 +22,7 @@
 TARGET_PYTHON=/usr/bin/python
 CPU_COUNT=%(cpu_count)s
 ''')
-    compile_flags = lilypond.LilyPond_base.compile_flags + ' top-doc all doc'
+    compile_flags = lilypond.LilyPond_base.compile_flags + ' top-doc doc'
     install_flags = (' install-doc install-help2man'
                      ' prefix='
                      ' infodir=/share/info'

--- a/gub/specs/lilypond.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/lilypond.py	Sun Mar 08 21:59:33 2015 +0900
@@ -9,7 +9,7 @@
 from gub import versiondb
 from gub.specs import ghostscript
 
-VERSION='v2.13'
+VERSION='v2.14'
 def url (version=VERSION):
     url = 'http://lilypond.org/download/source/%(version)s/' % locals ()
     raw_version_file = 'lilypond-%(version)s.index' % locals ()
@@ -21,31 +21,36 @@
 sheet music from a high-level description file.'''
 
     source = 'git://git.sv.gnu.org/lilypond.git'
+#    source = url () # for release builds
     branch = 'master'
     subpackage_names = ['']
-    dependencies = ['cross/gcc-c++-runtime',
-                    'flex',
-                    'fontconfig-devel',
-                    'freetype-devel',
-                    'gettext-devel',
-                    'ghostscript',
-                    'guile-devel',
-                    'pango-devel',
-                    'python-devel',
-                    'urw-fonts',
-                    'tools::autoconf',
-                    'tools::flex',
-                    'tools::bison',
-                    'tools::texinfo',
-                    'tools::fontforge',
-                    'tools::pkg-config',
-                    'tools::gettext', # AM_GNU_GETTEXT
-                    'tools::t1utils',
-                    'tools::texi2html',
-                    #'tools::texlive',
-                    'system::mf', 
-                    'system::mpost', 
-                    ]
+    dependencies = [
+        'cross/gcc-c++-runtime',
+
+        'flex',
+        'fontconfig-devel',
+        'freetype-devel',
+        'gettext-devel',
+        'ghostscript',
+        'guile-devel',
+        'pango-devel',
+        'python-devel',
+        'urw-fonts',
+
+        'tools::autoconf',
+        'tools::bison',
+        'tools::flex',
+        'tools::fontforge',
+        'tools::gettext', # AM_GNU_GETTEXT
+        'tools::pkg-config',
+        'tools::t1utils',
+        'tools::texi2html',
+        'tools::texinfo',
+        #'tools::texlive',
+
+        'system::mf', 
+        'system::mpost', 
+        ]
     if 'stat' in misc.librestrict ():
         dependencies = [x for x in dependencies
                         if x not in ['system::mf', 'system::mpost']
@@ -70,6 +75,10 @@
             'VERSION', 'MAJOR_VERSION',
             '%(MAJOR_VERSION)s.%(MINOR_VERSION)s.%(PATCH_LEVEL)s')
 
+    @staticmethod
+    def bind_version (self):
+        self.version = misc.bind_method (LilyPond.version_from_VERSION, self)
+
     def __init__ (self, settings, source):
         target.AutoBuild.__init__ (self, settings, source)
         # FIXME: should add to C_INCLUDE_PATH
@@ -80,7 +89,10 @@
                                  + ' -I%(builddir)s' % locals ()
                                  + ' -I%(srcdir)s/lily/out' % locals ())
         if isinstance (source, repository.Git):
-            source.version = misc.bind_method (LilyPond.version_from_VERSION, source)
+            if source.is_downloaded ():
+                source.version = misc.bind_method (LilyPond.version_from_VERSION, source)
+            else:
+                source.post_download_hook = misc.bind_method (LilyPond.bind_version, source)
         if 'stat' in misc.librestrict () and not 'tools::texlive' in self.dependencies:
             build.append_dict (self, {'PATH': os.environ['PATH']}) # need mf, mpost from system
     def get_conflict_dict (self):
@@ -159,6 +171,7 @@
     dependencies = LilyPond.dependencies + [
             'tools::imagemagick',
             'tools::icoutils',
+            'mingw-w64-runtime-winpthread-dll',
             ]
     python_lib = '%(system_prefix)s/bin/libpython*.dll'
     make_flags = (LilyPond.make_flags
@@ -240,7 +253,7 @@
 class LilyPond__darwin__ppc (LilyPond__darwin):
     def configure (self):
         LilyPond__darwin.configure (self)
-        self.dump ('CXXFLAGS += -DGUILE_ELLIPSIS=...',
+        self.dump ('CXXFLAGS += -fpermissive -DGUILE_ELLIPSIS=...',
                    '%(builddir)s/local.make')
 
 class LilyPond_base (target.AutoBuild):

--- a/gub/specs/linux-arm-softfloat/cross/gcc-core.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/linux-arm-softfloat/cross/gcc-core.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,12 +2,9 @@
 gcc = misc.load_spec ('cross/gcc-core')
 
 class Gcc_core (gcc.Gcc_core):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2'
     def patch (self):
         gcc.Gcc_core.patch (self)
         self.system ('''
-cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-lib1asm.patch
-cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-nolibfloat.patch
 ''')
     configure_flags = (gcc.Gcc_core.configure_flags
                 + misc.join_lines ('''

--- a/gub/specs/linux-arm-softfloat/cross/gcc.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/linux-arm-softfloat/cross/gcc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,12 +3,9 @@
 from gub import misc
 
 class Gcc (cross_gcc.Gcc_from_source):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2'
     def patch (self):
         cross_gcc.Gcc_from_source.patch (self)
         self.system ('''
-cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-lib1asm.patch
-cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-nolibfloat.patch
 ''')
     configure_flags = (cross_gcc.Gcc_from_source.configure_flags
                 + misc.join_lines ('''

--- a/gub/specs/linux-headers.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/linux-headers.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,7 @@
 from gub import context
 
 class Linux_headers (build.BinaryBuild, build.SdkBuild):
-    source = 'http://www.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.34.tar.bz2&name=linux-headers'
+    source = 'http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.34.tar.bz2&name=linux-headers'
     # HMm, is this more handy than patch ():pass in BinaryBuild?
     # possibly we should simply override install (), but that is
     # always a problem because install ()

--- a/gub/specs/mingw-runtime.py	Sun May 29 12:49:02 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-from gub import build
-
-class Mingw_runtime (build.BinaryBuild, build.SdkBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.14.tar.gz&strip=0'
-    def install (self):
-        self.system ('''
-mkdir -p %(install_prefix)s/share
-cd %(srcdir)s && tar -C %(srcdir)s/ -cf - . | tar -C %(install_prefix)s -xf -
-mkdir -p %(install_prefix)s/include/sys
-#cp -p %(sourcefiledir)s/mingw-headers/wait.h %(install_prefix)s/include/sys
-mv %(install_prefix)s/doc %(install_root)s/share
-''', locals ())

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mingw-w64-runtime.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,36 @@
+from gub import build
+
+class Mingw_w64_runtime (build.BinaryBuild, build.SdkBuild):
+    source = 'http://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/4.9.2/threads-posix/sjlj/i686-4.9.2-release-posix-sjlj-rt_v3-rev1.7z'
+    dependencies = [ 'tools::p7zip' ]
+    subpackage_names = ['winpthread-dll', '']
+    def get_subpackage_definitions (self):
+        d = build.BinaryBuild.get_subpackage_definitions (self)
+        prefix_dir = self.settings.prefix_dir
+        d['winpthread-dll'] = [
+            prefix_dir + '/bin/libwinpthread-*.dll',
+        ]
+        return d
+    def install (self):
+        self.system ('''
+mkdir -p %(install_prefix)s/include
+mkdir -p %(install_prefix)s/lib
+mkdir -p %(install_prefix)s/bin
+cd %(srcdir)s/mingw32/i686-w64-mingw32/include/ && tar -C %(srcdir)s/mingw32/i686-w64-mingw32/include/ -cf - . | tar -C %(install_prefix)s/include/ -xf -
+cd %(srcdir)s/mingw32/i686-w64-mingw32/lib/ && tar -C %(srcdir)s/mingw32/i686-w64-mingw32/lib/ -cf - . | tar -C %(install_prefix)s/lib/ -xf -
+cp %(srcdir)s/mingw32/bin/libwinpthread-*.dll %(install_prefix)s/bin/
+rm -f %(install_prefix)s/lib/libgcc_s.a # for cross/gcc conflict
+rm -f %(install_prefix)s/lib/libquadmath-0.dll # for cross/gcc conflict
+rm -f %(install_prefix)s/lib/libssp-0.dll # for cross/gcc conflict
+rm -f %(install_prefix)s/lib/libgcc_s_sjlj-1.dll # for cross/gcc conflict
+rm -f %(install_prefix)s/include/zlib.h # for zlib conflict
+rm -f %(install_prefix)s/include/zconf.h # for zlib conflict
+rm -f %(install_prefix)s/lib/libz.a # for zlib conflict
+rm -f %(install_prefix)s/include/localcharset.h # for libiconv conflict
+rm -f %(install_prefix)s/include/libcharset.h # for libiconv conflict
+rm -f %(install_prefix)s/include/error.h # for regex failure
+rm -f %(install_prefix)s/include/iconv.h # for fontconfig failure
+rm -f %(install_prefix)s/lib/libiconv.a # for ghostscript failure
+rm -fr %(srcdir)s/mingw32/
+ln -s usr/ %(install_root)s/mingw
+''', locals ())

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mingwrt-dev.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,18 @@
+from gub import build
+
+class Mingwrt_dev (build.BinaryBuild, build.SdkBuild):
+    source = 'http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dev.tar.lzma&strip=0'
+    dependencies = [ 'tools::xzutils' ]
+    def install (self):
+        self.system ('''
+mkdir -p %(install_prefix)s/include
+mkdir -p %(install_prefix)s/lib
+mkdir -p %(install_prefix)s/share/doc
+cd %(srcdir)s/include/ && tar -C %(srcdir)s/include/ -cf - . | tar -C %(install_prefix)s/include/ -xf -
+cd %(srcdir)s/lib/ && tar -C %(srcdir)s/lib/ -cf - . | tar -C %(install_prefix)s/lib/ -xf -
+cd %(srcdir)s/share/ && tar -C %(srcdir)s/share/ -cf - . | tar -C %(install_prefix)s/share/ -xf -
+cd %(srcdir)s/doc/ && tar -C %(srcdir)s/doc/ -cf - . | tar -C %(install_prefix)s/share/doc/ -xf -
+mkdir -p %(install_prefix)s/include/sys
+#cp -p %(sourcefiledir)s/mingw-headers/wait.h %(install_prefix)s/include/sys
+rm -fr %(srcdir)s/include/ %(srcdir)s/lib/ %(srcdir)s/share/ %(srcdir)s/doc/
+''', locals ())

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mingwrt-dll.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,12 @@
+from gub import build
+
+class Mingwrt_dll (build.BinaryBuild, build.SdkBuild):
+    source = 'http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dll.tar.lzma&strip=0'
+    dependencies = [ 'tools::xzutils' ]
+    def install (self):
+        self.system ('''
+rm -fr %(srcdir)s/doc/
+mkdir -p %(install_prefix)s/bin/
+cd %(srcdir)s/bin/ && tar -C %(srcdir)s/bin/ -cf - . | tar -C %(install_prefix)s/bin/ -xf -
+rm -fr %(srcdir)s/bin/
+''', locals ())

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mpc.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,5 @@
+from gub import tools
+
+class Mpc__tools (tools.AutoBuild):
+    source = 'http://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz'
+    dependencies = ['gmp', 'mpfr']

--- a/gub/specs/mpfr.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/mpfr.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,5 +1,5 @@
 from gub import tools
 
 class Mpfr__tools (tools.AutoBuild):
-    source = 'http://www.mpfr.org/mpfr-2.3.2/mpfr-2.3.2.tar.gz'
+    source = 'http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.gz'
     dependencies = ['libtool', 'gmp']

--- a/gub/specs/netpbm.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/netpbm.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,7 +3,7 @@
 
 class Netpbm__tools (tools.AutoBuild):
     # source='svn:https://svn.sourceforge.net/svnroot/netpbm/stable&revision=172'
-    source='http://lilypond.org/download/gub-sources/netpbm-patched-10.35.tar.bz2'
+    source='http://lilypond.org/download/gub-sources/netpbm-patched/netpbm-patched-10.35.tar.bz2'
     patches = ['netpbm-10.35-glibc-2.10.1-name-conflict.patch']
     parallel_build_broken = True
     dependencies = ['flex', 'libjpeg', 'libpng', 'libtiff', 'zlib'] #libxml2? libx11-dev

--- a/gub/specs/nsis.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/nsis.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,9 +5,16 @@
 from gub import tools
 
 class Nsis (tools.SConsBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/nsis/nsis-2.46-src.tar.bz2'
+    source = 'http://sourceforge.net/projects/nsis/files/NSIS%%202/2.46/nsis-2.46-src.tar.bz2'
     #source = ':pserver:anonymous@nsis.cvs.sourceforge.net:/cvsroot/nsis&module=NSIS&tag=HEAD'
     dependencies = ['mingw::cross/gcc']
+    patches = [
+        'nsis-2.46-crossmingw.patch',
+        'nsis-2.46-util.patch',
+        'nsis-2.46-linker_script-default.patch',
+        'nsis-2.46-linker_script-ndata.patch',
+	'nsis-2.46-InstallOptions.patch',
+    ]
     scons_flags = misc.join_lines ('''
 DEBUG=yes
 NSIS_CONFIG_LOG=yes
@@ -37,6 +44,7 @@
                      + '/bin')
         return {'PATH': mingw_bin + ':' + tools_bin + ':' + os.environ['PATH'] }
     def patch (self):
+        tools.SConsBuild.patch (self)
         self.system ('mkdir -p %(allbuilddir)s', ignore_errors=True)
         self.system ('ln -s %(srcdir)s %(builddir)s')
         if 'x86_64-linux' in self.settings.build_architecture:
@@ -47,6 +55,12 @@
 defenv['C_INCLUDE_PATH'] = ''
 defenv['CPLUS_INCLUDE_PATH'] = ''
 defenv['CFLAGS'] = ''
+# SCons will add double quotes when LINKFLAGS contains whitespace,
+# so start and end with double quotes as so to disarm them
+#defenv['LINKFLAGS'] = '"%(rpath)s -Wl,-rpath -Wl,%(alltargetdir)s/%(build_platform)s%(root_dir)s%(prefix_dir)s/lib"'
+# Nsis is built 32 bit -- this won't work for non-GNU/Linux build hosts
+defenv['LINKFLAGS'] = '"%(rpath)s -Wl,-rpath -Wl,%(alltargetdir)s/linux-x86%(root_dir)s%(prefix_dir)s/lib"'
+
 Export('defenv')
 ''')],
                        '%(srcdir)s/SConstruct')

--- a/gub/specs/osx-lilypad.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/osx-lilypad.py	Sun Mar 08 21:59:33 2015 +0900
@@ -4,7 +4,9 @@
     pass
 
 class Osx_lilypad__darwin__ppc (build.NullBuild):
-    source = 'http://lilypond.org/download/gub-sources/osx-lilypad-universal-0.4.tar.gz'
+    # yes, we really need the old version here
+    # later versions were built on OSX 10.7, which doesn't have pcc support
+    source = 'http://lilypond.org/download/gub-sources/osx-lilypad-universal/osx-lilypad-universal-0.4.tar.gz'
 
 class Osx_lilypad__darwin__x86 (build.NullBuild):
-    source = 'http://lilypond.org/download/gub-sources/osx-lilypad-universal-0.4.tar.gz'
+    source = 'http://lilypond.org/download/gub-sources/osx-lilypad-universal/osx-lilypad-universal-0.6.3.tar.gz'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/p7zip.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,11 @@
+from gub import tools
+
+class P7zip__tools (tools.MakeBuild):
+    source = 'http://sourceforge.net/projects/p7zip/files/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2'
+    dependencies = [ 'bzip2', 'system::g++' ]
+    install_flags = ' DEST_HOME=%(install_prefix)s install'
+    def patch (self):
+        tools.MakeBuild.patch (self)
+        self.system('''
+sed -i -e 's/chmod 555/chmod 755/' -e 's/chmod 444/chmod 644/' %(srcdir)s/install.sh
+''')

--- a/gub/specs/pango.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/pango.py	Sun Mar 08 21:59:33 2015 +0900
@@ -91,10 +91,6 @@
 ''', '%(install_prefix)s/etc/relocate/pango.reloc', env=locals (), mode='a')
 
 class Pango__mingw (Pango):
-        # FIXME: need -lpthread now?
-        # /home/janneke/vc/gub/target/mingw/root/usr/cross/bin/i686-mingw32-ld: cannot find -lpthread
-    dependencies = (Pango.dependencies
-                + ['pthreads-w32-devel'])
     def create_config_files (self, prefix='/usr'):
         Pango.create_config_files (self, prefix)
         etc = self.expand ('%(install_root)s/%(prefix)s/etc/pango', locals ())

--- a/gub/specs/patch.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/patch.py	Sun Mar 08 21:59:33 2015 +0900
@@ -6,7 +6,7 @@
 # ugh, openoffice the ooo-build flavour needs the latest patch with
 # additional [SUSE] patches to not barf on all CRLF problems.
 # Taken from the Ibex: apt-get --download source patch
-    source = 'http://lilypond.org/download/gub-sources/patch-2.5.9-5.tar.gz'
+    source = 'http://lilypond.org/download/gub-sources/patch/patch-2.5.9-5.tar.gz'
     configure_variables = ''
     destdir_install_broken = True
     def configure (self):

--- a/gub/specs/perl.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/perl.py	Sun Mar 08 21:59:33 2015 +0900
@@ -6,7 +6,7 @@
 # And this is supposed to be one of the most compiled packages?
 # So why doesn't anyone fix configuring/compiling it?  Shees.
 class Perl__tools (tools.AutoBuild):
-    source = 'http://www.cpan.org/src/perl-5.10.0.tar.gz'
+    source = 'http://www.cpan.org/src/5.0/perl-5.10.0.tar.gz'
     srcdir_build_broken = True
     def patch (self):
         tools.AutoBuild.patch (self)

--- a/gub/specs/python.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/python.py	Sun Mar 08 21:59:33 2015 +0900
@@ -48,7 +48,6 @@
         if 'stat' in misc.librestrict ():
             self.install_command = ('LIBRESTRICT_ALLOW=/usr/lib/python2.4/lib-dynload:${LIBRESTRICT_ALLOW-/foo} '
                 + target.AutoBuild.install_command)
-
     def patch (self):
         target.AutoBuild.patch (self)
         self.file_sub ([('@CC@', '@CC@ -I$(shell pwd)')],
@@ -120,7 +119,7 @@
     def __init__ (self, settings, source):
         Python.__init__ (self, settings, source)
         self.target_gcc_flags = '-DMS_WINDOWS -DPy_WIN_WIDE_FILENAMES -I%(system_prefix)s/include' % self.settings.__dict__
-    dependencies = Python.dependencies + ['pthreads-w32-devel']
+    dependencies = Python.dependencies + ['mingw-w64-runtime-winpthread-dll']
     # FIXME: first is cross compile + mingw patch, backported to
     # 2.4.2 and combined in one patch; move to cross-Python?
     def patch (self):
@@ -180,6 +179,10 @@
 #        'python-2.4.2-fno-stack-protector.patch',
         'python-2.4.5-readline.patch', # Stop python from reading ~/.inputrc
         'python-2.4.5-db4.7.patch',
+        'python-2.4.5-regen.patch',
+        'python-2.4.5-gcc-R.patch',
+        'python-2.4.5-Setup-crypt.patch',
+        'python-2.4.5-Setup-dbm.patch',
         ]
     dependencies = [
         'autoconf',
@@ -187,6 +190,7 @@
         'libtool',
         ]
     force_autoupdate = True
-    make_flags = Python.make_flags
+    parallel_build_broken = True
+    make_flags = Python.make_flags + ' LIBC="-lcrypt -ldb"'
     def patch (self):
         Python.patch (self)

--- a/gub/specs/regex.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/regex.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,5 +1,5 @@
 from gub import target
 
 class Regex (target.AutoBuild):
-    source = 'http://lilypond.org/download/gub-sources/regex-2.3.90-1.tar.bz2'
+    source = 'http://lilypond.org/download/gub-sources/regex/regex-2.3.90-1.tar.bz2'
     dependencies = ['tools::libtool']

--- a/gub/specs/rsync.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/rsync.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,7 +1,7 @@
 from gub import tools
 
 class Rsync__tools (tools.AutoBuild):
-    source = 'ftp://ftp.samba.org/pub/rsync/src/rsync-3.0.4.tar.gz'
+    source = 'http://rsync.samba.org/ftp/rsync/src/rsync-3.0.4.tar.gz'
     patches = ['rsync-popt-add-prefix.patch']
     # adding libpopt build depependency not really necessary, as rsync
     # bundles it.

--- a/gub/specs/tar.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/tar.py	Sun Mar 08 21:59:33 2015 +0900
@@ -3,7 +3,7 @@
 from gub import tools
 
 class Tar__tools (tools.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/tar/tar-1.20.tar.gz'
+    source = 'http://ftp.gnu.org/pub/gnu/tar/tar-1.28.tar.gz'
     def __init__ (self, settings, source):
         tools.AutoBuild.__init__ (self, settings, source)
         if isinstance (self.source, repository.TarBall):

--- a/gub/specs/texinfo.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/texinfo.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,14 @@
 
 class Texinfo__tools (tools.AutoBuild):
     source = 'http://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz'
+    patches = ['texinfo-4.13a-fix-bashism.patch']
     def patch (self):
         tools.AutoBuild.patch (self)
         # Drop ncurses dependency
         self.file_sub ([(' info ',' ')], '%(srcdir)s/Makefile.in')
+        # Avoid man rebuild
+        self.system('''
+touch %(srcdir)s/doc/texi2dvi.1
+touch %(srcdir)s/doc/texi2pdf.1
+touch %(srcdir)s/doc/pdftexi2dvi.1
+''')

--- a/gub/specs/texlive.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/texlive.py	Sun Mar 08 21:59:33 2015 +0900
@@ -2,7 +2,7 @@
 #
 from gub.syntax import printf
 from gub import context
-from gub import logging
+from gub import gub_log
 from gub import loggedos
 from gub import misc
 from gub import octal
@@ -209,7 +209,7 @@
             if texmf_dist:                self.texmf_dist_repo.update_workdir (self.expand ('%(srcdir)s/texmf-dist'))
             # ugh.
             if self.source.have_client ():
-                loggedos.download_url (logging.default_logger,
+                loggedos.download_url (gub_log.default_logger,
                                        license_url,
                                        self.expand ('%(srcdir)s'))
         self.func (defer)
@@ -300,12 +300,12 @@
     call_env.update (env)
     for i in cmd.split ('\n'):
         if i:
-            loggedos.system (logging.default_logger, i % env, call_env, ignore_errors)
+            loggedos.system (gub_log.default_logger, i % env, call_env, ignore_errors)
 
 def main ():
     version = '15644'
     revision = '.1'
-    logging.default_logger.threshold = '1'
+    gub_log.default_logger.threshold = '1'
     for texmf in ['texlive-texmf', 'texlive-texmf-dist']:
         system ('''
 mkdir -p downloads/%(texmf)s-tiny

--- a/gub/specs/urw-fonts.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/urw-fonts.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,7 +1,7 @@
 from gub import build
 
 class Urw_fonts (build.BinaryBuild):
-    source = 'ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-1.0.7pre41.tar.bz2&strip=0'
+    source = 'http://lilypond.org/gub/download/urw-fonts/urw-fonts-1.0.7pre41.tar.bz2&strip=0'
     def compile (self):
         self.system ('cd %(srcdir)s && rm README* COPYING ChangeLog TODO')
     def install (self):

--- a/gub/specs/w32api.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/w32api.py	Sun Mar 08 21:59:33 2015 +0900
@@ -1,10 +1,13 @@
 from gub import build
 
 class W32api (build.BinaryBuild, build.SdkBuild):
-    #source = 'http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-3.12.tar.gz&strip=0'
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/mingw/w32api-3.12-mingw32-dev.tar.gz&strip=0'
-    def untar (self):
-        build.BinaryBuild.untar (self)
+    source = 'http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/w32api-3.17/w32api-3.17-2-mingw32-dev.tar.lzma&strip=0'
+    dependencies = [ 'tools::xzutils' ]
+    def install (self):
         self.system ('''
-cd  %(srcdir)s/ && mkdir usr && mv include lib usr/
-''')
+mkdir -p %(install_prefix)s/include
+mkdir -p %(install_prefix)s/lib
+cd %(srcdir)s/include/ && tar -C %(srcdir)s/include/ -cf - . | tar -C %(install_prefix)s/include/ -xf -
+cd %(srcdir)s/lib/ && tar -C %(srcdir)s/lib/ -cf - . | tar -C %(install_prefix)s/lib/ -xf -
+rm -fr %(srcdir)s/include/ %(srcdir)s/lib/
+''', locals ())

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/xzutils.py	Sun Mar 08 21:59:33 2015 +0900
@@ -0,0 +1,6 @@
+#
+from gub import tools
+
+class Xzutils__tools (tools.AutoBuild):
+    source = 'http://tukaani.org/xz/xz-5.0.7.tar.bz2'
+    dependencies = ['tools::bzip2']

--- a/gub/specs/zlib.py	Sun May 29 12:49:02 2011 +0200
+++ b/gub/specs/zlib.py	Sun Mar 08 21:59:33 2015 +0900
@@ -5,7 +5,7 @@
 from gub import tools
 
 class Zlib (target.AutoBuild):
-    source = 'http://surfnet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.3.tar.gz'
+    source = 'http://sourceforge.net/projects/libpng/files/zlib/1.2.3/zlib-1.2.3.tar.gz'
     patches = ['zlib-1.2.3.patch']
     srcdir_build_broken = True
     dependencies = ['tools::autoconf']

--- a/librestrict/xstatconv.c	Sun May 29 12:49:02 2011 +0200
+++ b/librestrict/xstatconv.c	Sun Mar 08 21:59:33 2015 +0900
@@ -48,20 +48,16 @@
       {
 	struct stat *buf = ubuf;
 
+	/* zero clear */
+	memset(buf, 0, sizeof(*buf));
 	/* Convert to current kernel version of `struct stat'.  */
 	buf->st_dev = kbuf->st_dev;
-#ifdef _HAVE_STAT___PAD1
-	buf->__pad1 = 0;
-#endif
 	buf->st_ino = kbuf->st_ino;
 	buf->st_mode = kbuf->st_mode;
 	buf->st_nlink = kbuf->st_nlink;
 	buf->st_uid = kbuf->st_uid;
 	buf->st_gid = kbuf->st_gid;
 	buf->st_rdev = kbuf->st_rdev;
-#ifdef _HAVE_STAT___PAD2
-	buf->__pad2 = 0;
-#endif
 	buf->st_size = kbuf->st_size;
 	buf->st_blksize = kbuf->st_blksize;
 	buf->st_blocks = kbuf->st_blocks;
@@ -77,21 +73,6 @@
 	buf->st_mtime = kbuf->st_mtime;
 	buf->st_ctime = kbuf->st_ctime;
 #endif
-#ifdef _HAVE_STAT___UNUSED1
-	buf->__unused1 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED2
-	buf->__unused2 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED3
-	buf->__unused3 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED4
-	buf->__unused4 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED5
-	buf->__unused5 = 0;
-#endif
       }
       break;
 
@@ -116,11 +97,10 @@
       {
 	struct stat64 *buf = ubuf;
 
+	/* zero clear */
+	memset(buf, 0, sizeof(*buf));
 	/* Convert to current kernel version of `struct stat64'.  */
 	buf->st_dev = kbuf->st_dev;
-#ifdef _HAVE_STAT64___PAD1
-	buf->__pad1 = 0;
-#endif
 	buf->st_ino = kbuf->st_ino;
 #ifdef _HAVE_STAT64___ST_INO
 	buf->__st_ino = kbuf->st_ino;
@@ -130,9 +110,6 @@
 	buf->st_uid = kbuf->st_uid;
 	buf->st_gid = kbuf->st_gid;
 	buf->st_rdev = kbuf->st_rdev;
-#ifdef _HAVE_STAT64___PAD2
-	buf->__pad2 = 0;
-#endif
 	buf->st_size = kbuf->st_size;
 	buf->st_blksize = kbuf->st_blksize;
 	buf->st_blocks = kbuf->st_blocks;
@@ -148,21 +125,6 @@
 	buf->st_mtime = kbuf->st_mtime;
 	buf->st_ctime = kbuf->st_ctime;
 #endif
-#ifdef _HAVE_STAT64___UNUSED1
-	buf->__unused1 = 0;
-#endif
-#ifdef _HAVE_STAT64___UNUSED2
-	buf->__unused2 = 0;
-#endif
-#ifdef _HAVE_STAT64___UNUSED3
-	buf->__unused3 = 0;
-#endif
-#ifdef _HAVE_STAT64___UNUSED4
-	buf->__unused4 = 0;
-#endif
-#ifdef _HAVE_STAT64___UNUSED5
-	buf->__unused5 = 0;
-#endif
       }
       break;
 
@@ -185,12 +147,11 @@
     {
     case _STAT_VER_LINUX:
       {
+	/* zero clear */
+	memset(buf, 0, sizeof(*buf));
 	/* Convert current kernel version of `struct stat64' to
            `struct stat'.  */
 	buf->st_dev = kbuf->st_dev;
-#ifdef _HAVE_STAT___PAD1
-	buf->__pad1 = 0;
-#endif
 #ifdef _HAVE_STAT64___ST_INO
 # if __ASSUME_ST_INO_64_BIT == 0
 	if (kbuf->st_ino == 0)
@@ -220,9 +181,6 @@
 	buf->st_uid = kbuf->st_uid;
 	buf->st_gid = kbuf->st_gid;
 	buf->st_rdev = kbuf->st_rdev;
-#ifdef _HAVE_STAT___PAD2
-	buf->__pad2 = 0;
-#endif
 	buf->st_size = kbuf->st_size;
 	/* Check for overflow.  */
 	if (sizeof (buf->st_size) != sizeof (kbuf->st_size)
@@ -253,21 +211,6 @@
 	buf->st_ctime = kbuf->st_ctime;
 #endif
 
-#ifdef _HAVE_STAT___UNUSED1
-	buf->__unused1 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED2
-	buf->__unused2 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED3
-	buf->__unused3 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED4
-	buf->__unused4 = 0;
-#endif
-#ifdef _HAVE_STAT___UNUSED5
-	buf->__unused5 = 0;
-#endif
       }
       break;
 

--- a/lilypond.make	Sun May 29 12:49:02 2011 +0200
+++ b/lilypond.make	Sun Mar 08 21:59:33 2015 +0900
@@ -9,6 +9,7 @@
 .PHONY: lilypond-upload
 
 default: all
+	$(info **** Default rule)
 
 LILYPOND_BRANCH=master
 BUILDSCRIPTS=scripts/build
@@ -36,7 +37,7 @@
 841ee1b... PYTHON-CONFIG: also strip -m* and =.  Thanks Werner!\
 f9e5179... Append /../lib to default rpath.\
 fc158e0... Add --enable-rpath feature, defaulting to $ORIGIN/../lib. Default off.\
-23e401a... Clean-out some junk flags from python-config.  Fixes stray g++ warnings.\
+23e401a... Clean-out some junk flags from python-config.  Fixes stray g++ warning ****s.\
 )
 endif
 
@@ -70,8 +71,7 @@
 NATIVE_TARGET_DIR=$(CWD)/target/$(BUILD_PLATFORM)
 TOOLS_BIN_DIR=$(CWD)/target/tools/root/usr/bin/
 
-#FIXME: yet another copy of gub/settings.py
-SET_LOCAL_PATH=PATH=$(CWD)/target/local/root/usr/bin:$(PATH)
+SET_TOOLS_PATH=PATH=$(CWD)/target/tools/root/usr/bin:$(PATH)
 
 LILYPOND_VERSIONS = versiondb/lilypond.versions
 
@@ -80,6 +80,7 @@
 ################
 
 unlocked-update-versions:
+	$(info **** **** unlocked-update-versions rule)
 	python gub/versiondb.py --version-db=$(LILYPOND_VERSIONS) --download --platforms="$(PLATFORMS)"
 
 ifneq ($(findstring cygwin,$(PLATFORMS)),)
@@ -92,6 +93,7 @@
 endif
 
 download-cygwin:
+	$(info **** download-cygwin rule)
 	$(MAKE) downloads/genini
 	rm -f target/*/status/lilypond*
 	rm -f log/lilypond-$(LILYPOND_VERSION)*.*.test.pdf
@@ -101,13 +103,16 @@
 
 ## same command as  lilypond.versions:
 update-versions:
+	$(info **** update-versions rule)
 	$(PYTHON) gub/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-update-versions
 
 ## same command as  update-versions:
 $(LILYPOND_VERSIONS):
+	$(info **** LILYPOND_VERSIONS rule)
 	$(PYTHON) gub/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-update-versions
 
 regtests/ignore:
+	$(info **** regtests/ignore rule)
 	@echo 
 	@echo 
 	@echo "******************************************************"
@@ -123,27 +128,35 @@
 	exit 1
 
 nongit-dirs:
+	$(info **** nongit-dirs rule)
 	mkdir -p versiondb regtests uploads
 
 lilypond-prep: nongit-dirs $(LILYPOND_VERSIONS) regtests/ignore
+	$(info **** lilypond-prep rule)
 
 all: lilypond-prep packages rest
+	$(info **** all rule)
 
 ifeq ($(findstring mingw, $(PLATFORMS)),mingw)
 rest: nsis
 endif
 
 rest: lilypond-installers test doc doc-export print-success
+	$(info **** rest rule)
 
 test: dist-check test-output test-export
+	$(info **** test rule)
 
 doc:
+	$(info **** doc rule)
 	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) $(DOC_PACKAGE)
 
 test-output:
+	$(info **** test-output rule)
 	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) $(TEST_PACKAGE)
 
 print-success:
+	$(info **** print-success rule)
 	python test-lily/upload.py --branch=$(LILYPOND_BRANCH) --url $(LILYPOND_REPO_URL)
 	@echo ""
 	@echo "To upload, run:"
@@ -155,26 +168,33 @@
 webball = uploads/lilypond-$(DIST_VERSION)-$(DOC_BUILDNUMBER).webdoc.tar.bz2
 
 $(docball):
+	$(info **** docball rule)
 #keep this target and just move/repackage lilypond-doc.gup,
 #easier to handle versions.db?
 	$(MAKE) doc
 
 upload-setup-ini:
+	$(info **** upload-setup-ini rule)
 	cd uploads/cygwin && ../../downloads/genini $$(find release -mindepth 1 -maxdepth 2 -type d) > setup.ini
 
 downloads/genini:
+	$(info **** downloads/genini rule)
 	wget --output-document $@ 'http://cygwin.com/cgi-bin/cvsweb.cgi/~checkout~/genini/genini?rev=1.2&content-type=text/plain&cvsroot=cygwin-apps&only_with_tag=HEAD'
 	chmod +x $@
 
 lily-clean:
+	$(info **** lily-clean rule)
 	rm -rf target/$(BUILD_PLATFORM)/*/lilypond-$(LILYPOND_FLATTENED_BRANCH)*
 
 lily-doc-clean:	doc-clean
+	$(info **** lily-doc-clean rule)
 
 clean:
+	$(info **** clean rule)
 	rm -rf $(foreach p, $(PLATFORMS), target/*$(p)* )
 
 realclean:
+	$(info **** realclean rule)
 	rm -rf $(foreach p, $(PLATFORMS), uploads/$(p)/* uploads/$(p)-cross/* target/*$(p)* )
 
 ################################################################
@@ -183,9 +203,11 @@
 tools := $(shell PATH=$(PATH) $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::')
 
 ptools:
+	$(info **** ptools rule)
 	$(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::'
 
 nsis:
+	$(info **** nsis rule)
 	bin/gub tools::nsis
 
 ################################################################
@@ -202,14 +224,18 @@
 # repository.read_file(), I guess.
 LILYPOND_REPO_DIR=downloads/lilypond
 LILYPOND_REPO_BRANCH_DIR=$(LILYPOND_REPO_DIR)/$(dir $(LILYPOND_DIRRED_BRANCH))
-NATIVE_BUILD_COMMITTISH=$(shell cat $(LILYPOND_REPO_BRANCH_DIR)/refs/heads/$(LILYPOND_DIRRED_BRANCH))
+NATIVE_BUILD_COMMITTISH=$(shell cat $(LILYPOND_REPO_DIR)/git/refs/heads/$(LILYPOND_DIRRED_BRANCH))
 
 print:
-	@echo LDB $(LILYPOND_DIRRED_BRANCH)
-	@echo LFB  $(LILYPOND_FLATTENED_BRANCH)
-	@echo $(BUILD_PACKAGE)
-	@echo $(DOC_PACKAGE)
-	@echo $(TEST_PACKAGE)
+	$(info **** print rule)
+	@echo LILYPOND_DIRRED_BRANCH $(LILYPOND_DIRRED_BRANCH)
+	@echo LILYPOND_FLATTENED_BRANCH  $(LILYPOND_FLATTENED_BRANCH)
+	@echo BUILD_PACKAGE $(BUILD_PACKAGE)
+	@echo DOC_PACKAGE $(DOC_PACKAGE)
+	@echo TEST_PACKAGE $(TEST_PACKAGE)
+	@echo NATIVE_BUILD_COMMITTISH $(NATIVE_BUILD_COMMITTISH)
+	@echo LILYPOND_REPO_BRANCH_DIR $(LILYPOND_REPO_BRANCH_DIR)
+	@echo LILYPOND_REPO_DIR $(LILYPOND_REPO_DIR)
 
 DIST_VERSION=$(shell cat $(NATIVE_LILY_BUILD)/out/VERSION)
 DOC_BUILDNUMBER=$(shell $(PYTHON) gub/versiondb.py --platforms=$(PLATFORMS) --build-for=$(DIST_VERSION))
@@ -217,12 +243,15 @@
 SIGNATURE_FUNCTION=uploads/signatures/$(1).$(NATIVE_BUILD_COMMITTISH)
 
 doc-clean:
+	$(info **** doc-clean rule)
 	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) unlocked-doc-clean
 
 test-clean:
+	$(info **** test-clean rule)
 	$(PYTHON) gub/with-lock.py --skip $(TEST_LOCK) $(MAKE) unlocked-test-clean
 
 unlocked-doc-clean:
+	$(info **** unlocked-doc-clean rule)
 	make -C $(NATIVE_TARGET_DIR)/build/lilypond-$(LILYPOND_FLATTENED_BRANCH) \
 		DOCUMENTATION=yes doc-clean
 	rm -rf $(NATIVE_TARGET_DIR)/build/lilypond-$(LILYPOND_FLATTENED_BRANCH)/out/lybook-db
@@ -230,17 +259,21 @@
 	rm -f $(call SIGNATURE_FUNCTION,cached-doc-export)
 
 unlocked-test-clean:
+	$(info **** unlocked-test-clean rule)
 	make -C $(NATIVE_TARGET_DIR)/build/lilypond-$(LILYPOND_FLATTENED_BRANCH) \
 		DOCUMENTATION=yes test-clean
 	rm -f $(call SIGNATURE_FUNCTION,cached-test-output)
 
 cached-dist-check cached-doc-export cached-test-export:
+	$(info **** cached-dist-check cached-doc-export cached-test-export rule)
 	-mkdir -p uploads/signatures
 	if test ! -f  $(call SIGNATURE_FUNCTION,$@) ; then \
+		$(SET_TOOLS_PATH) \
 		$(MAKE) $(subst cached,unlocked,$@) \
 		&& touch $(call SIGNATURE_FUNCTION,$@) ; fi
 
 unlocked-doc-export:
+	$(info **** unlocked-doc-export rule)
 	PYTHONPATH=$(NATIVE_LILY_BUILD)/python/out \
 	$(PYTHON) test-lily/rsync-lily-doc.py --recreate \
 		--version-file=$(NATIVE_LILY_BUILD)/out/VERSION \
@@ -251,21 +284,28 @@
 		--output-distance=$(NATIVE_LILY_SRC)/$(BUILDSCRIPTS)/output-distance.py $(NATIVE_LILY_BUILD)/out-www/offline-root
 
 unlocked-test-export:
+	$(info **** unlocked-test-export rule)
 	mkdir -p uploads/webtest
 	PYTHONPATH=$(NATIVE_LILY_BUILD)/python/out \
-	PATH=$(TOOLS_BIN_DIR):$(PATH) $(PYTHON) test-lily/rsync-test.py \
+	$(SET_TOOLS_PATH) \
+		$(PYTHON) test-lily/rsync-test.py \
 		--version-file=$(NATIVE_LILY_BUILD)/out/VERSION \
 		--output-distance=$(NATIVE_LILY_SRC)/$(BUILDSCRIPTS)/output-distance.py \
 		--test-dir=uploads/webtest
 
 doc-export:
-	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export
+	$(info **** doc-export rule)
+	$(SET_TOOLS_PATH) \
+		$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export
 
 test-export:
-	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-test-export
+	$(info **** test-export rule)
+	$(SET_TOOLS_PATH) \
+		$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-test-export
 
 unlocked-dist-check:
-	$(SET_LOCAL_PATH)\
+	$(info **** unlocked-dist-check rule)
+	$(SET_TOOLS_PATH) \
 		$(PYTHON) test-lily/dist-check.py\
 		--branch=$(LILYPOND_BRANCH) \
 		--url=$(LILYPOND_REPO_URL) \
@@ -273,15 +313,19 @@
 	cp $(NATIVE_LILY_BUILD)/out/lilypond-$(DIST_VERSION).tar.gz uploads
 
 dist-check:
-	$(PYTHON) gub/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \
+	$(info **** dist-check rule)
+	$(SET_TOOLS_PATH) \
+		$(PYTHON) gub/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \
 		$(MAKE) cached-dist-check
 
 print-branches:
+	$(info **** print-branches rule)
 	@echo "--branch=guile=$(GUILE_FLATTENED_BRANCH)"
 	@echo "--branch=lilypond=$(LILYPOND_FLATTENED_BRANCH)"
 	@echo "--branch=denemo=$(DENEMO_FLATTENED_BRANCH)"
 
 lilypond-upload:
+	$(info **** lilypond-upload rule)
 	$(PYTHON) test-lily/upload.py --branch=$(LILYPOND_BRANCH) --url $(LILYPOND_REPO_URL) --execute
 	mv uploads/lilypond-*.test-output.tar.bz2 regtests/
 

--- a/nsis/lilypond-prepost.nsh	Sun May 29 12:49:02 2011 +0200
+++ b/nsis/lilypond-prepost.nsh	Sun Mar 08 21:59:33 2015 +0900
@@ -14,9 +14,6 @@
 	CreateShortCut "$SMPROGRAMS\LilyPond\Music in Mutopia.lnk" \
 		"http://www.mutopiaproject.org" "" \
 		"$INSTDIR\usr\bin\lilypond-windows.exe" 1
-	CreateShortCut "$SMPROGRAMS\LilyPond\Examples.lnk" \
-		"$INSTDIR\usr\share\doc\lilypond\input" "" \
-		"$INSTDIR\usr\bin\lilypond-windows.exe" 1
 	CreateShortCut "$SMPROGRAMS\LilyPond\Uninstall.lnk" \
 		"$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
 
@@ -41,9 +38,6 @@
 
 
 Function registry_lilypond
-	ReadRegStr $R0 HKLM "${ENVIRON}" "PATH"
-	WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$R0;$INSTDIR\usr\bin"
-
 	WriteRegStr HKCR ".ly" "" "LilyPond"
 	WriteRegStr HKCR ".ly" "LilyPond" "LilyPond"
 	WriteRegStr HKCR ".ly" "Content Type" "text/lilypond-source"
@@ -86,7 +80,7 @@
 	ReadRegStr $R0 HKCR "textedit\shell\open\command" ""
 	;;StrCmp $R0 "" 0 exit
 	WriteRegStr HKCR "textedit\shell" "" "open"
-	WriteRegExpandStr HKCR "textedit\shell\open\command" "" '"$INSTDIR\usr\bin\guile.exe" -e main -s "$INSTDIR\usr\bin\lilypond-invoke-editor.scm" "%1"'
+	WriteRegExpandStr HKCR "textedit\shell\open\command" "" '"$INSTDIR\usr\bin\guile.exe" -s "$INSTDIR\usr\bin\lilypond-invoke-editor" "%1"'
 ;;exit:
 FunctionEnd
 
@@ -146,7 +140,7 @@
 	ReadRegStr $R0 HKCR "GUILE\shell\open\command" ""
 	;;StrCmp $R0 "" 0 exit
 	WriteRegStr HKCR "GUILE\shell" "" "open"
-	WriteRegExpandStr HKCR "GUILE\shell\open\command" "" '"$INSTDIR\usr\bin\guile.exe" -e main -s "%1"'
+	WriteRegExpandStr HKCR "GUILE\shell\open\command" "" '"$INSTDIR\usr\bin\guile.exe" -s "%1"'
 exit:
 FunctionEnd
 
@@ -165,15 +159,17 @@
 	ReadRegStr $R0 HKCR "Python\shell\open\command" ""
 	;;StrCmp $R0 "" 0 py_auto_file
 	WriteRegStr HKCR "Python\shell" "" "open"
-	# %1 is the PYTHON command, so must be quoted bo the space
-	WriteRegExpandStr HKCR "Python\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9'
+	# %1 is the PYTHON command, other arguments may contain
+	# filenames, so we quote them all to account for spaces
+	WriteRegExpandStr HKCR "Python\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9"'
 
 ;;py_auto_file:
 	ReadRegStr $R0 HKCR "py_auto_file\shell\open\command" ""
 	;;StrCmp $R0 "" 0 py_end
 	WriteRegStr HKCR "py_auto_file\shell" "" "open"
-	# %1 is the PYTHON command, so must be quoted bo the space
-	WriteRegExpandStr HKCR "py_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9'
+	# %1 is the PYTHON command, other arguments may contain
+	# filenames, so we quote them all to account for spaces
+	WriteRegExpandStr HKCR "py_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9"'
 ;;py_end:	
 FunctionEnd
 

--- a/nsis/lilypond.nsi	Sun May 29 12:49:02 2011 +0200
+++ b/nsis/lilypond.nsi	Sun Mar 08 21:59:33 2015 +0900
@@ -94,7 +94,6 @@
 	CreateDirectory "$INSTDIR\usr\bin"
 
 	Call registry_installer
-;;	Call registry_path
 
 	;; Use tested lilypad for now
 	StrCpy $EDITOR "$INSTDIR\usr\bin\lilypad.exe"
@@ -113,11 +112,6 @@
 	Call postinstall_lilypad
 SectionEnd
 
-Function registry_path
-	ReadRegStr $R0 HKLM "${ENVIRON}" "PATH"
-	WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$R0;$INSTDIR\usr\bin"
-FunctionEnd
-
 ;; Optional section (can be disabled by the user)
 Section "Bundled Python"
     ;; Only make bundled python interpreter the default
@@ -239,21 +233,6 @@
 	DeleteRegKey HKCU "Applications\lilypond-windows.exe"
 	DeleteRegKey HKCU ".ly"
 
-	ReadRegStr $R0 HKLM "${ENVIRON}" "PATH"
-	${UnStrLoc} $0 $R0 "$INSTDIR\usr\bin;" >
-
-path_loop:
-	StrCmp $0 "" path_done
-	StrLen $1 "$INSTDIR\usr\bin;"
-	IntOp $2 $0 + $1
-	StrCpy $3 $R0 $0 0
-	StrCpy $4 $R0 10000 $2
-	WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$3$4"
-	ReadRegStr $R0 HKLM "${ENVIRON}" "PATH"
-	${UnStrLoc} $0 $R0 "$INSTDIR\usr\bin;" >
-	StrCmp $0 "" path_done path_loop
-
-path_done:
 	;; Remove files and uninstaller
 	;; Try only to delete ${PRETTY_NAME} (and not user) stuff