v4.3.0

2 files changed, 22 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fabff9a3c6fc..d89be0ec7f9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
 pkgbase = hdf4
-	pkgdesc = General purpose library and file format for storing scientific data (version including the Java Native Interfaces - JNI)
-	pkgver = 4.2.16
+	pkgdesc = General purpose library and file format for storing scientific data
+	pkgver = 4.3.0
 	pkgrel = 1
-	url = https://portal.hdfgroup.org/display/support/HDF+4.2.15
+	url = https://portal.hdfgroup.org
 	arch = x86_64
 	license = custom
-	makedepends = java-environment
 	depends = libaec
 	depends = zlib
 	depends = libjpeg-turbo
 	depends = libtirpc
-	provides = hdf4-java
-	conflicts = hdf4-java
-	replaces = hdf4-java
-	source = https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.16-2/src/hdf-4.2.16-2.tar.bz2
-	sha256sums = c5c3234b5012258aef2e4432f649b31c21b26015afba1857ad83640c3f2b692c
+	depends = netcdf
+	source = https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf4.3.0.tar.gz
+	sha256sums = a6639a556650e6ea8632a17b8188a69de844bdff54ce121a1fd5b92c8dd06cb1
 
 pkgname = hdf4
diff --git a/PKGBUILD b/PKGBUILD
index e2c39f5caaf4..9ce2b28f8d1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,48 @@
-# Maintainer : George Eleftheriou <eleftg>
-# Maintainer : XavierCLL <xavier dot corredor dot llano at gmail dot com>
+# Maintainer: XavierCLL
+# Contributor: George Eleftheriou <eleftg>
 # Contributor: Jingbei Li <petronny>
 # Contributor: David Scholl <djscholl at gmail dot com>
 
 pkgname=hdf4
-pkgver=4.2.16
-_pkgver=4.2.16-2
+pkgver=4.3.0
 pkgrel=1
-pkgdesc="General purpose library and file format for storing scientific data (version including the Java Native Interfaces - JNI)"
+pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
-url="https://portal.hdfgroup.org/display/support/HDF+4.2.15"
+url="https://portal.hdfgroup.org"
 license=('custom')
-depends=('libaec' 'zlib' 'libjpeg-turbo' 'libtirpc')
-makedepends=('java-environment')
-conflicts=('hdf4-java')
-provides=('hdf4-java')
-replaces=('hdf4-java')
-source=("https://support.hdfgroup.org/ftp/HDF/releases/HDF${_pkgver}/src/hdf-${_pkgver}.tar.bz2")
-sha256sums=('c5c3234b5012258aef2e4432f649b31c21b26015afba1857ad83640c3f2b692c')
+depends=('libaec' 'zlib' 'libjpeg-turbo' 'libtirpc' 'netcdf')
+source=("https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf${pkgver}.tar.gz")
+sha256sums=('a6639a556650e6ea8632a17b8188a69de844bdff54ce121a1fd5b92c8dd06cb1')
 
 prepare() {
-    mkdir -p build
-    cd "hdf-${_pkgver}"
+    cd "${pkgname}-hdf${pkgver}"
     autoreconf -i
 }
 
 build() {
-    cd build
+    cd "${pkgname}-hdf${pkgver}"
 
-    "../hdf-${_pkgver}"/configure \
+    ./configure \
         CFLAGS="${CFLAGS} -fPIC" \
         CPPFLAGS="${CPPFLAGS} -I/usr/include/tirpc/" \
         LDFLAGS="${LDFLAGS} -ltirpc" \
         FFLAGS="${FFLAGS} -fPIC -ffixed-line-length-none" \
         LIBS="${LIBS} -ljpeg -laec -lsz" \
-        JAVADOC='javadoc -Xdoclint:none' \
         --enable-shared \
         --disable-static \
         --disable-fortran \
-        --disable-netcdf \
-        --enable-java \
-        --enable-production \
         --with-zlib \
-        --with-szlib=/usr \
+        --with-szlib=yes \
         --prefix=/opt/hdf4
     make
 }
 
 package() {
-    cd build
+    cd "${pkgname}-hdf${pkgver}"
     make -j1 DESTDIR="${pkgdir}" install
     install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm 644 "../hdf-${_pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -dm 755 "${pkgdir}/etc/ld.so.conf.d"
-    echo "/opt/${pkgname}/lib" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
+    install -Dm 644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -dm 755 "${pkgdir}/etc/ld.so.conf.d/"
+    echo "/opt/${pkgname}/lib" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
 }