Revision: 74405 http://trac.macports.org/changeset/74405 Author: vince@macports.org Date: 2010-12-15 13:22:09 -0800 (Wed, 15 Dec 2010) Log Message: ----------- Replace a fixed patch by an ed script. Modified Paths: -------------- trunk/dports/gis/gdal/Portfile Removed Paths: ------------- trunk/dports/gis/gdal/files/patch_cpl_config_h Modified: trunk/dports/gis/gdal/Portfile =================================================================== --- trunk/dports/gis/gdal/Portfile 2010-12-15 19:59:40 UTC (rev 74404) +++ trunk/dports/gis/gdal/Portfile 2010-12-15 21:22:09 UTC (rev 74405) @@ -58,7 +58,8 @@ reinplace -E "s|(INST_PYMOD).*|\\1\t=\t${PYINST}|" \ ${worksrcpath}/GDALmake.opt if {[variant_isset universal]} { - system "cd ${worksrcpath} && patch -p0 < ${portpath}/files/patch_cpl_config_h" + system "ed - ${worksrcpath}/port/cpl_config.h < ${filespath}/config.h.ed" + } } Deleted: trunk/dports/gis/gdal/files/patch_cpl_config_h =================================================================== --- trunk/dports/gis/gdal/files/patch_cpl_config_h 2010-12-15 19:59:40 UTC (rev 74404) +++ trunk/dports/gis/gdal/files/patch_cpl_config_h 2010-12-15 21:22:09 UTC (rev 74405) @@ -1,32 +0,0 @@ ---- port/cpl_config.h.orig 2008-12-20 15:12:09.000000000 +0100 -+++ port/cpl_config.h 2008-12-20 15:16:54.000000000 +0100 -@@ -143,13 +143,26 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --/* #undef SIZEOF_LONG */ -+#if defined (__LP64__) -+ #define SIZEOF_LONG 8 -+#else -+ #define SIZEOF_LONG 4 -+#endif - - /* The size of `unsigned long', as computed by sizeof. */ --#define SIZEOF_UNSIGNED_LONG 8 -+#if defined (__LP64__) -+ #define SIZEOF_UNSIGNED_LONG 8 -+#else -+ #define SIZEOF_UNSIGNED_LONG 4 -+#endif -+ - - /* The size of `void*', as computed by sizeof. */ --#define SIZEOF_VOIDP 8 -+#if defined (__LP64__) -+ #define SIZEOF_VOIDP 8 -+#else -+ #define SIZEOF_VOIDP 4 -+#endif - - /* Define to 1 if you have the ANSI C header files. */ - #define STDC_HEADERS 1