[SM-Commit] GIT changes to master grimoire by Ismael Luceno (8fc23b9ccfedaee4a9272cc09cb5cf24fba60c00)

Ismael Luceno scm at sourcemage.org
Mon Sep 19 21:47:56 EDT 2011


GIT changes to master grimoire by Ismael Luceno <ismael at sourcemage.org>:

 x11/freenx/DEPENDS   |    2 +-
 x11/freenx/DETAILS   |    4 ++--
 x11/freenx/HISTORY   |    3 +++
 x11/freenx/PREPARE   |    8 ++------
 x11/freenx/PRE_BUILD |    2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 8fc23b9ccfedaee4a9272cc09cb5cf24fba60c00
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    freenx: Use prepare_select_branch

diff --git a/x11/freenx/DEPENDS b/x11/freenx/DEPENDS
index 237ca63..a332dbf 100755
--- a/x11/freenx/DEPENDS
+++ b/x11/freenx/DEPENDS
@@ -1,5 +1,5 @@
 depends  nx  &&
 
-if  [  "$FREENX_CVS"  ==  "y"  ];  then
+if  [[  "$FREENX_BRANCH"  ==  "scm"  ]];  then
   depends  CVS
 fi
diff --git a/x11/freenx/DETAILS b/x11/freenx/DETAILS
index 765fff6..e2a41d4 100755
--- a/x11/freenx/DETAILS
+++ b/x11/freenx/DETAILS
@@ -1,6 +1,6 @@
            SPELL=freenx
-if  [  "$FREENX_CVS"  ==  "y"  ];  then
-  if  [  "$FREENX_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [[  "$FREENX_BRANCH"  ==  "scm"  ];  then
+  if  [[  "$FREENX_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=cvs
diff --git a/x11/freenx/HISTORY b/x11/freenx/HISTORY
index 7752fba..b23f492 100644
--- a/x11/freenx/HISTORY
+++ b/x11/freenx/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
 2009-12-09 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* FINAL, INSTALL: fixing persistent_add use to make spell cast
 
diff --git a/x11/freenx/PREPARE b/x11/freenx/PREPARE
index dcef9f4..98d27e4 100755
--- a/x11/freenx/PREPARE
+++ b/x11/freenx/PREPARE
@@ -1,6 +1,2 @@
-config_query  FREENX_CVS  "Build CVS version?"  y  &&
-
-if  [  "$FREENX_CVS"  ==  "y"  ];  then
-  config_query  FREENX_CVS_AUTOUPDATE                              \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/x11/freenx/PRE_BUILD b/x11/freenx/PRE_BUILD
index a0912bc..7993eab 100755
--- a/x11/freenx/PRE_BUILD
+++ b/x11/freenx/PRE_BUILD
@@ -1,6 +1,6 @@
 default_pre_build &&
 
-if  [  "$FREENX_CVS"  ==  "y"  ];  then
+if  [  "$FREENX_BRANCH"  ==  "scm"  ];  then
   cd  $SOURCE_DIRECTORY                              &&
   patch  -p0  <  $SPELL_DIRECTORY/netcat.diff        &&
   patch  -p0  <  $SPELL_DIRECTORY/nx150backend.diff


More information about the SM-Commit mailing list