Attachment 110693 Details for Bug 151883 – file.diff

[patch] file.diff

file.diff (text/plain), 2.94 KB, created by Robert Farmer on 2010-11-02 02:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Farmer

Created: 2010-11-02 02:20:06 UTC

Size: 2.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/science/hdf-java/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- Makefile	10 Jun 2010 11:43:09 -0000	1.2
>+++ Makefile	1 Nov 2010 10:50:26 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	hdf-java
> PORTVERSION=	2.6.1
>+PORTREVISION=	1
> CATEGORIES=	science java
> MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/ \
> 		http://www.predatorlabs.net/dl/
>@@ -17,6 +18,7 @@
> 
> LIB_DEPENDS=	hdf5.6:${PORTSDIR}/science/hdf5-18
> 
>+USE_LDCONFIG=	yes
> USE_JAVA=	yes
> JAVA_VERSION=	1.5+
> JAVA_BUILD=	yes
>@@ -29,9 +31,18 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>+OPTIONS=	SZIP "SZIP support (must match with science/hdf5-18)" off
>+
>+.include <bsd.port.options.mk>
>+
>+.if defined(WITH_SZIP)
>+CONFIGURE_ARGS+=	--with-libsz=${LOCALBASE}/lib
>+.endif
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' ${WRKSRC}/configure
> 	${REINPLACE_CMD} -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' ${WRKSRC}/configure
>+	${REINPLACE_CMD} -e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' ${WRKSRC}/configure
> 	${REINPLACE_CMD} -e 's|LLEXT="a"|LLEXT="so"|g' ${WRKSRC}/configure
> 	${REINPLACE_CMD} -e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure
> 	${REINPLACE_CMD} -e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|' ${WRKSRC}/Makefile.in
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/science/hdf-java/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	10 Jun 2010 11:43:09 -0000	1.2
>+++ distinfo	1 Nov 2010 10:47:23 -0000
>@@ -1,3 +1,2 @@
>-MD5 (hdf-java-2.6.1-src.tar) = c3cd791560291c659b493d97e63a9e8e
> SHA256 (hdf-java-2.6.1-src.tar) = 14abf95abe9a863b03d396e87da463da4746e54f05f5c63aef583461ef1401ea
> SIZE (hdf-java-2.6.1-src.tar) = 10393600
>Index: files/patch-configure
>===================================================================
>RCS file: files/patch-configure
>diff -N files/patch-configure
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-configure	1 Nov 2010 10:47:23 -0000
>@@ -0,0 +1,28 @@
>+--- configure.orig	2010-11-01 02:54:27.000000000 -0700
>++++ configure	2010-11-01 02:56:20.000000000 -0700
>+@@ -4424,12 +4424,6 @@
>+ 	if test $ ! -d "$JH45INST" $; then
>+ 		JH45INST_FOUND=0
>+ 	fi
>+-	if test $ ! -w "$JH45INST" $; then
>+-		{ { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
>+-echo "$as_me: error:  $JAVINST : not writable " >&2;}
>+-   { (exit 1); exit 1; }; }
>+-		JH45INST_FOUND=0
>+-	fi
>+ fi
>+ until test $JH45INST_FOUND -eq 1; do
>+ 	echo "Please type the directory in which to install the JH45"
>+@@ -4438,12 +4432,6 @@
>+ 	if test $ ! -d "$JH45INST" $; then
>+ 		JH45INST_FOUND=0
>+ 	fi
>+-	if test $ ! -w "$JH45INST" $; then
>+-		{ { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
>+-echo "$as_me: error:  $JAVINST : not writable " >&2;}
>+-   { (exit 1); exit 1; }; }
>+-		JH45INST_FOUND=0
>+-	fi
>+ done
>+ 
>+ ac_cv_lib_JH45INST=$JH45INST

Actions: View | Diff

Attachments on bug 151883: 110693