- GNU_CONFIGURE -> USE_LIBTOOL

- Support CFLAGS/PTHREAD_CFLAGS/PTHREAD_LIBS properly
- Strip binaries

PR:		40498
Submitted by:	Ports Fury

15 files changed, 108 insertions, 18 deletions

diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile
index 42a21b0b35dc..c43f4784cb27 100644
--- a/graphics/hdf5/Makefile
+++ b/graphics/hdf5/Makefile
@@ -17,14 +17,25 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LIBTOOLFILES=	configure c++/configure
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-cxx --enable-production \
 		--enable-threadsafe --disable-debug \
 		--with-ssl --with-pthread
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[\$$]CFLAGS -pthread|\$$CFLAGS|g ; \
+		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
+		 s|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g' \
+			${WRKSRC}/config/freebsd
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/config/gnu-flags
+
+post-install:
+.for file in gif2h5 h52gif h5debug h5dump h5import h5ls h5perf h5repart
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/hdf5/files/patch-c++::configure b/graphics/hdf5/files/patch-c++::configure
new file mode 100644
index 000000000000..ae57d3016cd8
--- /dev/null
+++ b/graphics/hdf5/files/patch-c++::configure
@@ -0,0 +1,10 @@
+--- c++/configure.orig	Fri Jun 28 03:42:45 2002
++++ c++/configure	Wed Jul 10 01:41:13 2002
+@@ -7563,6 +7563,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/hdf5/files/patch-commence.in b/graphics/hdf5/files/patch-commence.in
index c7f334bb1982..8da9308386cd 100644
--- a/graphics/hdf5/files/patch-commence.in
+++ b/graphics/hdf5/files/patch-commence.in
@@ -5,7 +5,7 @@
  CP=cp
  INSTALL=@INSTALL@
 -INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_PROGRAM=@INSTALL_DATA@
++INSTALL_PROGRAM=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  RUNSERIAL=@RUNSERIAL@
  RUNPARALLEL=@RUNPARALLEL@
diff --git a/graphics/hdf5/files/patch-configure b/graphics/hdf5/files/patch-configure
new file mode 100644
index 000000000000..2ee407ec215f
--- /dev/null
+++ b/graphics/hdf5/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jun 29 05:03:55 2002
++++ configure	Wed Jul 10 01:40:52 2002
+@@ -7263,6 +7263,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/hdf5/pkg-plist b/graphics/hdf5/pkg-plist
index 4e37599a505c..a1d316865919 100644
--- a/graphics/hdf5/pkg-plist
+++ b/graphics/hdf5/pkg-plist
@@ -71,8 +71,7 @@ include/H5pubconf.h
 include/H5public.h
 include/hdf5.h
 lib/libhdf5.a
-lib/libhdf5.la
 lib/libhdf5.settings
+lib/libhdf5.so
 lib/libhdf5.so.0
 lib/libhdf5_cpp.a
-lib/libhdf5_cpp.la
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 42a21b0b35dc..c43f4784cb27 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -17,14 +17,25 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LIBTOOLFILES=	configure c++/configure
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-cxx --enable-production \
 		--enable-threadsafe --disable-debug \
 		--with-ssl --with-pthread
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[\$$]CFLAGS -pthread|\$$CFLAGS|g ; \
+		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
+		 s|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g' \
+			${WRKSRC}/config/freebsd
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/config/gnu-flags
+
+post-install:
+.for file in gif2h5 h52gif h5debug h5dump h5import h5ls h5perf h5repart
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/science/hdf5-18/files/patch-c++::configure b/science/hdf5-18/files/patch-c++::configure
new file mode 100644
index 000000000000..ae57d3016cd8
--- /dev/null
+++ b/science/hdf5-18/files/patch-c++::configure
@@ -0,0 +1,10 @@
+--- c++/configure.orig	Fri Jun 28 03:42:45 2002
++++ c++/configure	Wed Jul 10 01:41:13 2002
+@@ -7563,6 +7563,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5-18/files/patch-commence.in b/science/hdf5-18/files/patch-commence.in
index c7f334bb1982..8da9308386cd 100644
--- a/science/hdf5-18/files/patch-commence.in
+++ b/science/hdf5-18/files/patch-commence.in
@@ -5,7 +5,7 @@
  CP=cp
  INSTALL=@INSTALL@
 -INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_PROGRAM=@INSTALL_DATA@
++INSTALL_PROGRAM=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  RUNSERIAL=@RUNSERIAL@
  RUNPARALLEL=@RUNPARALLEL@
diff --git a/science/hdf5-18/files/patch-configure b/science/hdf5-18/files/patch-configure
new file mode 100644
index 000000000000..2ee407ec215f
--- /dev/null
+++ b/science/hdf5-18/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jun 29 05:03:55 2002
++++ configure	Wed Jul 10 01:40:52 2002
+@@ -7263,6 +7263,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5-18/pkg-plist b/science/hdf5-18/pkg-plist
index 4e37599a505c..a1d316865919 100644
--- a/science/hdf5-18/pkg-plist
+++ b/science/hdf5-18/pkg-plist
@@ -71,8 +71,7 @@ include/H5pubconf.h
 include/H5public.h
 include/hdf5.h
 lib/libhdf5.a
-lib/libhdf5.la
 lib/libhdf5.settings
+lib/libhdf5.so
 lib/libhdf5.so.0
 lib/libhdf5_cpp.a
-lib/libhdf5_cpp.la
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index 42a21b0b35dc..c43f4784cb27 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -17,14 +17,25 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LIBTOOLFILES=	configure c++/configure
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-cxx --enable-production \
 		--enable-threadsafe --disable-debug \
 		--with-ssl --with-pthread
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[\$$]CFLAGS -pthread|\$$CFLAGS|g ; \
+		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
+		 s|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g' \
+			${WRKSRC}/config/freebsd
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/config/gnu-flags
+
+post-install:
+.for file in gif2h5 h52gif h5debug h5dump h5import h5ls h5perf h5repart
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/science/hdf5/files/patch-c++::configure b/science/hdf5/files/patch-c++::configure
new file mode 100644
index 000000000000..ae57d3016cd8
--- /dev/null
+++ b/science/hdf5/files/patch-c++::configure
@@ -0,0 +1,10 @@
+--- c++/configure.orig	Fri Jun 28 03:42:45 2002
++++ c++/configure	Wed Jul 10 01:41:13 2002
+@@ -7563,6 +7563,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5/files/patch-commence.in b/science/hdf5/files/patch-commence.in
index c7f334bb1982..8da9308386cd 100644
--- a/science/hdf5/files/patch-commence.in
+++ b/science/hdf5/files/patch-commence.in
@@ -5,7 +5,7 @@
  CP=cp
  INSTALL=@INSTALL@
 -INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_PROGRAM=@INSTALL_DATA@
++INSTALL_PROGRAM=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  RUNSERIAL=@RUNSERIAL@
  RUNPARALLEL=@RUNPARALLEL@
diff --git a/science/hdf5/files/patch-configure b/science/hdf5/files/patch-configure
new file mode 100644
index 000000000000..2ee407ec215f
--- /dev/null
+++ b/science/hdf5/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jun 29 05:03:55 2002
++++ configure	Wed Jul 10 01:40:52 2002
+@@ -7263,6 +7263,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5/pkg-plist b/science/hdf5/pkg-plist
index 4e37599a505c..a1d316865919 100644
--- a/science/hdf5/pkg-plist
+++ b/science/hdf5/pkg-plist
@@ -71,8 +71,7 @@ include/H5pubconf.h
 include/H5public.h
 include/hdf5.h
 lib/libhdf5.a
-lib/libhdf5.la
 lib/libhdf5.settings
+lib/libhdf5.so
 lib/libhdf5.so.0
 lib/libhdf5_cpp.a
-lib/libhdf5_cpp.la