[82136] trunk/dports/sysutils/apt

[afb at macports.org]

Revision: 82136
          http://trac.macports.org/changeset/82136
Author:   afb at macports.org
Date:     2011-08-08 07:31:24 -0700 (Mon, 08 Aug 2011)
Log Message:
-----------
apt: fix build on lion (llvm-gcc)

Modified Paths:
--------------
    trunk/dports/sysutils/apt/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/apt/files/patch-apt-inst-deb-dpkgdb.cc
    trunk/dports/sysutils/apt/files/patch-build-include-system.h

Modified: trunk/dports/sysutils/apt/Portfile
===================================================================
--- trunk/dports/sysutils/apt/Portfile	2011-08-08 14:30:17 UTC (rev 82135)
+++ trunk/dports/sysutils/apt/Portfile	2011-08-08 14:31:24 UTC (rev 82136)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 name			apt
 version			0.5.27
-revision		7
+revision		8
 platforms		darwin freebsd
 categories		sysutils
 maintainers		landonf openmaintainer
@@ -29,7 +29,9 @@
 			patch-configure.in \
 			patch-configure \
 			patch-static-constructors \
-			soname-magic.diff
+			soname-magic.diff \
+			patch-build-include-system.h \
+			patch-apt-inst-deb-dpkgdb.cc
 
 # Work around case insensitive file system issues
 configure.cmd		../configure

Added: trunk/dports/sysutils/apt/files/patch-apt-inst-deb-dpkgdb.cc
===================================================================
--- trunk/dports/sysutils/apt/files/patch-apt-inst-deb-dpkgdb.cc	                        (rev 0)
+++ trunk/dports/sysutils/apt/files/patch-apt-inst-deb-dpkgdb.cc	2011-08-08 14:31:24 UTC (rev 82136)
@@ -0,0 +1,10 @@
+--- apt-inst/deb/dpkgdb.cc.orig	2011-08-08 13:14:44.000000000 +0200
++++ apt-inst/deb/dpkgdb.cc	2011-08-08 13:33:04.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>

Added: trunk/dports/sysutils/apt/files/patch-build-include-system.h
===================================================================
--- trunk/dports/sysutils/apt/files/patch-build-include-system.h	                        (rev 0)
+++ trunk/dports/sysutils/apt/files/patch-build-include-system.h	2011-08-08 14:31:24 UTC (rev 82136)
@@ -0,0 +1,11 @@
+--- build/include/system.h.orig	2011-08-08 13:14:47.000000000 +0200
++++ build/include/system.h	2011-08-08 13:24:37.000000000 +0200
+@@ -26,7 +26,7 @@
+ #endif
+ 
+ // GNU C++ has a min/max operator <coolio>
+-#if defined(__GNUG__)
++#if defined(__GNUG__) && !defined(__llvm__)
+ #define MIN(A,B) ((A) <? (B))
+ #define MAX(A,B) ((A) >? (B))
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110808/6edcf13f/attachment.html>