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

[stumbles]

commit 0ef6efeed03e4789d241a222aaa91f19c1a9825f
Author: stumbles <stumbles at lunar-linux.org>
Date: Sat, 01 Jun 2013 16:49:44 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/0ef6efeed03e4789d241a222aaa91f19c1a9825f

Merge branch 'master' of github.com:/lunar-linux/moonbase-other
---
  cd/cdrtools/BUILD   | +14/-23   
  devel/smake/BUILD   | +4/-6     
  devel/smake/DETAILS | +3/-3     
  3 files changed, 21 insertions(+), 32 deletions(-)

--- a/cd/cdrtools/BUILD
+++ b/cd/cdrtools/BUILD
@@ -1,26 +1,17 @@
-(
+sedit "s:/bin/rm:rm:; s:/bin/mv:mv:" RULES/rules.prg
 
-  # this will make it use its own headers
-  # not the last linned kernel headers
-  sedit "s?/usr/src/linux/include?/usr/include?g" DEFAULTS/Defaults.linux  &&
+# this will make it use its own headers
+# not the last linned kernel headers
+sedit "s?/usr/src/linux/include?/usr/include?g" DEFAULTS/Defaults.linux  &&
 
-  if module_installed smake ; then
-    THISMAKE=smake
-  else
-    THISMAKE=./Gmake.linux
-  fi                                     &&
-  $THISMAKE INS_BASE=/usr DEFINSUSR=root  \
-            DEFINSGRP=root               &&
-  prepare_install                        &&
-  $THISMAKE INS_BASE=/usr DEFINSUSR=root  \
-            DEFINSGRP=root MANDIR=man install  &&
+smake INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &&
+prepare_install                        &&
+smake INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man install  &&
 
-  # cdrkit compatibility:
-  install -m755 cdda2wav/{pitchplay,readmult} /usr/bin  &&
-  ln -sf /usr/bin/mkisofs  /usr/bin/genisoimage  &&
-  ln -sf /usr/bin/cdda2wav /usr/bin/icedax  &&
-  ln -sf /usr/bin/readcd   /usr/bin/readom  &&
-  ln -sf /usr/bin/cdrecord /usr/bin/wodim   &&
-  ln -sf /usr/sbin/rscsi /usr/sbin/netscsid
-
-) > $C_FIFO 2>&1
+# cdrkit compatibility:
+install -m755 cdda2wav/{pitchplay,readmult} /usr/bin  &&
+ln -sf /usr/bin/mkisofs  /usr/bin/genisoimage  &&
+ln -sf /usr/bin/cdda2wav /usr/bin/icedax  &&
+ln -sf /usr/bin/readcd   /usr/bin/readom  &&
+ln -sf /usr/bin/cdrecord /usr/bin/wodim   &&
+ln -sf /usr/sbin/rscsi /usr/sbin/netscsid
--- a/devel/smake/BUILD
+++ b/devel/smake/BUILD
@@ -1,7 +1,5 @@
-(
+sedit "s:/bin/rm:rm:; s:/bin/mv:mv:" RULES/rules.prg &&
 
-  make INS_BASE=/usr MANDIR=share/man  &&
-  prepare_install                      &&
-  make INS_BASE=/usr MANDIR=share/man install
-
-) > $C_FIFO 2>&1
+make INS_BASE=/usr MANDIR=share/man  &&
+prepare_install                      &&
+make INS_BASE=/usr MANDIR=share/man install
--- a/devel/smake/DETAILS
+++ b/devel/smake/DETAILS
@@ -1,11 +1,11 @@
           MODULE=smake
-         VERSION=1.2.1
+         VERSION=1.2.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=ftp://ftp.berlios.de/pub/smake
-      SOURCE_VFY=sha1:e38ef6bd9023d8dbb28e009ca7776306bdb99e6a
+      SOURCE_VFY=sha1:e5bacf4d092835feeb11eeb1c788c5fafeb22dcf
         WEB_SITE=http://cdrecord.berlios.de/old/private/smake.html
          ENTERED=20020926
-         UPDATED=20100420
+         UPDATED=20130601
       MAINTAINER=tchan at lunar-linux.org
            SHORT="Joerg Schilling's multi-platform make engine"