[92179] trunk/dports/sysutils/FDclone

takanori at macports.org takanori at macports.org
Sat Apr 21 01:36:23 PDT 2012


Revision: 92179
          https://trac.macports.org/changeset/92179
Author:   takanori at macports.org
Date:     2012-04-21 01:36:21 -0700 (Sat, 21 Apr 2012)
Log Message:
-----------
FDclone: version bump to 3.00k

Modified Paths:
--------------
    trunk/dports/sysutils/FDclone/Portfile
    trunk/dports/sysutils/FDclone/files/patch-archive.c.diff

Removed Paths:
-------------
    trunk/dports/sysutils/FDclone/files/patch-tree.c.diff

Modified: trunk/dports/sysutils/FDclone/Portfile
===================================================================
--- trunk/dports/sysutils/FDclone/Portfile	2012-04-21 08:24:41 UTC (rev 92178)
+++ trunk/dports/sysutils/FDclone/Portfile	2012-04-21 08:36:21 UTC (rev 92179)
@@ -3,8 +3,7 @@
 PortSystem      1.0
 
 name            FDclone
-version         3.00j
-revision        1
+version         3.00k
 categories      sysutils shells
 maintainers     takanori openmaintainer
 description     File & Directory Maintenance Tool
@@ -17,11 +16,11 @@
                 ftp://ftp.unixusers.net/src/fdclone/
 distname        FD-${version}
 patchfiles      patch-Makefile.in.diff \
+                patch-archive.c.diff \
                 patch-custom.c.diff \
                 patch-fd.h.diff \
-                patch-file.c.diff \
-                patch-tree.c.diff
-checksums       rmd160 b976c68e6facc01bf331959be4b831206c05fef7
+                patch-file.c.diff
+checksums       rmd160 613f9a7d961c7dc422297dbb2ad6bc78611875e5
 
 depends_lib     port:ncurses
 
@@ -44,13 +43,6 @@
     xinstall -m 644 ${worksrcpath}/_fdrc ${destroot}${prefix}/etc/fd2rc.dist
 }
 
-default_variants +xz
-
-variant xz description {Experimental support for XZ Utils} {
-    patchfiles-append   patch-archive.c.diff
-    depends_run-append  path:bin/xz:xz
-}
-
 variant engmes description {Print messages in English} {
     patchfiles-append   engmes.diff
 }

Modified: trunk/dports/sysutils/FDclone/files/patch-archive.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-archive.c.diff	2012-04-21 08:24:41 UTC (rev 92178)
+++ trunk/dports/sysutils/FDclone/files/patch-archive.c.diff	2012-04-21 08:36:21 UTC (rev 92179)
@@ -1,40 +1,35 @@
---- archive.c.orig	2010-09-25 00:00:00.000000000 +0900
-+++ archive.c	2012-03-09 14:05:45.000000000 +0900
-@@ -208,11 +208,15 @@
+--- archive.c.orig	2012-04-21 00:00:00.000000000 +0900
++++ archive.c	2012-04-21 12:03:55.000000000 +0900
+@@ -210,12 +210,14 @@
  	{"*.tar.Z",	"zcat %C|tar tvf -",	PM_TAR, 0},
  	{"*.tar.gz",	"gzip -cd %C|tar tvf -",	PM_TAR, 0},
  	{"*.tar.bz2",	"bzip2 -cd %C|tar tvf -",	PM_TAR, 0},
 +	{"*.tar.lzma",	"lzcat %C|tar tvf -",	PM_TAR, 0},
-+	{"*.tar.xz",	"xzcat %C|tar tvf -",	PM_TAR, 0},
+ 	{"*.tar.xz",	"xz -cd %C|tar tvf -",	PM_TAR, 0},
  # ifndef	CYGWIN
  	{"*.taZ",	"zcat %C|tar tvf -",	PM_TAR, 0},
  # endif
  	{"*.taz",	"gzip -cd %C|tar tvf -",	PM_TAR, 0},
  	{"*.tgz",	"gzip -cd %C|tar tvf -",	PM_TAR, 0},
 +	{"*.tlz",	"lzcat %C|tar tvf -",	PM_TAR, 0},
-+	{"*.txz",	"xzcat %C|tar tvf -",	PM_TAR, 0},
+ 	{"*.txz",	"xz -cd %C|tar tvf -",	PM_TAR, 0},
  #endif	/* !MSDOS */
  	{NULL,		NULL,			PM_NULL, 0}
- };
-@@ -248,6 +252,10 @@
+@@ -252,6 +254,8 @@
  					"gzip -cd %C|tar xf - %TA", 0},
  	{"*.tar.bz2",	"tar cf - %T|bzip2 -c > %C",
  					"bzip2 -cd %C|tar xf - %TA", 0},
 +	{"*.tar.lzma",	"tar cf - %T|lzma -c > %C",
 +					"lzcat %C|tar xf - %TA", 0},
-+	{"*.tar.xz",	"tar cf - %T|xz -c > %C",
-+					"xzcat %C|tar xf - %TA", 0},
+ 	{"*.tar.xz",	"tar cf - %T|xz -c > %C",
+ 					"xz -cd %C|tar xf - %TA", 0},
  # ifndef	CYGWIN
- 	{"*.taZ",	"tar cf - %T|compress -c > %C",
- 					"zcat %C|tar xf - %TA", 0},
-@@ -256,6 +264,10 @@
+@@ -262,6 +266,8 @@
  					"gzip -cd %C|tar xf - %TA", 0},
  	{"*.tgz",	"tar cf - %T|gzip -c > %C",
  					"gzip -cd %C|tar xf - %TA", 0},
 +	{"*.tlz",	"tar cf - %T|lzma -c > %C",
 +					"lzcat %C|tar xf - %TA", 0},
-+	{"*.txz",	"tar cf - %T|xz -c > %C",
-+					"xzcat %C|tar xf - %TA", 0},
+ 	{"*.txz",	"tar cf - %T|xz -c > %C",
+ 					"xz -cd %C|tar xf - %TA", 0},
  #endif	/* !MSDOS */
- 	{NULL,		NULL,			NULL, 0}
- };

Deleted: trunk/dports/sysutils/FDclone/files/patch-tree.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-tree.c.diff	2012-04-21 08:24:41 UTC (rev 92178)
+++ trunk/dports/sysutils/FDclone/files/patch-tree.c.diff	2012-04-21 08:36:21 UTC (rev 92179)
@@ -1,74 +0,0 @@
---- tree.c.diff	2010-09-25 00:00:00.000000000 +0900
-+++ tree.c	2012-03-09 18:23:25.000000000 +0900
-@@ -36,6 +36,7 @@
- static int NEAR treeup __P_((VOID_A));
- static int NEAR treedown __P_((VOID_A));
- static int NEAR freetree __P_((treelist *, int));
-+static int NEAR bottomtree __P_((VOID_A));
- static VOID NEAR _tree_search __P_((VOID_A));
- static int NEAR _tree_input __P_((VOID_A));
- static char *NEAR _tree __P_((VOID_A));
-@@ -556,6 +557,24 @@
- 	return(n);
- }
- 
-+static int NEAR bottomtree(VOID_A)
-+{
-+	int min, oy, otop;
-+
-+	min = filetop(win);
-+	oy = tr_line;
-+	otop = tr_top;
-+	while (tr_line < min + FILEPERROW - 2) if (treedown() < 0) break;
-+	if (tr_line >= tr_bottom - 1 && tr_top >= min + 1) {
-+		tr_line = oy;
-+		tr_top = otop;
-+		searchtree();
-+		return(-1);
-+	}
-+
-+	return(0);
-+}
-+
- static VOID NEAR _tree_search(VOID_A)
- {
- 	int oy, otop;
-@@ -595,23 +614,20 @@
- 			treedown();
- 			break;
- 		case K_PPAGE:
-+			if (bottomtree() < 0) break;
- 			half = (FILEPERROW - 1) / 2;
--			tmp = min + half + 1 - tr_line;
-+			tmp = min + half + 1;
- 			if (tr_top + half > min + 1) half = min - tr_top + 1;
- 			if (half > 0) tr_top += half;
--			for (;tmp > 0; tmp--) if (treedown() < 0) break;
--			tr_line += tmp;
-+			tr_line = tmp;
- 			searchtree();
- 			break;
- 		case K_NPAGE:
-+			if (bottomtree() < 0) break;
- 			half = (FILEPERROW - 1) / 2;
--			tmp = half + (min + half + 1) - tr_line;
--			while (tmp-- > 0) if (treedown() < 0) break;
--			tmp = tr_line - (min + half + 1);
--			tr_line = min + half + 1;
--			if (tr_bottom - tmp < min + FILEPERROW - 1)
--				tmp = tr_bottom - min + FILEPERROW + 1;
--			tr_top -= tmp;
-+			tmp = min + half + 1;
-+			while (half-- > 0) if (treedown() < 0) break;
-+			tr_line = tmp;
- 			searchtree();
- 			break;
- 		case K_BEG:
-@@ -676,6 +692,7 @@
- 		case K_BS:
- 			do {
- 				if (treeup() < 0) break;
-+				if (!tr_cur || !(tr_cur -> sub)) break;
- 			} while (&(tr_cur -> sub[tr_no]) != old);
- 			break;
- 		case 'l':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120421/b11acfde/attachment.html>


More information about the macports-changes mailing list