[82264] trunk/dports/sysutils/apt

[afb at macports.org]

Revision: 82264
          http://trac.macports.org/changeset/82264
Author:   afb at macports.org
Date:     2011-08-11 13:51:36 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
apt: patch the right file (thanks jmr)

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

Added Paths:
-----------
    trunk/dports/sysutils/apt/files/patch-apt-pkg-contrib-system.h

Removed Paths:
-------------
    trunk/dports/sysutils/apt/files/patch-build-include-system.h

Modified: trunk/dports/sysutils/apt/Portfile
===================================================================
--- trunk/dports/sysutils/apt/Portfile	2011-08-11 20:50:11 UTC (rev 82263)
+++ trunk/dports/sysutils/apt/Portfile	2011-08-11 20:51:36 UTC (rev 82264)
@@ -30,7 +30,7 @@
 			patch-configure \
 			patch-static-constructors \
 			soname-magic.diff \
-			patch-build-include-system.h \
+			patch-apt-pkg-contrib-system.h \
 			patch-apt-inst-deb-dpkgdb.cc
 
 # Work around case insensitive file system issues

Copied: trunk/dports/sysutils/apt/files/patch-apt-pkg-contrib-system.h (from rev 82239, trunk/dports/sysutils/apt/files/patch-build-include-system.h)
===================================================================
--- trunk/dports/sysutils/apt/files/patch-apt-pkg-contrib-system.h	                        (rev 0)
+++ trunk/dports/sysutils/apt/files/patch-apt-pkg-contrib-system.h	2011-08-11 20:51:36 UTC (rev 82264)
@@ -0,0 +1,11 @@
+--- apt-pkg/contrib/system.h.orig	1999-12-11 00:40:29.000000000 +0100
++++ apt-pkg/contrib/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

Deleted: trunk/dports/sysutils/apt/files/patch-build-include-system.h
===================================================================
--- trunk/dports/sysutils/apt/files/patch-build-include-system.h	2011-08-11 20:50:11 UTC (rev 82263)
+++ trunk/dports/sysutils/apt/files/patch-build-include-system.h	2011-08-11 20:51:36 UTC (rev 82264)
@@ -1,11 +0,0 @@
---- 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/20110811/d753ff39/attachment.html>