r1688 - crux-2.2/ports/opt/xxdiff - crux-commits

4 Aug 2006

Author: jw
Date: 2006-08-04 16:47:34 +0200 (Fri, 04 Aug 2006)
New Revision: 1688

Removed:
   crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff
Modified:
   crux-2.2/ports/opt/xxdiff/.footprint
   crux-2.2/ports/opt/xxdiff/.md5sum
   crux-2.2/ports/opt/xxdiff/Pkgfile
   crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff
Log:
xxdiff: update to 3.2


Modified: crux-2.2/ports/opt/xxdiff/.footprint
===================================================================

--- crux-2.2/ports/opt/xxdiff/.footprint	2006-08-04 08:07:31 UTC (rev 1687)
+++ crux-2.2/ports/opt/xxdiff/.footprint	2006-08-04 14:47:34 UTC (rev 1688)
@@ -1,4 +1,3 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/xxdiff
--rwxr-xr-x	root/root	usr/bin/xxdiff-cvs-diff

Modified: crux-2.2/ports/opt/xxdiff/.md5sum
===================================================================
--- crux-2.2/ports/opt/xxdiff/.md5sum	2006-08-04 08:07:31 UTC (rev 1687)
+++ crux-2.2/ports/opt/xxdiff/.md5sum	2006-08-04 14:47:34 UTC (rev 1688)
@@ -1,4 +1,2 @@
-9008dcb04592b4fb8e85e6bd1dcd3b0a  tmake-1.8.tar.gz
-ead4e429e8a084eda46ecbf4d47d4512  xxdiff-3.1.tar.gz
-2bd3f8443b47e213e6c252506d6cf03a  xxdiff-cvs-fix.diff
-fa55e55e4d155a87b5d2a5be39606e32  xxdiff-nostyleforce.diff
+301ff399a1e4be8b68c38c3e27c0b1ad  xxdiff-3.2.tar.bz2
+8bf72bb5fa9013e5b35ae2ee494c8f2c  xxdiff-nostyleforce.diff

Modified: crux-2.2/ports/opt/xxdiff/Pkgfile
===================================================================
--- crux-2.2/ports/opt/xxdiff/Pkgfile	2006-08-04 08:07:31 UTC (rev 1687)
+++ crux-2.2/ports/opt/xxdiff/Pkgfile	2006-08-04 14:47:34 UTC (rev 1688)
@@ -5,23 +5,19 @@
 # Depends:     qt3 
 
 name=xxdiff
-version=3.1
+version=3.2
 release=1
-source=(http://dl.sourceforge.net/sourceforge/${name}/${name}-${version}.tar.gz\
-    ftp://ftp.trolltech.com/freebies/tmake/tmake-1.8.tar.gz \
-    xxdiff-nostyleforce.diff
-    xxdiff-cvs-fix.diff) 
+source=(http://dl.sf.net/sourceforge/${name}/${name}-${version}.tar.bz2
+        xxdiff-nostyleforce.diff)
 
+
 build() {
-    export TMAKEPATH=$SRC/tmake-1.8/lib/linux-g++
     export QTDIR=${QTDIR:=/usr/share/qt}
 
     cd $name-$version/src
-    patch -p2 < ../../xxdiff-nostyleforce.diff
-    patch ../bin/xxdiff-cvs-diff $SRC/xxdiff-cvs-fix.diff
+    patch -p2 < $SRC/xxdiff-nostyleforce.diff
 
-    $SRC/tmake-1.8/bin/tmake xxdiff.pro > Makefile
+    make -f Makefile.bootstrap makefile
     make
-    install -m 755 -d $PKG/usr/bin
-    install -m 755 ../bin/xxdiff{,-cvs-diff} $PKG/usr/bin
+    install -m 755 -D ../bin/xxdiff $PKG/usr/bin/xxdiff
 }

Deleted: crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff
===================================================================
--- crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff	2006-08-04 08:07:31 UTC (rev 1687)
+++ crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff	2006-08-04 14:47:34 UTC (rev 1688)
@@ -1,11 +0,0 @@
---- xxdiff-cvs-diff.old	2004-10-29 10:40:21.000000000 +0200
-+++ xxdiff-cvs-diff	2004-10-29 21:32:00.103934168 +0200
-@@ -115,7 +115,7 @@
-         # a temporary file.
-         tmpf = NamedTemporaryFile(prefix=tmppfx)
-         cin, cout = os.popen2(
--            'patch --reverse --output "%s"' % tmpf.name, 'rw')
-+            'patch -p0 --reverse --output "%s"' % tmpf.name, 'rw')
-         cin.write('Index: %s\n' % filename)
-         cin.write(patch)
-         cin.close()

Modified: crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff
===================================================================
--- crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff	2006-08-04 08:07:31 UTC (rev 1687)
+++ crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff	2006-08-04 14:47:34 UTC (rev 1688)
@@ -1,6 +1,6 @@
---- xxdiff-3.0.2/src/app.cpp.orig	2004-10-28 10:41:20.782609600 +0200
-+++ xxdiff-3.0.2/src/app.cpp	2004-10-28 10:42:00.925506952 +0200
-@@ -261,22 +261,6 @@
+--- xxdiff-3.2/src/app.cpp.orig	2006-08-04 16:40:25.144936920 +0200
++++ xxdiff-3.2/src/app.cpp	2006-08-04 16:40:46.151743400 +0200
+@@ -265,22 +265,6 @@
     // Read in the resources and create resources object.
     _resources = buildResources();
  
@@ -20,6 +20,6 @@
 -   }
 -#endif
 -
-    // Read in the file names.
-    QString filenames[3];
-    QString displayFilenames[3];
+    if ( _cmdline._promptForFiles ) {
+       promptForFiles( _cmdline );
+    }

    

r1688 - crux-2.2/ports/opt/xxdiff

crux＠crux.nu

tags

participants (1)