[57583] trunk/dports/devel/odcctools

[toby at macports.org]

Revision: 57583
          http://trac.macports.org/changeset/57583
Author:   toby at macports.org
Date:     2009-09-13 11:29:57 -0700 (Sun, 13 Sep 2009)
Log Message:
-----------
simplify excessive fix for #21204, should also resolve #21346

Modified Paths:
--------------
    trunk/dports/devel/odcctools/Portfile
    trunk/dports/devel/odcctools/files/patch-extract.sh

Modified: trunk/dports/devel/odcctools/Portfile
===================================================================
--- trunk/dports/devel/odcctools/Portfile	2009-09-13 17:34:40 UTC (rev 57582)
+++ trunk/dports/devel/odcctools/Portfile	2009-09-13 18:29:57 UTC (rev 57583)
@@ -26,6 +26,12 @@
 
 worksrcdir      ${name}/${name}
 
+patchfiles      patch-extract.sh
+
+pre-extract {
+    system "patch -p0 -d ${workpath}/${name} -i ${filespath}/patch-extract.sh"
+}
+
 set od_extract  ""
 extract {
     system "cd ${workpath}/${name} && ./extract.sh $od_extract"
@@ -49,13 +55,4 @@
     set od_extract "--nosdk"
 }
 
-if {"darwin" == ${os.platform}} {
-if {${os.major} < 8 || ${os.major} > 9} {
-    depends_build-append    port:gnutar
-    pre-extract {
-        system "cd ${workpath}/${name} && patch -p0 < ${filespath}/patch-extract.sh"
-    }
-}
-}
-
 livecheck.type  none

Modified: trunk/dports/devel/odcctools/files/patch-extract.sh
===================================================================
--- trunk/dports/devel/odcctools/files/patch-extract.sh	2009-09-13 17:34:40 UTC (rev 57582)
+++ trunk/dports/devel/odcctools/files/patch-extract.sh	2009-09-13 18:29:57 UTC (rev 57583)
@@ -1,50 +1,15 @@
---- extract.sh.orig	2007-05-28 09:32:38.000000000 -0400
-+++ extract.sh	2007-05-28 09:35:10.000000000 -0400
-@@ -44,7 +44,7 @@
+--- extract.sh.orig	2009-09-13 11:24:01.000000000 -0700
++++ extract.sh	2009-09-13 11:24:14.000000000 -0700
+@@ -44,11 +44,7 @@
  
  
  
 -if [ "`tar --help | grep -- --strip-components 2> /dev/null`" ]; then
-+if [ "`gnutar --help | grep -- --strip-components 2> /dev/null`" ]; then
-     TARSTRIP=--strip-components
- else
-     TARSTRIP=--strip-path
-@@ -62,9 +62,9 @@
- fi
+-    TARSTRIP=--strip-components
+-else
+-    TARSTRIP=--strip-path
+-fi
++TARSTRIP=--strip-components
  
- mkdir -p ${DISTDIR}
--tar ${TARSTRIP}=1 -jxf ${CCTOOLSDISTFILE} -C ${DISTDIR}
-+gnutar ${TARSTRIP}=1 -jxf ${CCTOOLSDISTFILE} -C ${DISTDIR}
- mkdir -p ${DISTDIR}/ld64
--tar ${TARSTRIP}=1 -jxf ${LD64DISTFILE} -C ${DISTDIR}/ld64
-+gnutar ${TARSTRIP}=1 -jxf ${LD64DISTFILE} -C ${DISTDIR}/ld64
- find ${DISTDIR}/ld64/doc/ -type f -exec cp "{}" ${DISTDIR}/man \;
+ PATCHFILESDIR=${TOPSRCDIR}/patches
  
- # Clean the source a bit
-@@ -81,7 +81,7 @@
- 
-     mv ${DISTDIR}/include/mach/machine.h ${DISTDIR}/include/mach/machine.h.new;
-     for i in mach architecture i386 libkern; do
--	tar cf - -C "$SDKROOT/usr/include" $i | tar xf - -C ${DISTDIR}/include
-+	gnutar cf - -C "$SDKROOT/usr/include" $i | gnutar xf - -C ${DISTDIR}/include
-     done
-     mv ${DISTDIR}/include/mach/machine.h.new ${DISTDIR}/include/mach/machine.h;
- 
-@@ -135,7 +135,7 @@
- set -e
- 
- echo "Adding new files"
--tar cf - --exclude=CVS --exclude=.svn -C ${ADDEDFILESDIR} . | tar xvf - -C ${DISTDIR}
-+gnutar cf - --exclude=CVS --exclude=.svn -C ${ADDEDFILESDIR} . | gnutar xvf - -C ${DISTDIR}
- 
- echo "Deleting cruft"
- find ${DISTDIR} -name Makefile -exec rm -f "{}" \;
-@@ -151,7 +151,7 @@
- if [ $MAKEDISTFILE -eq 1 ]; then
-     DATE=$(date +%Y%m%d)
-     mv ${DISTDIR} ${DISTDIR}-$DATE
--    tar jcf ${DISTDIR}-$DATE.tar.bz2 ${DISTDIR}-$DATE
-+    gnutar jcf ${DISTDIR}-$DATE.tar.bz2 ${DISTDIR}-$DATE
- fi
- 
- exit 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090913/8e7ab4a0/attachment.html>