[PATCH] gnu: Add xboing

[PATCH] gnu: Add xboing

[John Darrington]

* gnu/packages/games.scm (xboing): New variable.
---
 gnu/packages/games.scm |   54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1a911b7..33b45b5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,6 +24,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
@@ -321,3 +322,56 @@ and Makruk.  Several lesser-known variants are also supported.  It presents a
 fully interactive graphical interface and it can load and save games in the
 Portable Game Notation.")
     (license gpl3+)))
+
+
+(define-public xboing
+  (package
+    (name "xboing")
+    (version "2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.techrescue.org/xboing/xboing"
+			   version ".tar.gz"))
+       (sha256
+        (base32 "16m2si8wmshxpifk861vhpqviqxgcg8bxj6wfw8hpnm4r2w9q0b7"))))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (alist-replace
+        'configure 
+	(lambda* (#:key outputs #:allow-other-keys)
+
+          (substitute* "Imakefile" 
+            (("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11")
+             (string-append "XPMINCLUDE = -I" (assoc-ref %build-inputs "libxpm")
+                            "/include/X11")))
+          
+          (substitute* "Imakefile" 
+            (("XBOING_DIR = \\.") "XBOING_DIR=$(PROJECTROOT)"))
+
+          ;; FIXME: HIGH_SCORE_FILE should be set to somewhere writeable
+          
+           (zero? (system* "xmkmf" "-a" 
+                           (string-append "-DProjectRoot=" 
+                                          (assoc-ref outputs "out")))))
+        (alist-replace 'install
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (and
+                          (zero? (system* "make" "install.man"))
+                          (zero? (system* "make" "install"))))
+                       %standard-phases))))
+    (inputs `(("libx11" ,libx11)
+	      ("libxext" ,libxext)
+	      ("libxpm" ,libxpm)))
+    (native-inputs `(("imake" ,imake)
+		     ("inetutils" ,inetutils)
+		     ("makedepend" ,makedepend)))
+    (build-system gnu-build-system)
+    (home-page "http://www.techrescue.org/xboing")
+    (synopsis "Ball and paddle game")
+    (description "XBoing is a blockout type game where you have a paddle which
+you control to bounce a ball around the game zone destroying blocks with a
+proton ball. Each block carries a different point value. The more blocks you
+destroy, the better your score. The person with the highest score wins.")
+    (license x11-style)))
-- 
1.7.10.4

Re: [PATCH] gnu: Add xboing

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/games.scm (xboing): New variable.

[...]

> +    (inputs `(("libx11" ,libx11)
> +	      ("libxext" ,libxext)
> +	      ("libxpm" ,libxpm)))
> +    (native-inputs `(("imake" ,imake)
> +		     ("inetutils" ,inetutils)
> +		     ("makedepend" ,makedepend)))

Please align opening parenthesis and use only spaces, no tabs (for Emacs
23 and later, .dir-locals.el normally sets it up.)

> +    (license x11-style)))

‘x11-style’ is a procedure, so it should be:

  (x11-style URI [COMMENT])

Make sure it’s not really ‘x11’ or ‘expat’.

TIA,
Ludo’.

Re: [PATCH] gnu: Add xboing

[John Darrington]

On Mon, Oct 13, 2014 at 02:27:48PM +0200, Ludovic Court??s wrote:
     John Darrington <jmd@gnu.org> skribis:
     
     > * gnu/packages/games.scm (xboing): New variable.

     [...]
     
     > +    (inputs `(("libx11" ,libx11)
     > +	      ("libxext" ,libxext)
     > +	      ("libxpm" ,libxpm)))
     > +    (native-inputs `(("imake" ,imake)
     > +		     ("inetutils" ,inetutils)
     > +		     ("makedepend" ,makedepend)))
     
     Please align opening parenthesis and use only spaces, no tabs (for Emacs
     23 and later, .dir-locals.el normally sets it up.)

This was formatted by emacs using indent-region.  Shouldn't that do the job?
loading .dir-locals.el results in an error for me.
     
     > +    (license x11-style)))
     
     ???x11-style??? is a procedure, so it should be:
     
       (x11-style URI [COMMENT])
     
     Make sure it???s not really ???x11??? or ???expat???.

It is neither of those, although similar.  The trouble is, I don't think that 
there is a URI for the license.  It is contained in the tarball.
     
J'
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

Re: [PATCH] gnu: Add xboing

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> On Mon, Oct 13, 2014 at 02:27:48PM +0200, Ludovic Court??s wrote:
>      John Darrington <jmd@gnu.org> skribis:
>      
>      > * gnu/packages/games.scm (xboing): New variable.
>
>      [...]
>      
>      > +    (inputs `(("libx11" ,libx11)
>      > +	      ("libxext" ,libxext)
>      > +	      ("libxpm" ,libxpm)))
>      > +    (native-inputs `(("imake" ,imake)
>      > +		     ("inetutils" ,inetutils)
>      > +		     ("makedepend" ,makedepend)))
>      
>      Please align opening parenthesis and use only spaces, no tabs (for Emacs
>      23 and later, .dir-locals.el normally sets it up.)
>
> This was formatted by emacs using indent-region.  Shouldn't that do the job?
> loading .dir-locals.el results in an error for me.

Emacs 23+ loads it automatically.  Otherwise, drop:

  (setq indent-tabs-mode nil)

somewhere in ~/.emacs.

>      > +    (license x11-style)))
>      
>      ???x11-style??? is a procedure, so it should be:
>      
>        (x11-style URI [COMMENT])
>      
>      Make sure it???s not really ???x11??? or ???expat???.
>
> It is neither of those, although similar.  The trouble is, I don't think that 
> there is a URI for the license.  It is contained in the tarball.

See other uses: it’s fine to use file://COPYING, say, as the URI to the
license, if the only copy is within the tarball.

Also, it’s even better if you can add a comment above saying what’s
different from the X11 license text.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add xboing

[John Darrington]

On Mon, Oct 13, 2014 at 03:54:50PM +0200, Ludovic Court??s wrote:
     
     Emacs 23+ loads it automatically.  Otherwise, drop:
     
       (setq indent-tabs-mode nil)
     
     somewhere in ~/.emacs.

Thanks!

But it still tends to format
  (arguments
     `(#:tests? #f
       #:phases

as

  (arguments
     `(#:tests? #f
                #:phases




     > It is neither of those, although similar.  The trouble is, I don't think that 
     > there is a URI for the license.  It is contained in the tarball.
     
     See other uses: it???s fine to use file://COPYING, say, as the URI to the
     license, if the only copy is within the tarball.

ok.
     
     Also, it???s even better if you can add a comment above saying what???s
     different from the X11 license text.

I will try.  But it is difficult to say what is different without just giving the output
from diff.


J'

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

Re: [PATCH] gnu: Add xboing

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> On Mon, Oct 13, 2014 at 03:54:50PM +0200, Ludovic Court??s wrote:
>      
>      Emacs 23+ loads it automatically.  Otherwise, drop:
>      
>        (setq indent-tabs-mode nil)
>      
>      somewhere in ~/.emacs.
>
> Thanks!
>
> But it still tends to format
>   (arguments
>      `(#:tests? #f
>        #:phases
>
> as
>
>   (arguments
>      `(#:tests? #f
>                 #:phases
>

Yes, this one is a case that Emacs gets wrong (the only one, I think.)

>      Also, it???s even better if you can add a comment above saying what???s
>      different from the X11 license text.
>
> I will try.  But it is difficult to say what is different without just giving the output
> from diff.

Do what you think is best.

Ludo’.

[PATCH] gnu: Add xboing

[John Darrington]

* gnu/packages/games.scm (xboing): New variable.
---
 gnu/packages/games.scm |   54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1a911b7..e7868af 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,6 +24,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
@@ -321,3 +322,56 @@ and Makruk.  Several lesser-known variants are also supported.  It presents a
 fully interactive graphical interface and it can load and save games in the
 Portable Game Notation.")
     (license gpl3+)))
+
+
+(define-public xboing
+  (package
+    (name "xboing")
+    (version "2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.techrescue.org/xboing/xboing"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "16m2si8wmshxpifk861vhpqviqxgcg8bxj6wfw8hpnm4r2w9q0b7"))))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (alist-replace
+        'configure 
+        (lambda* (#:key outputs #:allow-other-keys)
+          
+          (substitute* "Imakefile" 
+            (("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11")
+             (string-append "XPMINCLUDE = -I" (assoc-ref %build-inputs "libxpm")
+                            "/include/X11")))
+          
+          (substitute* "Imakefile" 
+            (("XBOING_DIR = \\.") "XBOING_DIR=$(PROJECTROOT)"))
+          
+          ;; FIXME: HIGH_SCORE_FILE should be set to somewhere writeable
+          
+          (zero? (system* "xmkmf" "-a" 
+                          (string-append "-DProjectRoot=" 
+                                         (assoc-ref outputs "out")))))
+        (alist-replace 'install
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (and
+                          (zero? (system* "make" "install.man"))
+                          (zero? (system* "make" "install"))))
+                       %standard-phases))))
+    (inputs `(("libx11" ,libx11)
+              ("libxext" ,libxext)
+              ("libxpm" ,libxpm)))
+    (native-inputs `(("imake" ,imake)
+                     ("inetutils" ,inetutils)
+                     ("makedepend" ,makedepend)))
+    (build-system gnu-build-system)
+    (home-page "http://www.techrescue.org/xboing")
+    (synopsis "Ball and paddle game")
+    (description "XBoing is a blockout type game where you have a paddle which
+you control to bounce a ball around the game zone destroying blocks with a
+proton ball. Each block carries a different point value. The more blocks you
+destroy, the better your score. The person with the highest score wins.")
+    (license (x11-style "file://COPYING" "Very similar to the X11 licence."))))
-- 
1.7.10.4

Re: [PATCH] gnu: Add xboing

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/games.scm (xboing): New variable.

OK, thanks.

Ludo’.