[77632] trunk/dports/sysutils/dpkg
afb at macports.org
afb at macports.org
Thu Apr 7 01:06:21 PDT 2011
Revision: 77632
http://trac.macports.org/changeset/77632
Author: afb at macports.org
Date: 2011-04-07 01:06:21 -0700 (Thu, 07 Apr 2011)
Log Message:
-----------
dpkg: redo useless submitted patch for gnutar (#27702, #29049)
Modified Paths:
--------------
trunk/dports/sysutils/dpkg/Portfile
Added Paths:
-----------
trunk/dports/sysutils/dpkg/files/patch-lib_dpkg.h
Removed Paths:
-------------
trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c
Modified: trunk/dports/sysutils/dpkg/Portfile
===================================================================
--- trunk/dports/sysutils/dpkg/Portfile 2011-04-07 07:00:51 UTC (rev 77631)
+++ trunk/dports/sysutils/dpkg/Portfile 2011-04-07 08:06:21 UTC (rev 77632)
@@ -4,7 +4,7 @@
name dpkg
version 1.14.29
-revision 2
+revision 3
platforms darwin freebsd
categories sysutils archivers
maintainers landonf openmaintainer
@@ -35,7 +35,7 @@
patch-main_remove.c \
patch-main_archives.c \
patch-scripts-Makefile \
- patch-dpkg-deb_build.c \
+ patch-lib_dpkg.h \
ncurses.diff
configure.env PERL=${prefix}/bin/perl5
Deleted: trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c
===================================================================
--- trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c 2011-04-07 07:00:51 UTC (rev 77631)
+++ trunk/dports/sysutils/dpkg/files/patch-dpkg-deb_build.c 2011-04-07 08:06:21 UTC (rev 77632)
@@ -1,57 +0,0 @@
---- 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;
Added: trunk/dports/sysutils/dpkg/files/patch-lib_dpkg.h
===================================================================
--- trunk/dports/sysutils/dpkg/files/patch-lib_dpkg.h (rev 0)
+++ trunk/dports/sysutils/dpkg/files/patch-lib_dpkg.h 2011-04-07 08:06:21 UTC (rev 77632)
@@ -0,0 +1,11 @@
+--- ./lib/dpkg.h.orig 2010-03-08 21:27:35.000000000 +0100
++++ ./lib/dpkg.h 2011-04-07 09:51:21.000000000 +0200
+@@ -147,7 +147,7 @@
+ #define DPKG "dpkg"
+ #define DEBSIGVERIFY "/usr/bin/debsig-verify"
+
+-#define TAR "tar"
++#define TAR "gnutar"
+ #define GZIP "gzip"
+ #define BZIP2 "bzip2"
+ #define LZMA "lzma"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110407/f0e5840d/attachment-0001.html>
More information about the macports-changes
mailing list