[52182] trunk/dports/graphics/libart_lgpl

toby at macports.org toby at macports.org
Thu Jun 11 11:56:18 PDT 2009


Revision: 52182
          http://trac.macports.org/changeset/52182
Author:   toby at macports.org
Date:     2009-06-11 11:56:18 -0700 (Thu, 11 Jun 2009)
Log Message:
-----------
Remove completely insane configure section, add simple patches to accomplish the same goal.
Remove darwin 6 section.
Take maintainership to prevent anyone from getting bright ideas about "fixing" the port again.

Modified Paths:
--------------
    trunk/dports/graphics/libart_lgpl/Portfile

Added Paths:
-----------
    trunk/dports/graphics/libart_lgpl/files/
    trunk/dports/graphics/libart_lgpl/files/patch-Makefile.in
    trunk/dports/graphics/libart_lgpl/files/patch-art_config.h

Modified: trunk/dports/graphics/libart_lgpl/Portfile
===================================================================
--- trunk/dports/graphics/libart_lgpl/Portfile	2009-06-11 18:54:19 UTC (rev 52181)
+++ trunk/dports/graphics/libart_lgpl/Portfile	2009-06-11 18:56:18 UTC (rev 52182)
@@ -1,14 +1,13 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       muniversal 1.0
 
 name            libart_lgpl
 version         2.3.20
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      graphics
 platforms       darwin
-maintainers     nomaintainer
+maintainers     toby
 description     fast 2D image manipulation library
 
 long_description \
@@ -30,73 +29,10 @@
                 sha1 40aa6c6c5fb27a8a45cd7aaa302a835ff374d13a \
                 rmd160 184cd3dd96e9cfadcba327644bc8c9dd32da26fa
 
+patchfiles      patch-Makefile.in patch-art_config.h
+
 use_parallel_build  yes
 
-pre-configure {
-    # Check to see if universal_archs order is correct for post-configure below.
-    if { [variant_isset universal] } {
-        set ppcv     [lsearch ${universal_archs} ppc]
-        set i386v    [lsearch ${universal_archs} i386]
-        set ppc64v   [lsearch ${universal_archs} ppc64]
-        set x86_64v  [lsearch ${universal_archs} x86_64]
-
-        if { ${os.arch}=="i386" } {
-            if { ${os.major} >= 10 } {
-                if { (${ppcv}>0 && ${i386v}<0) || (${ppcv} < ${i386v}) } {
-                    ui_msg "When building a universal binary of ${name}, make sure i386 is before ppc in universal_archs in ${prefix}/etc/macports/macports.conf"
-                    error "incompatible universal_archs value"
-                }
-            }
-
-            if { (${ppc64v}>0 && ${x86_64v}<0) || (${ppc64v} < ${x86_64v}) } {
-                ui_msg "When building a universal binary of ${name}, make sure x86_64 is before ppc64 in universal_archs in ${prefix}/etc/macports/macports.conf"
-                error "incompatible universal_archs value"
-            }
-        } else {
-             if { (${ppcv}<0 && ${i386v}>0) || (${ppcv} > ${i386v}) } {
-                ui_msg "When building a universal binary of ${name}, make sure ppc is before i386 in universal_archs in ${prefix}/etc/macports/macports.conf"
-                error "incompatible universal_archs value"
-            }
-
-            if { (${ppc64v}<0 && ${x86_64v}>0) || (${ppc64v} > ${x86_64v}) } {
-                ui_msg "When building a universal binary of ${name}, make sure ppc64 is before x86_64 in universal_archs in ${prefix}/etc/macports/macports.conf"
-                error "incompatible universal_archs value"
-            }
-        }
-    }
-}
-
-# There is a small program called gen_art_config which outputs the various sizeof values into a header file.
-# The answers should be the same on PowerPC and Intel as long the same 32/64-bit mode is the same.
-# The only problem might be if ART_SIZEOF_BOOL (from C99) were ever added (32-bit Intel and PowerPC would be different).
-post-configure {
-    if { [variant_isset universal] } {
-        if { ${os.arch}=="i386" } {
-            if { ${os.major}>=10 && [file exists ${worksrcpath}-ppc] } {
-                reinplace "s|./gen_art_config|${worksrcpath}-i386/gen_art_config|" \
-                    ${worksrcpath}-ppc/Makefile
-            }
-            if { [file exists ${worksrcpath}-ppc64] } {
-                reinplace "s|./gen_art_config|${worksrcpath}-x86_64/gen_art_config|" \
-                    ${worksrcpath}-ppc64/Makefile
-            }
-        } else {
-            if { [file exists ${worksrcpath}-i386] } {
-                reinplace "s|./gen_art_config|${worksrcpath}-ppc/gen_art_config|" \
-                    ${worksrcpath}-i386/Makefile
-            }
-            if { [file exists ${worksrcpath}-x86_64] } {
-                reinplace "s|./gen_art_config|${worksrcpath}-ppc64/gen_art_config|" \
-                    ${worksrcpath}-x86_64/Makefile
-            }
-        }
-    }
-}
-
-platform darwin 6 {
-    depends_lib-append lib:libdl:dlcompat
-}
-
 livecheck.check regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

Added: trunk/dports/graphics/libart_lgpl/files/patch-Makefile.in
===================================================================
--- trunk/dports/graphics/libart_lgpl/files/patch-Makefile.in	                        (rev 0)
+++ trunk/dports/graphics/libart_lgpl/files/patch-Makefile.in	2009-06-11 18:56:18 UTC (rev 52182)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2009-06-11 11:52:36.000000000 -0700
++++ Makefile.in	2009-06-11 11:52:46.000000000 -0700
+@@ -915,8 +915,6 @@
+ 	uninstall-pkgconfigDATA
+ 
+ 
+-art_config.h:	gen_art_config$(EXEEXT)
+-	./gen_art_config > art_config.h
+ 
+ @OS_WIN32_TRUE at install-libtool-import-lib:
+ @OS_WIN32_TRUE@	$(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir)

Added: trunk/dports/graphics/libart_lgpl/files/patch-art_config.h
===================================================================
--- trunk/dports/graphics/libart_lgpl/files/patch-art_config.h	                        (rev 0)
+++ trunk/dports/graphics/libart_lgpl/files/patch-art_config.h	2009-06-11 18:56:18 UTC (rev 52182)
@@ -0,0 +1,14 @@
+--- art_config.h.orig	2009-06-11 11:47:41.000000000 -0700
++++ art_config.h	2009-06-11 11:48:01.000000000 -0700
+@@ -3,7 +3,11 @@
+ #define ART_SIZEOF_CHAR 1
+ #define ART_SIZEOF_SHORT 2
+ #define ART_SIZEOF_INT 4
++#ifdef __LP64__
++#define ART_SIZEOF_LONG 8
++#else
+ #define ART_SIZEOF_LONG 4
++#endif
+ 
+ typedef unsigned char art_u8;
+ typedef unsigned short art_u16;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090611/5c21bdc3/attachment.html>


More information about the macports-changes mailing list