[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:/lunar-linux/moonbase-other

[stumbles]

commit 49cb807416328f22e53522c605edfe0404be157a
Author: stumbles <stumbles at lunar-linux.org>
Date: Fri, 21 Dec 2012 01:28:30 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/49cb807416328f22e53522c605edfe0404be157a

Merge branch 'master' of github.com:/lunar-linux/moonbase-other
---
  crypto/libtasn1/DETAILS | +3/-3     
  games/ufoai/BUILD       | +15/-17   
  games/ufoai/CONFIGURE   | +1/-0     
  games/ufoai/DEPENDS     | +2/-1     
  games/ufoai/DETAILS     | +6/-7     
  5 files changed

--- a/crypto/libtasn1/DETAILS
+++ b/crypto/libtasn1/DETAILS
@@ -1,11 +1,11 @@
           MODULE=libtasn1
-         VERSION=3.1
+         VERSION=2.14
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=ftp://ftp.gnu.org/pub/gnu/$MODULE
-      SOURCE_VFY=sha1:40a651c82e8e842e0550b85502bd550c16ec626b
+      SOURCE_VFY=sha1:22f9e0b15f870c8e03ac9cc1ead969d4d84eb931
         WEB_SITE=http://www.gnu.org/software/libtasn1
          ENTERED=20020212
-         UPDATED=20121127
+         UPDATED=20120929
            SHORT="ASN.1 library for gnutls"
 
 cat << EOF
--- a/games/ufoai/BUILD
+++ b/games/ufoai/BUILD
@@ -1,26 +1,24 @@
 (
 
-  OPTS+=" --disable-uforadiant  "  &&
-
-  ./configure  --build=$BUILD                 \
-               --prefix=/usr                  \
-               --sysconfdir=/etc              \
-               --localstatedir=/var/games     \
-               --infodir=/usr/share/info      \
-               --mandir=/usr/share/man        \
+  ./configure  --prefix=/usr                  \
                --bindir=/usr/games            \
-               --datadir=/usr/share/games     \
-               --localedir=/usr/share/locale  \
+               --libdir=/usr/lib              \
+               --datadir=/usr/share/games/ufoai \
+               --localedir=/usr/share/games/ufoai/base/i18n  \
                $OPTS                         &&
 
-  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
-
-  default_make
+  default_make &&
 
-#  for FILE in $SOURCE_DIRECTORY/base/*; do
-#     install -m644 $FILE /usr/share/games/ufoai/base/
-#  done
+  install -m644 debian/ufoai.desktop debian/ufoded.desktop /usr/share/applications &&
+  install -m644 debian/ufoai.xpm debian/ufoded.xpm /usr/share/pixmaps &&
+  install -m644 debian/ufo.6 debian/ufoded.6 /usr/share/man/man6 &&
 
-#  cp -fR $SOURCE_DIRECTORY/base /usr/share/games/ufoai
+  if [[ "$RADIANT" != "y" ]]; then
+    rm -f /usr/games/uforadiant
+  else
+    install -m644 debian/uforadiant.desktop /usr/share/applications &&
+    install -m644 debian/uforadiant.xpm /usr/share/pixmaps &&
+    install -m644 debian/uforadiant.xpm /usr/share/man/man6
+  fi
 
 ) > $C_FIFO 2>&1
--- /dev/null
+++ b/games/ufoai/CONFIGURE
@@ -0,0 +1 @@
+mquery RADIANT "Build Map Editor?" n "--enable-uforadiant" "--disable-uforadiant"
--- a/games/ufoai/DEPENDS
+++ b/games/ufoai/DEPENDS
@@ -1,8 +1,9 @@
 depends  %GLX
+depends  SDL
 depends  SDL_ttf
 depends  SDL_mixer
 depends  libvorbis
+depends  zlib
 depends  curl
 depends  libpng
 depends  %JPEG
-
--- a/games/ufoai/DETAILS
+++ b/games/ufoai/DETAILS
@@ -1,20 +1,19 @@
           MODULE=ufoai
-         VERSION=2.3.1
+         VERSION=2.4
           SOURCE=$MODULE-$VERSION-source.tar.bz2
          SOURCE1=$MODULE-$VERSION-data.tar
-         SOURCE2=$MODULE-2.3-data.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
       SOURCE_URL=$SFORGE_URL/$MODULE
      SOURCE1_URL=$SFORGE_URL/$MODULE
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:f339e9399eae6ef4661ad8b9d4f68205904810d3
-     SOURCE1_VFY=sha1:a322c3bb92b29a0265567e84b1d3287078cfae91
-     SOURCE2_VFY=sha1:4b47badff096fdbf2227a3ce9655d0fa1be98ac2
+      SOURCE_VFY=sha1:153ba796131f00fe98f96e56888376afee039aa5
+     SOURCE1_VFY=sha1:2998c979ee597a1473c3277f8db14821e907999f
         WEB_SITE=http://ufoai.sf.net
          ENTERED=20080115
-         UPDATED=20101205
+         UPDATED=20121220
       MAINTAINER=florin at lunar-linux.org
            SHORT="A squad-based tactical strategy game"
+# this would duplicate 900MB of data and the module compiles quite fast anyway...
+ARCHIVE=off
 
 cat << EOF
 UFO: ALIEN INVASION is a squad-based tactical strategy game in the