[Lunar-commits] <moonbase-other> Merge remote-tracking branch 'cavalier/cdrecord'

[v4hn]

commit b9ed29cb23a410d3b2551141c0b0c948b3a1c780
Author: v4hn <me at v4hn.de>
Date: Sun, 06 Oct 2013 05:02:33 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/b9ed29cb23a410d3b2551141c0b0c948b3a1c780

Merge remote-tracking branch 'cavalier/cdrecord'

aliases
---
  aliases                | +1/-1     
  cd/cdrtools/BUILD      | +15/-14   
  cd/cdrtools/CONFIGURE  | +2/-0     
  cd/cdrtools/DEPENDS    | +1/-1     
  cd/cdrtools/DETAILS    | +1/-0     
  cd/cdrtools/PRE_BUILD  | +7/-0     
  cd/dirsplit/CONFLICTS  | +1/-0     
  cd/dvdrtools/BUILD     | +10/-0    
  cd/dvdrtools/CONFIGURE | +1/-0     
  zbeta/cdrkit/BUILD     | +13/-8    
  zbeta/cdrkit/CONFIGURE | +1/-0     
  zbeta/cdrkit/CONFLICTS | +1/-0     
  12 files changed, 54 insertions(+), 24 deletions(-)

--- a/aliases
+++ b/aliases
@@ -13,4 +13,4 @@
 %JPEG:libjpeg-turbo jpeg
 %GNUPG:gnupg gnupg2
 %MPLAYER:MPlayer mplayer2
-%CDR:cdrtools dvdrtools cdrkit
+%CDR:cdrtools cdrkit dvdrtools
--- a/cd/cdrtools/BUILD
+++ b/cd/cdrtools/BUILD
@@ -1,17 +1,18 @@
-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  &&
-
-smake INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &&
+if  `module_installed smake`; then
+  THISMAKE=smake
+else
+  THISMAKE=make
+fi  &&
+$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &&
 prepare_install                        &&
-smake INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man install  &&
+$THISMAKE 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
+if [ "$COMPAT" != n ] ; then
+  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
+fi
--- a/cd/cdrtools/CONFIGURE
+++ b/cd/cdrtools/CONFIGURE
@@ -1 +1,3 @@
 mquery IDE_SCSI "Will you need ide-scsi?" n
+
+mquery COMPAT   "Enable compatibility with cdrkit" y
--- a/cd/cdrtools/DEPENDS
+++ b/cd/cdrtools/DEPENDS
@@ -1,4 +1,4 @@
 depends acl
-depends smake
 
+optional_depends  "smake"  ""  ""  "for Schilly makefiles"
 optional_depends  "dirsplit" ""  ""  "for cdrkit compatibility and optimal file layout on discs"
--- a/cd/cdrtools/DETAILS
+++ b/cd/cdrtools/DETAILS
@@ -7,6 +7,7 @@
          ENTERED=20010922
          UPDATED=20130806
            SHORT="Creates home-burned CDs with a CD-R/CD-RW recorder"
+PSAFE=no
 
 cat << EOF
 cdrtools, formerly Cdrecord creates home-burned CDs with a CD-R/CD-RW
--- /dev/null
+++ b/cd/cdrtools/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build  &&
+
+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
--- /dev/null
+++ b/cd/dirsplit/CONFLICTS
@@ -0,0 +1 @@
+conflicts cdrkit
--- /dev/null
+++ b/cd/dvdrtools/BUILD
@@ -0,0 +1,10 @@
+default_build  &&
+
+# cdrkit compatibility:
+if [ "$COMPAT" = y ] ; then
+  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/dvdrecord /usr/bin/wodim   &&
+  ln -sf /usr/bin/dvdrecord /usr/bin/cdrecord
+fi
--- /dev/null
+++ b/cd/dvdrtools/CONFIGURE
@@ -0,0 +1 @@
+mquery COMPAT "Enable compatibility with cdrkit" n
--- a/zbeta/cdrkit/BUILD
+++ b/zbeta/cdrkit/BUILD
@@ -1,10 +1,15 @@
-(
+cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+-DCMAKE_BUILD_TYPE=RELEASE             \
+-Wno-dev                               \
+$OPTS                                 &&
 
-  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-        -DCMAKE_BUILD_TYPE=RELEASE             \
-        -Wno-dev                               \
-        $OPTS                                 &&
+default_make  &&
 
-  default_make
-
-) > $C_FIFO 2>&1
+# cdrtools compatibility:
+if [ "$COMPAT" != n ] ; then
+  ln -sf /usr/bin/genisoimage /usr/bin/mkisofs   &&
+  ln -sf /usr/bin/icedax      /usr/bin/cdda2wav  &&
+  ln -sf /usr/bin/readom      /usr/bin/readcd    &&
+  ln -sf /usr/bin/wodim       /usr/bin/cdrecord  &&
+  ln -sf /usr/sbin/netscsid   /usr/sbin/rscsi
+fi
--- /dev/null
+++ b/zbeta/cdrkit/CONFIGURE
@@ -0,0 +1 @@
+mquery COMPAT "Enable compatibility with cdrtools" y
--- a/zbeta/cdrkit/CONFLICTS
+++ b/zbeta/cdrkit/CONFLICTS
@@ -1,2 +1,3 @@
 conflicts cdrtools
 conflicts dvdrtools
+conflicts dirsplit