From e881752c39d455a249731a4e81e64d86f50afc34 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Fri, 17 Jul 2015 15:16:07 +0300
Subject: gnu packages: Clean up synopses and descriptions.

* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
  gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bittorrent.scm,
  gnu/packages/code.scm, gnu/packages/compression.scm,
  gnu/packages/databases.scm, gnu/packages/enchant.scm,
  gnu/packages/firmware.scm, gnu/packages/fonts.scm,
  gnu/packages/freedesktop.scm, gnu/packages/games.scm, gnu/packages/gd.scm,
  gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gsasl.scm,
  gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm,
  gnu/packages/haskell.scm, gnu/packages/language.scm,
  gnu/packages/lesstif.scm, gnu/packages/libreoffice.scm,
  gnu/packages/linux.scm, gnu/packages/llvm.scm, gnu/packages/maths.scm,
  gnu/packages/mcrypt.scm, gnu/packages/mit-krb5.scm, gnu/packages/mp3.scm,
  gnu/packages/ncdu.scm, gnu/packages/networking.scm, gnu/packages/ntp.scm,
  gnu/packages/ocaml.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
  gnu/packages/perl.scm, gnu/packages/pretty-print.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/python.scm,
  gnu/packages/rdesktop.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm,
  gnu/packages/slang.scm, gnu/packages/slim.scm, gnu/packages/telephony.scm,
  gnu/packages/tls.scm, gnu/packages/tmux.scm, gnu/packages/tre.scm,
  gnu/packages/unrtf.scm, gnu/packages/version-control.scm,
  gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wget.scm,
  gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xiph.scm:
  Fix typos.  Trim long lines.  Add missing periods in the end of sentences.
  Use double spaces between sentences.  Remove trailing whitespaces.
---
 gnu/packages/gl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9bb1134d39..a6935d4189 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -130,7 +130,7 @@ the X-Consortium license.")
     (description
      "FTGL is a font rendering library for OpenGL applications.  Supported
 rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
-Polygon meshes, and Extruded polygon meshes")
+Polygon meshes, and Extruded polygon meshes.")
     (license l:x11)))
 
 (define-public s2tc
-- 
cgit 1.4.1


From 0e215f49fe359ca7e79993ade68c9b084c4161e9 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 18 Jul 2015 22:59:46 -0400
Subject: gnu: guile-opengl: Install compiled modules in the correct place.

* gnu/packages/gl.scm (guile-opengl): Install compiled modules in the same
  directory as the source modules.
---
 gnu/packages/gl.scm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index a6935d4189..e8003f88a3 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -409,22 +409,27 @@ extension functionality is exposed in a single header file.")
               ("glu" ,glu)
               ("freeglut" ,freeglut)))
     (arguments
-     '(#:phases (alist-cons-before
-                 'build 'patch-dynamic-link
-                 (lambda* (#:key inputs outputs #:allow-other-keys)
-                   (define (dynamic-link-substitute file lib input)
-                     (substitute* file
-                       (("dynamic-link \"lib([a-zA-Z]+)\"" _ lib)
-                        (string-append "dynamic-link \""
-                                       (assoc-ref inputs input)
-                                       "/lib/lib" lib "\""))))
-                   ;; Replace dynamic-link calls for libGL, libGLU, and
-                   ;; libglut with absolute paths to the store.
-                   (dynamic-link-substitute "glx/runtime.scm" "GL" "mesa")
-                   (dynamic-link-substitute "glu/runtime.scm" "GLU" "glu")
-                   (dynamic-link-substitute "glut/runtime.scm" "glut"
-                                            "freeglut"))
-                 %standard-phases)))
+     '(#:phases (modify-phases %standard-phases
+                 (add-after 'configure 'patch-makefile
+                   (lambda _
+                     ;; Install compiled Guile files in the expected place.
+                     (substitute* '("Makefile")
+                       (("^godir = .*$")
+                        "godir = $(moddir)\n"))))
+                 (add-before 'build 'patch-dynamic-link
+                   (lambda* (#:key inputs outputs #:allow-other-keys)
+                     (define (dynamic-link-substitute file lib input)
+                       (substitute* file
+                         (("dynamic-link \"lib([a-zA-Z]+)\"" _ lib)
+                          (string-append "dynamic-link \""
+                                         (assoc-ref inputs input)
+                                         "/lib/lib" lib "\""))))
+                     ;; Replace dynamic-link calls for libGL, libGLU, and
+                     ;; libglut with absolute paths to the store.
+                     (dynamic-link-substitute "glx/runtime.scm" "GL" "mesa")
+                     (dynamic-link-substitute "glu/runtime.scm" "GLU" "glu")
+                     (dynamic-link-substitute "glut/runtime.scm" "glut"
+                                              "freeglut"))))))
     (home-page "http://gnu.org/s/guile-opengl")
     (synopsis "Guile binding for the OpenGL graphics API")
     (description
-- 
cgit 1.4.1