[Lunar-commits] <moonbase-other> Merge branch 'cdrtools'

[v4hn]

commit f063ca9971b2cda90a3f3fed4e9e628096dd2431
Author: v4hn <me at v4hn.de>
Date: Sat, 18 Jan 2014 10:11:44 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/f063ca9971b2cda90a3f3fed4e9e628096dd2431

Merge branch 'cdrtools'
---
  cd/cdrtools/BUILD     | +4/-7     
  cd/cdrtools/DEPENDS   | +0/-1     
  cd/cdrtools/DETAILS   | +3/-3     
  cd/cdrtools/PRE_BUILD | +13/-1    
  4 files changed, 20 insertions(+), 12 deletions(-)

--- a/cd/cdrtools/BUILD
+++ b/cd/cdrtools/BUILD
@@ -1,11 +1,8 @@
-if  `module_installed smake`; then
-  THISMAKE=smake
-else
-  THISMAKE=make
-fi  &&
-$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &&
+make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root LINKMODE="dynamic" \
+  CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" &&
 prepare_install                        &&
-$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man install  &&
+make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man  LINKMODE="dynamic" \
+  CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" install  &&
 
 # cdrkit compatibility:
 if [ "$COMPAT" != n ] ; then
--- a/cd/cdrtools/DEPENDS
+++ b/cd/cdrtools/DEPENDS
@@ -1,4 +1,3 @@
 depends acl
 
-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
@@ -1,11 +1,11 @@
           MODULE=cdrtools
          VERSION=3.01
-          SOURCE=$MODULE-${VERSION}a17.tar.bz2
+          SOURCE=$MODULE-${VERSION}a21.tar.bz2
       SOURCE_URL=ftp://ftp.berlios.de/pub/cdrecord/alpha
-      SOURCE_VFY=sha1:68354dea383471b782eaff07ff8169c5045da68b
+      SOURCE_VFY=sha1:aad7ffe84514bc5dd19d12a98c6ac4c520c86843
         WEB_SITE=http://cdrecord.berlios.de/old/private/cdrecord.html
          ENTERED=20010922
-         UPDATED=20130806
+         UPDATED=20140118
            SHORT="Creates home-burned CDs with a CD-R/CD-RW recorder"
 PSAFE=no
 
--- a/cd/cdrtools/PRE_BUILD
+++ b/cd/cdrtools/PRE_BUILD
@@ -1,7 +1,19 @@
 default_pre_build  &&
 
+
+# Remove profiled make files
+find $SOURCE_DIRECTORY -name "*_p.mk" | xargs rm -f &&
+
+# Fix hardcoded paths
+sedit "s;opt/schily;usr;" $(find $SOURCE_DIRECTORY -type f -name \*.[0-9ch] -exec grep -l "opt/schily" "{}" "+") &&
+
+# We don't need static libaries
+sedit "s;include\t\t.*rules.lib;;" $(find $SOURCE_DIRECTORY -type f -exec grep -l "^include.\+rules\.lib" "{}" "+") &&
+
 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
+sedit "s;/usr/src/linux/include;;g; \
+       s;/opt/schily;/usr;g; \
+       s;bin;root;g" DEFAULTS/Defaults.linux