[arch-commits] Commit in drscheme/trunk (6 files)
Eric Belanger
eric at archlinux.org
Sat Jul 19 03:27:09 UTC 2008
Date: Friday, July 18, 2008 @ 23:27:09
Author: eric
Revision: 5655
upgpkg: drscheme 4.0.2-1
Upstream update, Added patches to remove build directory path hard-coded in executables, Updated openssl versioned dependency, Added ChangeLog, removed old files from svn
Added:
drscheme/trunk/ChangeLog
drscheme/trunk/nonstandard-install.patch
drscheme/trunk/paths-fix.patch
Modified:
drscheme/trunk/PKGBUILD
Deleted:
drscheme/trunk/drscheme-370-DESTDIR-mred3m.patch
drscheme/trunk/drscheme.profile
-----------------------------------+
ChangeLog | 8 +++++
PKGBUILD | 42 ++++++++++++++---------------
drscheme-370-DESTDIR-mred3m.patch | 13 ---------
drscheme.profile | 1
nonstandard-install.patch | 52 ++++++++++++++++++++++++++++++++++++
paths-fix.patch | 49 +++++++++++++++++++++++++++++++++
6 files changed, 130 insertions(+), 35 deletions(-)
Added: ChangeLog
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2008-07-19 03:27:09 UTC (rev 5655)
@@ -0,0 +1,8 @@
+2008-07-13 Eric Belanger <eric at archlinux.org>
+
+ * drscheme 4.0.2-1
+ * Upstream update
+ * Added patches (nonstandard-install.patch, paths-fix.patch)
+ to remove build directory path hard-coded in executables
+ * Updated openssl versioned dependency
+ * Added ChangeLog
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-19 03:13:06 UTC (rev 5654)
+++ PKGBUILD 2008-07-19 03:27:09 UTC (rev 5655)
@@ -1,33 +1,33 @@
# $Id$
-# Maintainer: kevin <kevin at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor: John Proctor <jproctor at prium.net>
pkgname=drscheme
-pkgver=372
+pkgver=4.0.2
pkgrel=1
pkgdesc="PLT Scheme Environment"
+arch=('i686' 'x86_64')
url="http://www.drscheme.org/"
-arch=('i686' 'x86_64')
license=('LGPL')
-depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg' 'mesa' 'openssl<=0.9.8'
- 'libxaw' 'libxmu' 'libxft')
-options=('!makeflags')
-install=$pkgname.install
-source=(http://download.plt-scheme.org/bundles/$pkgver/plt/plt-$pkgver-src-unix.tgz
- drscheme.desktop)
-md5sums=('751217f63bc64423a29a05423f917af8'
- '41ba9c74aa541308aa6f67b262387c6c')
+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'
+ '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5'
+ '4e394162f2dc4f59e752b97a05b4673871d25f81'
+ '4d62f1ea0a57382fb2fae1336421698783a49ef5')
build() {
- cd $startdir/src/plt-$pkgver/src
- ./configure --prefix=/usr --enable-noopt
+ 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
- make DESTDIR=$startdir/pkg install
- install -Dm644 $startdir/src/plt-$pkgver/collects/icons/plt.xpm\
- $startdir/pkg/usr/share/pixmaps/drscheme.xpm
- install -Dm644 $startdir/src/drscheme.desktop\
- $startdir/pkg/usr/share/applications/drscheme.desktop
- chown -R root:root $startdir/pkg/usr/share/plt
+ make DESTDIR=${pkgdir} install || return 1
+ install -D -m644 ../collects/icons/plt.xpm ${pkgdir}/usr/share/pixmaps/drscheme.xpm || return 1
+ install -D -m644 ${srcdir}/drscheme.desktop ${pkgdir}/usr/share/applications/drscheme.desktop || return 1
}
-
-# vim:set ts=2 sw=2 et:
Deleted: drscheme-370-DESTDIR-mred3m.patch
===================================================================
--- drscheme-370-DESTDIR-mred3m.patch 2008-07-19 03:13:06 UTC (rev 5654)
+++ drscheme-370-DESTDIR-mred3m.patch 2008-07-19 03:27:09 UTC (rev 5655)
@@ -1,13 +0,0 @@
---- src/mred/Makefile.in 2007-04-09 08:34:00.000000000 +0000
-+++ src/mred/Makefile.in.new 2007-07-03 19:30:42.000000000 +0000
-@@ -318,8 +318,8 @@
-
- install-wx_xt-3m:
- $(MAKE) @MRLIBINSTALL at -3m-wx_xt
-- cd ..; $(ICP) mred/mred at MMM@ "$(bindir)/mred at MMM_INSTALLED@"
-- $(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(bindir)/mred at MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@
-+ cd ..; $(ICP) mred/mred at MMM@ "$(DESTDIR)$(bindir)/mred at MMM_INSTALLED@"
-+ $(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred at MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@
-
- install-wx_xt-3m-final:
- cd .
Deleted: drscheme.profile
===================================================================
--- drscheme.profile 2008-07-19 03:13:06 UTC (rev 5654)
+++ drscheme.profile 2008-07-19 03:27:09 UTC (rev 5655)
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/plt/bin
Added: nonstandard-install.patch
===================================================================
--- nonstandard-install.patch (rev 0)
+++ nonstandard-install.patch 2008-07-19 03:27:09 UTC (rev 5655)
@@ -0,0 +1,52 @@
+Index: drscheme-4.0/src/Makefile.in
+===================================================================
+--- drscheme-4.0.orig/src/Makefile.in
++++ drscheme-4.0/src/Makefile.in
+@@ -81,7 +81,8 @@ no-run:
+ cd .
+
+ copytree-run:
+- mzscheme/mzscheme at CGC@ -u \
++ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}$(DESTDIR)$(libdir)" \
++ mzscheme/mzscheme at CGC@ -u \
+ "$(srcdir)/../collects/setup/unixstyle-install.ss" \
+ make-install-copytree "$(srcdir)/.." \
+ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@"
+@@ -94,6 +95,7 @@ install-no-post-collects:
+
+ fix-paths:
+ if [ "$(DESTDIR)" != "" ]; then \
++ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}$(DESTDIR)$(libdir)" \
+ mzscheme/mzscheme at CGC@ -u \
+ "$(srcdir)/../collects/setup/unixstyle-install.ss" \
+ make-install-destdir-fix "$(srcdir)/.." \
+@@ -110,7 +112,8 @@ install-3m-common:
+
+ install-3m:
+ $(MAKE) install-3m-common
+- mzscheme/mzscheme at MMM@ $(SETUP_ARGS)
++ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}$(DESTDIR)$(libdir)" \
++ mzscheme/mzscheme at MMM@ $(SETUP_ARGS)
+ $(MAKE) install-common-last
+
+ plain-install-3m:
+@@ -133,7 +136,8 @@ install-cgc-common:
+
+ install-cgc:
+ $(MAKE) install-cgc-common
+- mzscheme/mzscheme at CGC@ $(SETUP_ARGS)
++ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}$(DESTDIR)$(libdir)" \
++ mzscheme/mzscheme at CGC@ $(SETUP_ARGS)
+ $(MAKE) install-common-last
+
+ plain-install-cgc:
+@@ -156,7 +160,8 @@ install-both-common:
+
+ install-both:
+ $(MAKE) install-both-common
+- mzscheme/mzscheme at MAIN_VARIANT@ $(SETUP_ARGS)
++ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}$(DESTDIR)$(libdir)" \
++ mzscheme/mzscheme at MAIN_VARIANT@ $(SETUP_ARGS)
+ $(MAKE) install-common-last
+
+ plain-install-both:
Added: paths-fix.patch
===================================================================
--- paths-fix.patch (rev 0)
+++ paths-fix.patch 2008-07-19 03:27:09 UTC (rev 5655)
@@ -0,0 +1,49 @@
+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)
More information about the arch-commits
mailing list