[arch-commits] Commit in drscheme/repos (4 files)

[Eric Belanger]

    Date: Tuesday, August 19, 2008 @ 23:47:47
  Author: eric
Revision: 9860

Merged revisions 5656-9859 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/drscheme/trunk

........
  r9859 | eric | 2008-08-19 23:47:35 -0400 (Tue, 19 Aug 2008) | 2 lines
  
  upgpkg: drscheme 4.1-1
      Upstream update, removed old patch
........

Modified:
  drscheme/repos/extra-x86_64/	(properties)
  drscheme/repos/extra-x86_64/ChangeLog
  drscheme/repos/extra-x86_64/PKGBUILD
Deleted:
  drscheme/repos/extra-x86_64/paths-fix.patch

-----------------+
 ChangeLog       |    5 +++++
 PKGBUILD        |   14 ++++++--------
 paths-fix.patch |   49 -------------------------------------------------
 3 files changed, 11 insertions(+), 57 deletions(-)


Property changes on: drscheme/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /drscheme/trunk:1-5655
   + /drscheme/trunk:1-9859

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-08-20 03:47:35 UTC (rev 9859)
+++ extra-x86_64/ChangeLog	2008-08-20 03:47:47 UTC (rev 9860)
@@ -1,3 +1,8 @@
+2008-08-19  Eric Belanger  <eric at archlinux.org>
+
+	* drscheme 4.1-1
+	* Upstream update
+
 2008-07-13  Eric Belanger  <eric at archlinux.org>
 
 	* drscheme 4.0.2-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-20 03:47:35 UTC (rev 9859)
+++ extra-x86_64/PKGBUILD	2008-08-20 03:47:47 UTC (rev 9860)
@@ -3,7 +3,7 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=drscheme
-pkgver=4.0.2
+pkgver=4.1
 pkgrel=1
 pkgdesc="PLT Scheme Environment"
 arch=('i686' 'x86_64')
@@ -12,18 +12,16 @@
 depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg' 'mesa' 'openssl>=0.9.8h' 'libxaw' 'libxmu' 'libxft')
 options=('!makeflags' 'force')
 install=${pkgname}.install
-source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop nonstandard-install.patch paths-fix.patch)
-md5sums=('a5abe7c45bb2af0bf537e49a5f2e2a68' '41ba9c74aa541308aa6f67b262387c6c'\
-         'd2cc43a6e8496e2940af80b55ec04d8f' '9ae64fb6eb8513f5954abb0fa7ac817a')
-sha1sums=('4e1c8f2b689d6711d60acaa59750ee40b08900b3'
+source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop nonstandard-install.patch)
+md5sums=('d94e1b4be6650d3576725add851c751a' '41ba9c74aa541308aa6f67b262387c6c'\
+         'd2cc43a6e8496e2940af80b55ec04d8f')
+sha1sums=('12b0de3ea1255a40c7c184105a6272d4bd4d8c1b'
           '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5'
-          '4e394162f2dc4f59e752b97a05b4673871d25f81'
-          '4d62f1ea0a57382fb2fae1336421698783a49ef5')
+          '4e394162f2dc4f59e752b97a05b4673871d25f81')
 
 build() {
   cd ${srcdir}/plt-${pkgver}
   patch -p1 < ../nonstandard-install.patch || return 1
-  patch -p1 < ../paths-fix.patch || return 1
   cd src
   ./configure --prefix=/usr --enable-noopt  || return 1
   make || return 1

Deleted: extra-x86_64/paths-fix.patch
===================================================================
--- extra-x86_64/paths-fix.patch	2008-08-20 03:47:35 UTC (rev 9859)
+++ extra-x86_64/paths-fix.patch	2008-08-20 03:47:47 UTC (rev 9860)
@@ -1,49 +0,0 @@
-Index: drscheme-4.0.1/collects/setup/unixstyle-install.ss
-===================================================================
---- drscheme-4.0.1.orig/collects/setup/unixstyle-install.ss
-+++ drscheme-4.0.1/collects/setup/unixstyle-install.ss
-@@ -272,14 +272,15 @@
-      (define (ftime file)
-        (and (file-exists? file) (file-or-directory-modify-seconds file)))
-      (let* ([src (cpath "config.ss")]
--            [zo  (cpath "compiled" "config.zo")]
--            [dep (cpath "compiled" "config.dep")]
-+            [zo  (cpath "compiled" "config_ss.zo")]
-+            ;; [dep (cpath "compiled" "config_ss.dep")] ; not needed
-             [src-time (ftime src)]
-             [zo-time  (ftime zo)])
-        (printf "Rewriting configuration file at: ~a...\n" src)
--       (parameterize ([current-library-collection-paths ; for configtab.ss
-+       (parameterize ([current-namespace (make-base-namespace)] ; to compile
-+                      [current-library-collection-paths ; for configtab.ss
-                        (list collectsdir)])
--         (with-output-to-file (cpath "config.ss") #:exists 'truncate/replace
-+         (with-output-to-file src #:exists 'truncate/replace
-            (lambda ()
-              (printf ";; automatically generated by unixstyle-install\n")
-              (printf "(module config (lib \"configtab.ss\" \"setup\")\n")
-@@ -293,14 +294,17 @@
-          ;; recompile & set times as if nothing happened (don't remove .dep)
-          ;; this requires the file to look the same on all compilations, and
-          ;; configtab.ss generates bindings unhygienically for that reason.
--         (unless (and (pair? compile?) (not (car compile?)))
-+         (when compile?
-            (when src-time (file-or-directory-modify-seconds src src-time))
--           (when zo-time
--             (with-input-from-file src
--               (lambda ()
--                 (with-output-to-file zo #:exists 'truncate/replace
--                   (lambda () (write (compile (read-syntax)))))))
--             (file-or-directory-modify-seconds zo zo-time)))))]))
-+           (if (not zo-time)
-+             (printf "WARNING: skipping recompilation, no zo file at ~a\n" zo)
-+             (begin
-+               (printf "Recompiling to ~a...\n" zo)
-+               (with-input-from-file src
-+                 (lambda ()
-+                   (with-output-to-file zo #:exists 'truncate/replace
-+                     (lambda () (write (compile (read-syntax)))))))
-+               (file-or-directory-modify-seconds zo zo-time))))))]))
- 
- ;; creates a directory including its ancestors when needed
- (define (make-dir* dir)