[67895] trunk/dports/science/hdf4/Portfile

[takeshi at macports.org]

Revision: 67895
          http://trac.macports.org/changeset/67895
Author:   takeshi at macports.org
Date:     2010-05-21 00:28:11 -0700 (Fri, 21 May 2010)
Log Message:
-----------
hdf4: uses jpeg6b added in r67894

Revision Links:
--------------
    http://trac.macports.org/changeset/67894

Modified Paths:
--------------
    trunk/dports/science/hdf4/Portfile

Modified: trunk/dports/science/hdf4/Portfile
===================================================================
--- trunk/dports/science/hdf4/Portfile	2010-05-21 07:26:04 UTC (rev 67894)
+++ trunk/dports/science/hdf4/Portfile	2010-05-21 07:28:11 UTC (rev 67895)
@@ -5,6 +5,7 @@
 
 name                hdf4
 version             4.2.5
+revision            1
 platforms           darwin
 categories          science
 maintainers         takeshi
@@ -12,51 +13,24 @@
 description         file format for storing scientific data and utilities
 long_description    ${description}
 homepage            http://www.hdfgroup.org/products/hdf4/index.html
-master_sites        ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/:hdf \
-                    http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/:hdf \
-                    http://www.hdfgroup.org/ftp/lib-external/jpeg/src/:jpeg \
-                    ftp://ftp.hdfgroup.org/lib-external/jpeg/src/:jpeg
-distname            hdf-$version
-set hdfsrc ${distname}${extract.suffix}
-set jpgsrc jpegsrc.v6b${extract.suffix}
-distfiles           ${hdfsrc}:hdf \
-                    ${jpgsrc}:jpeg
-checksums           ${hdfsrc} md5     7241a34b722d29d8561da0947c06069f \
-                    ${hdfsrc} sha1    7a9bb3f5d28ed889d7bff2f34389d00be8af5d21 \
-                    ${hdfsrc} rmd160  e0756ea157c26832b4bd46b083e5cd8e8ea3ba59 \
-                    ${jpgsrc} md5     83992a9466af7536da30efe6b51d4064 \
-                    ${jpgsrc} sha1    fdca7f17a20ebefec2c7837916fc1daa90e83332 \
-                    ${jpgsrc} rmd160  9be6f07bbd052f3de5a80a25584e74dcb6dce6cf
+master_sites        ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/ \
+                    http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/
+distname            hdf-${version}
+use_bzip2           yes
+checksums           md5     91bc17ec735b52736507570a530fe8a9 \
+                    sha1    9c854363949bc6552bd38957e7bdfc9c54be0f82 \
+                    rmd160  1b8fb8330529dcfc17f0c506b43eb51155471111
 
-depends_lib         port:zlib port:szip
+depends_lib         port:zlib port:szip port:jpeg6b
 
-set jpgdir ${workpath}/jpeg-6b
 configure.args       --with-szlib=${prefix} --disable-netcdf --disable-fortran \
-                     --with-jpeg=${jpgdir},${jpgdir}
+                     --with-jpeg=${prefix}/lib/jpeg6b
 configure.cppflags-delete   -I${prefix}/include
 configure.ldflags-delete    -L${prefix}/lib
 
 test.run            yes
 test.target         check
 
-if {[variant_isset universal]} {
-  set copts "${configure.cflags} ${configure.universal_cflags}"
-  set ldopts ${configure.universal_ldflags}
-} else {
-  set copts "${configure.cflags} ${configure.cc_archflags}"
-  set ldopts ${configure.cc_archflags}
-}
-pre-configure {
-    system " \
-      export CC=${configure.cc}; \
-      export CPPFLAGS=\"\"; \
-      export CFLAGS=\"${copts}\"; \
-      export LDFLAGS=\"${ldopts}\"; \
-      cd ${jpgdir}; \
-      ./configure --prefix=${prefix}; \
-      make libjpeg.a"
-}
-
 post-destroot {
 	file mkdir ${destroot}${prefix}/share/doc/${name}
 	file copy ${worksrcpath}/hdf/util/testfiles ${destroot}${prefix}/share/doc/${name}/samples
@@ -68,15 +42,6 @@
              share/man/man1/ncgen.1 share/man/man1/ncdump.1} {
 		file delete ${destroot}${prefix}/$f
 	}
-    xinstall -d -m 755 ${destroot}${prefix}/lib/${name}
-    xinstall -d -m 755 ${destroot}${prefix}/lib/${name}/include
-    xinstall -d -m 755 ${destroot}${prefix}/lib/${name}/lib
-    foreach f "${jpgdir}/jconfig.h ${jpgdir}/jerror.h \
-               ${jpgdir}/jmorecfg.h ${jpgdir}/jpeglib.h" {
-        xinstall -m 644 ${f} ${destroot}${prefix}/lib/${name}/include
-    }
-    xinstall -m 644 ${jpgdir}/libjpeg.a ${destroot}${prefix}/lib/${name}/lib
-    ui_msg "jpeg-6b required by hdf4 is to be installed in ${prefix}/lib/${name}"
 }
 
 variant g95 conflicts gcc43 conflicts universal description {build with g95} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100521/eed7205b/attachment.html>