[39642] trunk/dports/graphics

27 Aug 2008

Revision: 39642
          http://trac.macosforge.org/projects/macports/changeset/39642
Author:   ryandesign@macports.org
Date:     2008-08-27 13:22:32 -0700 (Wed, 27 Aug 2008)
Log Message:
-----------
cairo-devel: new port for latest development version of cairo, 1.7.4, based on cairo port for 1.6.4_1

Modified Paths:
--------------
    trunk/dports/graphics/cairo-devel/Portfile
    trunk/dports/graphics/dcraw/Portfile

Added Paths:
-----------
    trunk/dports/graphics/cairo-devel/
    trunk/dports/graphics/dcraw/files/
    trunk/dports/graphics/dcraw/files/Makefile.in

Removed Paths:
-------------
    trunk/dports/graphics/cairo-devel/files/


Property changes on: trunk/dports/graphics/cairo-devel
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================

--- trunk/dports/graphics/cairo/Portfile	2008-08-27 08:17:47 UTC (rev 39634)
+++ trunk/dports/graphics/cairo-devel/Portfile	2008-08-27 20:22:32 UTC (rev 39642)
@@ -2,14 +2,13 @@
 
 PortSystem              1.0
 
-name                    cairo
+name                    cairo-devel
 set my_name             cairo
-version                 1.6.4
-revision                1
+version                 1.7.4
 categories              graphics
 maintainers             ryandesign
 homepage                http://cairographics.org/
-master_sites            ${homepage}releases/
+master_sites            ${homepage}snapshots/
 platforms               darwin macosx
 use_parallel_build      yes
 dist_subdir             ${my_name}
@@ -24,15 +23,15 @@
     (eg. through the X Render Extension).
 
 checksums \
-    md5 a198d509f9e3a35b78de8bb02174ebb9 \
-    sha1 9d990fe39a125ceb07221623c237cd7015855d5c \
-    rmd160 ccae736a40d985b72bda7c2f0a98a0838020658e
+    md5     7583b6ff663a708fbfe1501c74d8fd77 \
+    sha1    c2b139a11336bf1c7a3423baff12ba949269a36b \
+    rmd160  bb15dffa4429081d630736197a94fd1c53c9492d
 
 depends_build \
     port:pkgconfig
 
 depends_lib \
-    path:${prefix}/lib/pkgconfig/pixman-1.pc:libpixman \
+    path:${prefix}/lib/pkgconfig/pixman-1.pc:libpixman-devel \
     port:xrender \
     port:fontconfig \
     port:freetype \
@@ -41,8 +40,13 @@
     port:zlib \
     port:expat
 
-patchfiles \
-    patch-FcFini.diff
+pre-configure {
+    set pixman_minimum_version 0.11.2
+    set pixman_installed_version [exec pkg-config pixman-1 --modversion]
+    if {[rpm-vercomp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
+        return -code error "cairo ${version} requires pixman ${pixman_minimum_version} or later but you have pixman ${pixman_installed_version}. Please deactivate libpixman and install libpixman-devel, then try again."
+    }
+}
 
 # The +universal variant is written in such a way that the port's global
 # configure.args must not be empty!
@@ -178,4 +182,4 @@
 
 livecheck.check         regex
 livecheck.url           ${homepage}news/
-livecheck.regex         ${my_name}-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)
+livecheck.regex         ${my_name}-(\[0-9\]+\\.\[0-9\]*\[13579\]\\.\[0-9\]+)

Modified: trunk/dports/graphics/dcraw/Portfile
===================================================================
--- trunk/dports/graphics/dcraw/Portfile	2008-08-27 20:13:16 UTC (rev 39641)
+++ trunk/dports/graphics/dcraw/Portfile	2008-08-27 20:22:32 UTC (rev 39642)
@@ -12,7 +12,6 @@
 master_sites            ${homepage}archive/
 worksrcdir              $name
 dist_subdir             ${name}/${version}-${distfile_date}
-use_configure           no
 use_parallel_build      yes
 
 description \
@@ -32,14 +31,12 @@
     port:jpeg \
     port:lcms
 
-variant universal {}
-
-build {
-    if {[variant_isset universal]} {
-        system "cd ${worksrcpath} && cc -o dcraw ${configure.cflags} ${configure.universal_cflags} dcraw.c -ljpeg -llcms -lintl -liconv ${configure.cppflags} ${configure.ldflags} -DLOCALEDIR=\\\"${prefix}/share/locale/\\\""
-    } else {
-        system "cd ${worksrcpath} && cc -o dcraw ${configure.cflags} dcraw.c -ljpeg -llcms -lintl -liconv ${configure.cppflags} ${configure.ldflags} -DLOCALEDIR=\\\"${prefix}/share/locale/\\\""
-    }
+configure {
+    xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile
+    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile
+    reinplace "s|@CFLAGS@|${configure.cflags}|g" ${worksrcpath}/Makefile
+    reinplace "s|@CPPFLAGS@|${configure.cppflags}|g" ${worksrcpath}/Makefile
+    reinplace "s|@LDFLAGS@|${configure.ldflags}|g" ${worksrcpath}/Makefile
 }
 
 destroot {

Added: trunk/dports/graphics/dcraw/files/Makefile.in
===================================================================
--- trunk/dports/graphics/dcraw/files/Makefile.in	                        (rev 0)
+++ trunk/dports/graphics/dcraw/files/Makefile.in	2008-08-27 20:22:32 UTC (rev 39642)
@@ -0,0 +1,9 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+
+all: dcraw
+
+dcraw:
+	$(CC) -o dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\\\"${prefix}/share/locale/\\\""

    

ryandesign＠macports.org

tags

participants (1)