[SM-Commit] GIT changes to master z-rejected grimoire by Arjan Bouter (858054f4fa165d79a620bebd13a3f893949b7dc8)

Arjan Bouter scm at sourcemage.org
Mon Dec 17 23:13:50 EST 2007


GIT changes to master z-rejected grimoire by Arjan Bouter <abouter at sourcemage.org>:

 z-games/americasarmy/HISTORY                 |    3 +++
 z-games/americasarmy/desktop/armyops.desktop |    8 ++++++++
 z-games/enemy-territory/HISTORY              |    3 +++
 z-games/enemy-territory/desktop/et.desktop   |    8 ++++++++
 z-windowmanagers/ion3/BUILD                  |   19 -------------------
 z-windowmanagers/ion3/CONFIGURE              |    2 +-
 z-windowmanagers/ion3/DETAILS                |    2 +-
 z-windowmanagers/ion3/HISTORY                |    2 ++
 z-windowmanagers/ion3/PRE_BUILD              |    6 ++++++
 9 files changed, 32 insertions(+), 21 deletions(-)

New commits:
commit 858054f4fa165d79a620bebd13a3f893949b7dc8
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    americasarmy: added desktop file. fixes bug #13366

commit 2158afd9dce92cadcc86cf9cf78bacc47a3fe6ed
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    enemyteritory: added HISTORY entry

commit 8cf65e0438a0a9f445db2525eb629014b7a653ff
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    enemyteritory: added desktop file. bug #13367

commit c994f43eb8005dfee989ec95fcfbab34511b2585
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    americasarmy: added desktop file. bug #13366

commit 14bbba1ae23e0ce20f16568b86c57acdc44afa6d
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    ion3: version bumped and spell fixed

diff --git a/z-games/americasarmy/HISTORY b/z-games/americasarmy/HISTORY
index 2a2d9a5..21868af 100644
--- a/z-games/americasarmy/HISTORY
+++ b/z-games/americasarmy/HISTORY
@@ -1,3 +1,6 @@
+2007-12-18 Arjan Bouter <abouter at sourcemage.org>
+	* desktop/armyops.desktop: added, bug #13366
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/z-games/americasarmy/desktop/armyops.desktop b/z-games/americasarmy/desktop/armyops.desktop
new file mode 100644
index 0000000..dd3c841
--- /dev/null
+++ b/z-games/americasarmy/desktop/armyops.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=America's Army
+Exec=/usr/share/games/americasarmy/armyops
+Icon=/usr/share/games/americasarmy/ArmyOps.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;Fun;
+
diff --git a/z-games/enemy-territory/HISTORY b/z-games/enemy-territory/HISTORY
index b73b3f5..fdb5459 100644
--- a/z-games/enemy-territory/HISTORY
+++ b/z-games/enemy-territory/HISTORY
@@ -1,3 +1,6 @@
+2007-12-18 Arjan Bouter <abouter at sourcemage.org>
+	* desktop/et.desktop: added
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/z-games/enemy-territory/desktop/et.desktop b/z-games/enemy-territory/desktop/et.desktop
new file mode 100644
index 0000000..dc3cd59
--- /dev/null
+++ b/z-games/enemy-territory/desktop/et.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Wolfenstein - Enemy Territory
+Comment=
+Exec=/usr/games/et
+Icon=/usr/share/games/enemy-territory/ET.xpm
+Terminal=0
+Type=Application
+Categories=Application;Game;Fun;
diff --git a/z-windowmanagers/ion3/BUILD b/z-windowmanagers/ion3/BUILD
index eec72fb..8f58e6d 100755
--- a/z-windowmanagers/ion3/BUILD
+++ b/z-windowmanagers/ion3/BUILD
@@ -1,20 +1 @@
-cd  "$SOURCE_DIRECTORY/build/ac"  &&
-autoreconf                        &&
-
-OPTS="$ION3_XINERAMA $ION3_LOCALE $OPTS --build=${BUILD}"  &&
-
-if [[ $CROSS_INSTALL == on ]]
-then
-  OPTS="$OPTS --host=${HOST}"
-fi  &&
-
-./configure  --prefix=${INSTALL_ROOT}/usr              \
-             --sysconfdir=${INSTALL_ROOT}/etc          \
-             --localstatedir=${INSTALL_ROOT}/var       \
-             --mandir=${INSTALL_ROOT}/usr/share/man    \
-             --infodir=${INSTALL_ROOT}/usr/share/info  \
-             $OPTS                                     &&
-
-cd  "$SOURCE_DIRECTORY"  &&
-
 make
diff --git a/z-windowmanagers/ion3/CONFIGURE b/z-windowmanagers/ion3/CONFIGURE
index fa4470f..b77ab09 100755
--- a/z-windowmanagers/ion3/CONFIGURE
+++ b/z-windowmanagers/ion3/CONFIGURE
@@ -1,6 +1,6 @@
 # Standard rejected warnings.
 #
-source $GRIMOIRE/REJECTED_MSG
+source $GRIMOIRE/REJECTED_MSG                        &&
 
 config_query_option  ION3_XINERAMA                   \
                      "Enable Xinerama support?"  y   \
diff --git a/z-windowmanagers/ion3/DETAILS b/z-windowmanagers/ion3/DETAILS
index c76d753..4b6a733 100755
--- a/z-windowmanagers/ion3/DETAILS
+++ b/z-windowmanagers/ion3/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/ion-$VERSION"
         WEB_SITE=http://modeemi.cs.tut.fi/~tuomov/ion/
          ENTERED=20020127
       LICENSE[0]=LGPL
-          REJECT="licensing issues"
+          REJECT="ion3 has licensing issues."
         KEYWORDS="windowmanagers"
            SHORT="A tiling tabbed window manager."
 cat << EOF
diff --git a/z-windowmanagers/ion3/HISTORY b/z-windowmanagers/ion3/HISTORY
index f039b75..7294387 100644
--- a/z-windowmanagers/ion3/HISTORY
+++ b/z-windowmanagers/ion3/HISTORY
@@ -3,6 +3,8 @@
 	           added REJECT reason
 	* CONFIGURE: added reject message
 	* spell moved from windowmanagers to z-windowmanagers
+	* DEPENDS: cleaned up
+	* PRE_BUILD: added
 
 2007-12-05 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: this version was LGPL
diff --git a/z-windowmanagers/ion3/PRE_BUILD b/z-windowmanagers/ion3/PRE_BUILD
new file mode 100755
index 0000000..a3ce9e4
--- /dev/null
+++ b/z-windowmanagers/ion3/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+sedit 's#^PREFIX=/usr/local#PREFIX=/usr#' system.mk            &&
+sedit 's#^LUA_DIR=/usr/local#LUA_DIR=/usr#' system.mk    &&
+sedit 's#^PREFIX=/usr/local#PREFIX=/usr#' build/system-inc.mk  &&
+sedit 's#/usr/local#/usr#' libextl/libextl-mkexports.in



More information about the SM-Commit mailing list