[90966] trunk/dports/devel/camlimages
jmr at macports.org
jmr at macports.org
Tue Mar 20 04:24:43 PDT 2012
Revision: 90966
https://trac.macports.org/changeset/90966
Author: jmr at macports.org
Date: 2012-03-20 04:24:40 -0700 (Tue, 20 Mar 2012)
Log Message:
-----------
camlimages: update to 4.0.1 (#29042)
Modified Paths:
--------------
trunk/dports/devel/camlimages/Portfile
trunk/dports/devel/camlimages/files/patch-tiffread.c.diff
Removed Paths:
-------------
trunk/dports/devel/camlimages/files/patch-configure.diff
Modified: trunk/dports/devel/camlimages/Portfile
===================================================================
--- trunk/dports/devel/camlimages/Portfile 2012-03-20 09:46:24 UTC (rev 90965)
+++ trunk/dports/devel/camlimages/Portfile 2012-03-20 11:24:40 UTC (rev 90966)
@@ -1,61 +1,61 @@
# $Id$
PortSystem 1.0
+
name camlimages
-version 2.2
-revision 10
+version 4.0.1
categories devel graphics
+license {LGPL-2 Permissive}
maintainers loria.fr:reilles
description Objective Caml interface to image manipulation functions.
long_description Camlimages provides basic functions for image processing \
and loading/saving various image file formats, an \
interface to display images, and a Freetype interface \
to render TrueType fonts.
-homepage http://pauillac.inria.fr/camlimages/
+homepage http://gallium.inria.fr/camlimages/
-configure.cflags-append "-I${prefix}/include"
-configure.env MACPORTS_CAMLDIR="${prefix}/lib/ocaml"
-
-patchfiles patch-configure.diff \
- patch-tiffread.c.diff
-
+patchfiles patch-tiffread.c.diff
+
platforms darwin
-master_sites ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
+master_sites https://bitbucket.org/camlspotter/camlimages/get/
-extract.suffix .tgz
-build.target all opt
-checksums md5 d933eb58c7983f70b1a000fa01893aa4
+distname v${version}
+checksums rmd160 dd3a1aeb43bc7459781958a93db23ce32d0ca6e6 \
+ sha256 b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4
-depends_lib bin:camlp4:ocaml port:jpeg \
- lib:libtiff.3:tiff path:include/gif_lib.h:giflib \
- lib:libpng:libpng bin:gs:ghostscript
-
-configure.args --without-lablgtk \
- --without-lablgl \
- --without-lablgtk2
+depends_build port:ocaml-findlib port:omake
+depends_lib port:ocaml port:jpeg \
+ port:tiff path:include/gif_lib.h:giflib \
+ port:libpng port:ghostscript port:xpm
-universal_variant no
+worksrcdir camlspotter-${name}-c803efa9d5d3
+
+use_configure no
if {$build_arch == "i386" || $build_arch == "ppc"} {
configure.ld_archflags -m32
} else {
configure.ld_archflags -m64
}
-variant lablgtk {
- configure.args-delete --without-lablgtk
- configure.args-append --with-lablgtk="${prefix}/lib/ocaml/lablgtk"
- depends_lib bin:lablgtk:lablgtk
+build.cmd omake
+build.args --verbose INCLUDES="${prefix}/include" \
+ LDFLAGS='${configure.ldflags} ${configure.ld_archflags}' \
+ CFLAGS='${configure.cflags} ${configure.cc_archflags}' \
+ CC=${configure.cc} CXX=${configure.cxx} \
+ SUPPORT_LABLGTK2=false
+destroot.args ${build.args}
+pre-destroot {
+ set ocaml_destdir "${destroot}[exec ocamlfind printconf destdir]"
+ xinstall -d ${ocaml_destdir}
+ destroot.env OCAMLFIND_DESTDIR="${ocaml_destdir}" \
+ OCAMLFIND_LDCONF=ignore
}
-variant lablgl {
- configure.args-delete --without-lablgl
- configure.args-append --with-lablgl="${prefix}/lib/ocaml/lablgl"
- depends_lib bin:lablglut:lablgl
-}
-
variant lablgtk2 {
- configure.args-delete --without-lablgtk2
- configure.args-append --with-lablgtk2="${prefix}/lib/ocaml/lablgtk2"
- depends_lib bin:lablgtk2:lablgtk2 bin:gdk-pixbuf-config:gdk-pixbuf
+ build.args-delete SUPPORT_LABLGTK2=false
+ destroot.args-delete SUPPORT_LABLGTK2=false
+ build.args-append SUPPORT_LABLGTK2=true
+ destroot.args-append SUPPORT_LABLGTK2=true
+ depends_lib-append port:lablgtk2
}
Deleted: trunk/dports/devel/camlimages/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/camlimages/files/patch-configure.diff 2012-03-20 09:46:24 UTC (rev 90965)
+++ trunk/dports/devel/camlimages/files/patch-configure.diff 2012-03-20 11:24:40 UTC (rev 90966)
@@ -1,11 +0,0 @@
---- configure.orig Thu Jul 1 21:29:09 2004
-+++ configure Thu Jul 1 21:30:19 2004
-@@ -551,7 +551,7 @@
- WITHLABEL=-labels
- DOTOPT=""
-
--CAMLDIR=`"$CAML"c -where`
-+CAMLDIR='${DESTDIR}'${MACPORTS_CAMLDIR}
- CAMLVERSION0=`"$CAML"c -v | grep "compiler" | sed 's/.* version //'`
-
- CAMLVERSION=`echo $CAMLVERSION0 | sed 's/ .*$//'`
Modified: trunk/dports/devel/camlimages/files/patch-tiffread.c.diff
===================================================================
--- trunk/dports/devel/camlimages/files/patch-tiffread.c.diff 2012-03-20 09:46:24 UTC (rev 90965)
+++ trunk/dports/devel/camlimages/files/patch-tiffread.c.diff 2012-03-20 11:24:40 UTC (rev 90966)
@@ -1,5 +1,5 @@
---- tiff/tiffread.c.orig 2004-09-21 23:56:44.000000000 +0200
-+++ tiff/tiffread.c 2006-03-02 19:33:47.000000000 +0100
+--- src/tiffread.c.orig 2004-09-21 23:56:44.000000000 +0200
++++ src/tiffread.c 2006-03-02 19:33:47.000000000 +0100
@@ -33,6 +33,10 @@
#undef int32
#undef uint32
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120320/1b947ded/attachment.html>
More information about the macports-changes
mailing list