[69700] trunk/dports/graphics/tiff
jmr at macports.org
jmr at macports.org
Tue Jul 13 10:59:33 PDT 2010
Revision: 69700
http://trac.macports.org/changeset/69700
Author: jmr at macports.org
Date: 2010-07-13 10:59:32 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
tiff: update to 3.9.4 (#25585, maintainer timeout), add new master_site, remove muniversal, add license, add jbig variant (#25586)
Modified Paths:
--------------
trunk/dports/graphics/tiff/Portfile
Added Paths:
-----------
trunk/dports/graphics/tiff/files/libtiff__tif_config.h.ed
trunk/dports/graphics/tiff/files/libtiff__tiffconf.h.ed
Removed Paths:
-------------
trunk/dports/graphics/tiff/files/patch-configure.diff
Modified: trunk/dports/graphics/tiff/Portfile
===================================================================
--- trunk/dports/graphics/tiff/Portfile 2010-07-13 17:50:31 UTC (rev 69699)
+++ trunk/dports/graphics/tiff/Portfile 2010-07-13 17:59:32 UTC (rev 69700)
@@ -2,13 +2,12 @@
# $Id$
PortSystem 1.0
-PortGroup muniversal 1.0
PortGroup xcodeversion 1.0
name tiff
-version 3.9.2
-revision 3
+version 3.9.4
categories graphics
+license BSD
maintainers waqar
description Library and tools for dealing with Tag Image File Format
long_description \
@@ -26,17 +25,15 @@
esoteric portions of the 6.0 TIFF spec.
homepage http://www.remotesensing.org/libtiff
platforms darwin
-master_sites ftp://ftp.remotesensing.org/pub/libtiff/ \
+master_sites http://download.osgeo.org/libtiff/ \
+ ftp://ftp.remotesensing.org/pub/libtiff/ \
http://dl.maptools.org/dl/libtiff/ \
freebsd
-checksums md5 93e56e421679c591de7552db13384cb8 \
- sha1 5c054d31e350e53102221b7760c3700cf70b4327 \
- rmd160 22716e0bcee93a654a704900f3e19f41600f3d18
+checksums md5 2006c1bdd12644dbf02956955175afd6 \
+ sha1 a4e32d55afbbcabd0391a9c89995e8e8a19961de \
+ rmd160 3e0a74b6294297c16fb983ad68056a1dfbbdb1de
-# Turn on OpenGL with --with-apple-opengl-framework.
-patchfiles patch-configure.diff
-
depends_lib port:jpeg port:zlib
test.run yes
@@ -50,6 +47,15 @@
--with-zlib-include-dir=${prefix}/include \
--with-zlib-lib-dir=${prefix}/lib
+post-configure {
+ if {[variant_isset universal]} {
+ system "cd ${worksrcpath}/libtiff \
+ && ed - tif_config.h < ${filespath}/libtiff__tif_config.h.ed \
+ && ed - tiffconf.h < ${filespath}/libtiff__tiffconf.h.ed \
+ && touch stamp-h1 && touch stamp-h2"
+ }
+}
+
use_parallel_build yes
post-destroot {
@@ -61,24 +67,21 @@
}
platform macosx {
- if { ![variant_isset universal] } {
+ # Tiger does not have 64-bit OpenGL.
+ if {${os.major} > 8 || (![variant_isset universal] && ![string match *64* $build_arch])
+ || ([variant_isset universal] && ![string match *64* $universal_archs])} {
configure.args-append --with-apple-opengl-framework
- } else {
- # Tiger does not have 64-bit OpenGL.
- if { ${os.major} > 8 } {
- configure.args-append --with-apple-opengl-framework
- } else {
- global merger_configure_args
- array set merger_configure_args {
- ppc --with-apple-opengl-framework
- i386 --with-apple-opengl-framework
- }
- }
}
}
minimum_xcodeversions {9 3.1}
+variant jbig description {Enable JBIG support} {
+ depends_lib-append port:jbigkit
+ configure.args-delete --disable-jbig
+ configure.args-append --enable-jbig
+}
+
livecheck.type regex
livecheck.url http://www.remotesensing.org/libtiff/
livecheck.regex {v(\d+(?:\.\d+)*)</a>}
Added: trunk/dports/graphics/tiff/files/libtiff__tif_config.h.ed
===================================================================
--- trunk/dports/graphics/tiff/files/libtiff__tif_config.h.ed (rev 0)
+++ trunk/dports/graphics/tiff/files/libtiff__tif_config.h.ed 2010-07-13 17:59:32 UTC (rev 69700)
@@ -0,0 +1,50 @@
+/#define SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/#define SIZEOF_SIGNED_LONG/c
+#ifdef __LP64__
+#define SIZEOF_SIGNED_LONG 8
+#else
+#define SIZEOF_SIGNED_LONG 4
+#endif
+.
+/#define SIZEOF_UNSIGNED_LONG/c
+#ifdef __LP64__
+#define SIZEOF_UNSIGNED_LONG 8
+#else
+#define SIZEOF_UNSIGNED_LONG 4
+#endif
+.
+/#define TIFF_INT64_FORMAT/c
+#ifdef __LP64__
+#define TIFF_INT64_FORMAT "%ld"
+#else
+#define TIFF_INT64_FORMAT "%lld"
+#endif
+.
+/#define TIFF_INT64_T/c
+#ifdef __LP64__
+#define TIFF_INT64_T signed long
+#else
+#define TIFF_INT64_T signed long long
+#endif
+.
+/#define TIFF_UINT64_FORMAT/c
+#ifdef __LP64__
+#define TIFF_UINT64_FORMAT "%lu"
+#else
+#define TIFF_UINT64_FORMAT "%llu"
+#endif
+.
+/#define TIFF_UINT64_T/c
+#ifdef __LP64__
+#define TIFF_UINT64_T unsigned long
+#else
+#define TIFF_UINT64_T unsigned long long
+#endif
+.
+w
Added: trunk/dports/graphics/tiff/files/libtiff__tiffconf.h.ed
===================================================================
--- trunk/dports/graphics/tiff/files/libtiff__tiffconf.h.ed (rev 0)
+++ trunk/dports/graphics/tiff/files/libtiff__tiffconf.h.ed 2010-07-13 17:59:32 UTC (rev 69700)
@@ -0,0 +1,8 @@
+/#define SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+w
Deleted: trunk/dports/graphics/tiff/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-configure.diff 2010-07-13 17:50:31 UTC (rev 69699)
+++ trunk/dports/graphics/tiff/files/patch-configure.diff 2010-07-13 17:59:32 UTC (rev 69700)
@@ -1,12 +0,0 @@
---- configure.orig 2006-03-23 09:44:47.000000000 -0500
-+++ configure 2009-03-11 19:02:08.000000000 -0400
-@@ -19976,6 +19976,9 @@
- fi
-
-
-+if test "X$with_apple_opengl_framework" = "Xyes"; then
-+ HAVE_OPENGL=yes
-+fi
-
- if test "$HAVE_OPENGL" = "yes"; then
- HAVE_OPENGL_TRUE=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100713/d28c6428/attachment.html>
More information about the macports-changes
mailing list