Revision
74825
Author
afb@macports.org
Date
2011-01-03 01:59:20 -0800 (Mon, 03 Jan 2011)

Log Message

fix usage of lzma, and gnutar [#27702]

Modified Paths

Added Paths

Diff

Modified: trunk/dports/sysutils/dpkg/Portfile (74824 => 74825)


--- trunk/dports/sysutils/dpkg/Portfile	2011-01-03 09:51:18 UTC (rev 74824)
+++ trunk/dports/sysutils/dpkg/Portfile	2011-01-03 09:59:20 UTC (rev 74825)
@@ -4,7 +4,7 @@
 
 name			dpkg
 version			1.14.29
-revision		1
+revision		2
 platforms		darwin freebsd
 categories		sysutils archivers
 maintainers		landonf openmaintainer
@@ -20,19 +20,22 @@
 depends_lib		port:gettext \
 			port:libiconv \
 			port:perl5 \
-			port:lzmautils \
 			port:coreutils \
 			port:bzip2 \
 			port:zlib
 
+depends_run		bin:gnutar:gnutar \
+			bin:lzma:lzmautils
 
+
 distname		${name}_${version}
 worksrcdir		${name}-${version}
 
 patchfiles		patch-lib_tarfn.c \
 			patch-main_remove.c \
 			patch-main_archives.c \
-			patch-scripts-Makefile
+			patch-scripts-Makefile \
+			patch-dpkg-deb_build.c
 
 configure.env		PERL=${prefix}/bin/perl5
 configure.args		--without-sgml-doc --with-libintl-prefix=${prefix} \

Added: trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c (0 => 74825)


--- trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c	                        (rev 0)
+++ trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c	2011-01-03 09:59:20 UTC (rev 74825)
@@ -0,0 +1,57 @@
+--- dpkg-deb/build.c.orig	2010-10-31 05:14:40.000000000 -0500
++++ dpkg-deb/build.c	2010-12-20 02:18:56.000000000 -0600
+@@ -350,8 +350,8 @@
+     m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
+     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
+     if (chdir(BUILDCONTROLDIR)) ohshite(_("failed to chdir to .../DEBIAN"));
+-    execlp(TAR, "tar", "-cf", "-", "--format=gnu", ".", NULL);
+-    ohshite(_("failed to exec tar -cf"));
++    execlp(TAR, "gnutar", "-cf", "-", "--format=gnu", ".", NULL);
++    ohshite(_("failed to exec gnutar -cf"));
+   }
+   close(p1[1]);
+   /* Create a temporary file to store the control data in. Immediately unlink
+@@ -373,7 +373,7 @@
+   }
+   close(p1[0]);
+   waitsubproc(c2,"gzip -9c",0);
+-  waitsubproc(c1,"tar -cf",0);
++  waitsubproc(c1,"gnutar -cf",0);
+   if (fstat(gzfd,&controlstab)) ohshite(_("failed to fstat tmpfile (control)"));
+   /* We have our first file for the ar-archive. Write a header for it to the
+    * package and insert it.
+@@ -423,8 +423,8 @@
+     m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
+     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
+     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
+-    execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL);
+-    ohshite(_("failed to exec tar -cf"));
++    execlp(TAR, "gnutar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL);
++    ohshite(_("failed to exec gnutar -cf"));
+   }
+   close(p1[0]);
+   close(p2[1]);
+@@ -457,19 +457,19 @@
+       add_to_filist(fi,&symlist,&symlist_end);
+     else {
+       if (write(p1[1], fi->fn, strlen(fi->fn)+1) ==- 1)
+-	ohshite(_("failed to write filename to tar pipe (data)"));
++	ohshite(_("failed to write filename to gnutar pipe (data)"));
+     }
+   close(p3[0]);
+   waitsubproc(c3,"find",0);
+ 
+   for (fi= symlist;fi;fi= fi->next)
+     if (write(p1[1], fi->fn, strlen(fi->fn)+1) == -1)
+-      ohshite(_("failed to write filename to tar pipe (data)"));
++      ohshite(_("failed to write filename to gnutar pipe (data)"));
+   /* All done, clean up wait for tar and gzip to finish their job */
+   close(p1[1]);
+   free_filist(symlist);
+-  waitsubproc(c2,"<compress> from tar -cf",0);
+-  waitsubproc(c1,"tar -cf",0);
++  waitsubproc(c2,"<compress> from gnutar -cf",0);
++  waitsubproc(c1,"gnutar -cf",0);
+   /* Okay, we have data.tar.gz as well now, add it to the ar wrapper */
+   if (!oldformatflag) {
+     const char *datamember;