Updated, fixed, removed patch, and push

3 files changed, 16 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1efb62d1f6f3..24d8ee6e4213 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = hdf4
 	pkgdesc = General purpose library and file format for storing scientific data (version including the Java Native Interfaces - JNI)
-	pkgver = 4.2.14
-	pkgrel = 5
-	url = https://portal.hdfgroup.org/display/support/HDF+4.2.14
+	pkgver = 4.2.15
+	pkgrel = 1
+	url = https://portal.hdfgroup.org/display/support/HDF+4.2.15
 	arch = x86_64
 	license = custom
 	makedepends = java-environment
@@ -13,10 +13,8 @@ pkgbase = hdf4
 	provides = hdf4-java
 	conflicts = hdf4-java
 	replaces = hdf4-java
-	source = https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.14/src/hdf-4.2.14.tar.bz2
-	source = config.patch
-	md5sums = 3f3bd5da84015e9221d26fb5a80094b4
-	md5sums = e17d14ac1d27012c1ea9ac03f783d355
+	source = https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
+	md5sums = 27ab87b22c31906883a0bfaebced97cb
 
 pkgname = hdf4
 
diff --git a/PKGBUILD b/PKGBUILD
index 6c171139279e..2a2ce05198ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,35 @@
 # Contributor: David Scholl <djscholl at gmail dot com>
 
 pkgname=hdf4
-pkgver=4.2.14
-pkgrel=5
+pkgver=4.2.15
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data (version including the Java Native Interfaces - JNI)"
 arch=('x86_64')
-url="https://portal.hdfgroup.org/display/support/HDF+4.2.14"
+url="https://portal.hdfgroup.org/display/support/HDF+4.2.15"
 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"
-        "config.patch")
-md5sums=('3f3bd5da84015e9221d26fb5a80094b4'
-         'e17d14ac1d27012c1ea9ac03f783d355')
+source=("https://support.hdfgroup.org/ftp/HDF/releases/HDF${pkgver}/src/hdf-${pkgver}.tar.bz2")
+md5sums=('27ab87b22c31906883a0bfaebced97cb')
 
 prepare() {
     mkdir -p build
     cd "hdf-${pkgver}"
-    patch < "${srcdir}/config.patch"
     autoreconf -i
 }
 
 build() {
     cd build
 
-    "${srcdir}/hdf-${pkgver}"/configure \
+    "../hdf-${pkgver}"/configure \
         CFLAGS="${CFLAGS} -fPIC" \
+        CPPFLAGS="${CPPFLAGS} -I/usr/include/tirpc/" \
+        LDFLAGS="${LDFLAGS} -ltirpc" \
         FFLAGS="${FFLAGS} -fPIC -ffixed-line-length-none" \
-        LIBS="-ljpeg -laec -lsz" \
+        LIBS="${LIBS} -ljpeg -laec -lsz" \
         JAVADOC='javadoc -Xdoclint:none' \
         --enable-shared \
         --disable-static \
@@ -44,15 +43,14 @@ build() {
         --with-zlib \
         --with-szlib=/usr \
         --prefix=/opt/hdf4
-
-  make
+    make
 }
 
 package() {
     cd build
     make -j1 DESTDIR="${pkgdir}" install
     install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm 644 "${srcdir}/hdf-${pkgver}/COPYING" "${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
 }
diff --git a/config.patch b/config.patch
deleted file mode 100644
index 39531ce170e4..000000000000
--- a/config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/hdf-4.2.14/configure.ac b/src/hdf-4.2.14/configure.ac
-index 3030bad..6d7f654 100644
---- a/src/hdf-4.2.14/configure.ac
-+++ b/src/hdf-4.2.14/configure.ac
-@@ -685,6 +685,9 @@ case "$host" in
-   *-pc-cygwin*)
-     LIBS="$LIBS -ltirpc"
-     CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
-+  *-linux-gnu*)
-+    LIBS="$LIBS -ltirpc"
-+    CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
-   *) ;;
- esac
-