diff --git a/media-libs/tiff/patches/tiff-4.0.2.patch b/media-libs/tiff/patches/tiff-4.0.3.patch similarity index 100% rename from media-libs/tiff/patches/tiff-4.0.2.patch rename to media-libs/tiff/patches/tiff-4.0.3.patch diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff4-4.0.3.recipe similarity index 76% rename from media-libs/tiff/tiff-4.0.2.recipe rename to media-libs/tiff/tiff4-4.0.3.recipe index c7d818f2e..6cbf258cb 100644 --- a/media-libs/tiff/tiff-4.0.2.recipe +++ b/media-libs/tiff/tiff4-4.0.3.recipe @@ -5,19 +5,19 @@ data. Included in this software is a library, libtiff, for reading and writing \ TIFF. " HOMEPAGE="http://www.libtiff.org" -SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" -CHECKSUM_SHA256="aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da" +SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz" +CHECKSUM_SHA256="ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872" LICENSE="MIT" COPYRIGHT="1988-1997 Sam Leffler 1991-1997 Silicon Graphics, Inc." -REVISION="5" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - tiff$secondaryArchSuffix = $portVersion compat >= 4 - lib:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5 - lib:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5 + tiff4$secondaryArchSuffix = $portVersion compat >= 4 + lib:libtiff$secondaryArchSuffix = 5.2.0 compat >= 5 + lib:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -42,7 +42,7 @@ BUILD_PREREQUIRES=" cmd:make " PATCHES=" - tiff-4.0.2.patch + tiff-4.0.3.patch " PATCH() @@ -53,13 +53,11 @@ PATCH() fi } +SOURCE_DIR="tiff-$portVersion" + BUILD() { - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - autoheader + autoreconf -fi runConfigure ./configure --with-docdir=$documentationDir/$portName # --enable-shared make $jobArgs @@ -93,12 +91,15 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4 - devel:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5 - devel:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5 + tiff4${secondaryArchSuffix}_devel = $portVersion compat >= 4 + devel:libtiff$secondaryArchSuffix = 5.2.0 compat >= 5 + devel:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5 " REQUIRES_devel=" - tiff$secondaryArchSuffix == $portVersion base + tiff4$secondaryArchSuffix == $portVersion base + " +CONFLICTS_devel=" + tiff${secondaryArchSuffix}_devel " # ----- tools package ------------------------------------------------------- @@ -133,7 +134,7 @@ if [ -z "$secondaryArchSuffix" ]; then " REQUIRES_tools=" haiku >= $haikuVersion - tiff == $portVersion base + tiff4 == $portVersion base lib:libjpeg lib:libz "