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

[Eric Bélanger]

    Date: Wednesday, November 12, 2008 @ 00:50:52
  Author: eric
Revision: 18949

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

........
  r18947 | eric | 2008-11-11 23:18:22 -0500 (Tue, 11 Nov 2008) | 2 lines
  
  upgpkg: drscheme 4.1.2-1
      Upstream update, removed old patch
........

Modified:
  drscheme/repos/extra-i686/	(properties)
  drscheme/repos/extra-i686/ChangeLog
  drscheme/repos/extra-i686/PKGBUILD
  drscheme/repos/extra-i686/drscheme.install
Deleted:
  drscheme/repos/extra-i686/nonstandard-install.patch

---------------------------+
 ChangeLog                 |    6 +++++
 PKGBUILD                  |   18 +++++----------
 drscheme.install          |    1 
 nonstandard-install.patch |   52 --------------------------------------------
 4 files changed, 13 insertions(+), 64 deletions(-)


Property changes on: drscheme/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /drscheme/trunk:1-18705
   + /drscheme/trunk:1-18948

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-11-12 04:18:53 UTC (rev 18948)
+++ extra-i686/ChangeLog	2008-11-12 05:50:52 UTC (rev 18949)
@@ -1,4 +1,10 @@
+2008-11-11  Eric Belanger  <eric at archlinux.org>
+
+	* drscheme 4.1.2-1
+	* Upstream update
+
 2008-11-08  Jan de Groot <jgc at archlinux.org>
+	
 	* drscheme 4.1.1-2
 	* Rebuild for libxaw
 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-12 04:18:53 UTC (rev 18948)
+++ extra-i686/PKGBUILD	2008-11-12 05:50:52 UTC (rev 18949)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=drscheme
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="PLT Scheme Environment"
 arch=('i686' 'x86_64')
 url="http://www.drscheme.org/"
@@ -12,17 +12,13 @@
 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)
-md5sums=('8fd0917311246ab0ef65237f06cce436' '41ba9c74aa541308aa6f67b262387c6c'\
-         'd2cc43a6e8496e2940af80b55ec04d8f')
-sha1sums=('c6e9cdbf7c0e1a1911a36a46f63ce22594fa282d'
-          '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5'
-          '4e394162f2dc4f59e752b97a05b4673871d25f81')
+source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop)
+md5sums=('a38a3d4725fa2691f8175cb38dd9d04a' '41ba9c74aa541308aa6f67b262387c6c')
+sha1sums=('62efd7047e9e5fe90492487a02583236464ddbbc'
+          '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5')
 
 build() {
-  cd ${srcdir}/plt-${pkgver}
-  patch -p1 < ../nonstandard-install.patch || return 1
-  cd src
+  cd ${srcdir}/plt-${pkgver}/src
   ./configure --prefix=/usr --enable-noopt  || return 1
   make || return 1
   make  DESTDIR=${pkgdir} install  || return 1

Modified: extra-i686/drscheme.install
===================================================================
--- extra-i686/drscheme.install	2008-11-12 04:18:53 UTC (rev 18948)
+++ extra-i686/drscheme.install	2008-11-12 05:50:52 UTC (rev 18949)
@@ -1,5 +1,4 @@
 post_install() {
-    echo "Updating desktop and mime database..."
     update-desktop-database -q
 }
 

Deleted: extra-i686/nonstandard-install.patch
===================================================================
--- extra-i686/nonstandard-install.patch	2008-11-12 04:18:53 UTC (rev 18948)
+++ extra-i686/nonstandard-install.patch	2008-11-12 05:50:52 UTC (rev 18949)
@@ -1,52 +0,0 @@
-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: