View | Details | Raw Unified | Return to bug 163601
Collapse All | Expand All

(-)Makefile (-15 / +32 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	hdf-java
8
PORTNAME=	hdf-java
9
PORTVERSION=	2.7
9
PORTVERSION=	2.8
10
PORTREVISION=	1
11
CATEGORIES=	science java
10
CATEGORIES=	science java
12
MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/ \
11
MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/ \
13
		http://www.predatorlabs.net/dl/
12
		http://www.predatorlabs.net/dl/
Lines 16-35 Link Here
16
MAINTAINER=	rfarmer@predatorlabs.net
15
MAINTAINER=	rfarmer@predatorlabs.net
17
COMMENT=	Java interface to HDF5
16
COMMENT=	Java interface to HDF5
18
17
19
LIB_DEPENDS=	hdf5.7:${PORTSDIR}/science/hdf5-18
18
LIB_DEPENDS=	hdf5.7:${PORTSDIR}/science/hdf5-18 \
19
		jpeg.11:${PORTSDIR}/graphics/jpeg
20
20
21
USE_JAVA=	yes
21
USE_JAVA=	yes
22
JAVA_VERSION=	1.5+
22
JAVA_VERSION=	1.6+
23
JAVA_BUILD=	yes
23
JAVA_BUILD=	yes
24
JAVA_RUN=	yes
24
JAVA_RUN=	yes
25
25
26
USE_DOS2UNIX=	yes
26
USE_DOS2UNIX=	yes
27
DOS2UNIX_REGEX=	.*/examples/.*Makefile.in
27
DOS2UNIX_REGEX=	.*/examples/.*Makefile.in
28
28
29
USE_GMAKE=	yes
29
GNU_CONFIGURE=	yes
30
GNU_CONFIGURE=	yes
30
CONFIGURE_ARGS=	--with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \
31
CONFIGURE_ARGS=	--with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \
31
		--with-hdf5=${LOCALBASE}/include \
32
		--with-hdf5=${LOCALBASE}/include \
32
		--with-libz=/lib
33
		--with-libz=/lib \
34
		--with-libjpeg=${LOCALBASE} \
35
		--without-hdf4 \
36
		--without-h4toh5
33
37
34
WRKSRC=		${WRKDIR}/${PORTNAME}
38
WRKSRC=		${WRKDIR}/${PORTNAME}
35
39
Lines 39-62 Link Here
39
43
40
.if defined(WITH_SZIP)
44
.if defined(WITH_SZIP)
41
CONFIGURE_ARGS+=	--with-libsz=${LOCALBASE}/lib
45
CONFIGURE_ARGS+=	--with-libsz=${LOCALBASE}/lib
46
.else
47
CONFIGURE_ARGS+=	--without-libsz
48
.endif
49
50
.if !defined(NOPORTDOCS)
51
ALL_TARGET=	all javadocs
42
.endif
52
.endif
43
53
44
post-patch:
54
post-patch:
45
	${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' ${WRKSRC}/configure
55
	@${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' \
46
	${REINPLACE_CMD} -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' ${WRKSRC}/configure
56
		-e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' \
47
	${REINPLACE_CMD} -e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' ${WRKSRC}/configure
57
		-e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' \
48
	${REINPLACE_CMD} -e 's|LLEXT="a"|LLEXT="so"|g' ${WRKSRC}/configure
58
		-e 's|LLEXT="a"|LLEXT="so"|g' \
49
	${REINPLACE_CMD} -e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure
59
		-e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure
50
	${REINPLACE_CMD} -e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|' ${WRKSRC}/Makefile.in
60
	@${REINPLACE_CMD} -e 's|LIBDIR=$$(JH45INSTALLDIR)|LIBDIR=${PREFIX}|' \
51
	${REINPLACE_CMD} -e 's|$$(LIBDIR)/@JAVATARG@|${PREFIX}/lib|g' ${WRKSRC}/Makefile.in
61
		-e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|g' \
52
	${REINPLACE_CMD} -e 's|cp -R|#|' ${WRKSRC}/Makefile.in
62
		-e 's|INSTALL_LIB |${INSTALL_LIB} |' \
53
	${REINPLACE_CMD} -e 's|cp ./lib/@JAVATARG@|${INSTALL_PROGRAM} ./lib/@JAVATARG@|g' ${WRKSRC}/Makefile.in
63
		-e 's|cp |${INSTALL_DATA} |g' ${WRKSRC}/Makefile.in
54
	${REINPLACE_CMD} -e 's|cp |${INSTALL_DATA} |g' ${WRKSRC}/Makefile.in
64
	@${REINPLACE_CMD} -e\
65
		's|$$HDFJAVA"/lib/freebsd:"$$HDFJAVA"/lib/ext|${PREFIX}/lib"|' \
66
		-e 's|$$HDFJAVA"/lib|${JAVAJARDIR}"|g' \
67
		${WRKSRC}/bin/hdfview.sh.in
55
68
56
post-install:
69
post-install:
57
.if !defined(NOPORTDOCS)
70
.if !defined(NOPORTDOCS)
58
	${MKDIR} ${DOCSDIR}/UsersGuide
71
	${MKDIR} ${DOCSDIR}/UsersGuide
59
	(cd ${WRKSRC}/docs/hdfview/ && ${COPYTREE_SHARE} "UsersGuide" ${DOCSDIR}/)
72
	(cd ${WRKSRC}/docs/hdfview/ && ${COPYTREE_SHARE} "UsersGuide" ${DOCSDIR}/)
73
	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} "javadocs" ${DOCSDIR}/)
60
.endif
74
.endif
61
75
76
regression-test: build
77
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check
78
62
.include <bsd.port.mk>
79
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (hdf-java-2.7-src.tar) = 091c999cf53266ba113bef45a83912b12444624cfe0253d5eb565b95e0832706
1
SHA256 (hdf-java-2.8-src.tar) = bc1b1eb2b9e40c2a23aff295818526ba007cdf8d43bb9a3d1cb117304b56fbb5
2
SIZE (hdf-java-2.7-src.tar) = 13209600
2
SIZE (hdf-java-2.8-src.tar) = 13670400
(-)pkg-plist (-4 / +139 lines)
Lines 63-68 Link Here
63
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug05spreadsheet.html
63
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug05spreadsheet.html
64
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug06imageview.html
64
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug06imageview.html
65
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug07textview.html
65
%%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug07textview.html
66
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFArray.html
67
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFChunkInfo.html
68
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFCompInfo.html
69
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFConstants.html
70
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFDeflateCompInfo.html
71
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFDeprecated.html
72
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFException.html
73
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFIMCOMPCompInfo.html
74
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFJavaException.html
75
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFJPEGCompInfo.html
76
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFLibrary.html
77
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFLibraryException.html
78
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNativeData.html
79
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNBITChunkInfo.html
80
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNBITCompInfo.html
81
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNewCompInfo.html
82
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNotImplementedException.html
83
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFOldCompInfo.html
84
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFOldRLECompInfo.html
85
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFRLECompInfo.html
86
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFSKPHUFFCompInfo.html
87
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFSZIPCompInfo.html
88
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFTable.html
89
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-frame.html
90
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-summary.html
91
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-tree.html
92
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/Callbacks.html
93
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5D_iterate_cb.html
94
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5D_iterate_t.html
95
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5L_iterate_cb.html
96
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5L_iterate_t.html
97
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5O_iterate_cb.html
98
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5O_iterate_t.html
99
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-frame.html
100
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-summary.html
101
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-tree.html
102
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5AtomException.html
103
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5AttributeException.html
104
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5BtreeException.html
105
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataFiltersException.html
106
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DatasetInterfaceException.html
107
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataspaceInterfaceException.html
108
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataStorageException.html
109
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DatatypeInterfaceException.html
110
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5Exception.html
111
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ExternalFileListException.html
112
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FileInterfaceException.html
113
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FunctionArgumentException.html
114
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FunctionEntryExitException.html
115
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5HeapException.html
116
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5InternalErrorException.html
117
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5JavaException.html
118
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5LibraryException.html
119
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5LowLevelIOException.html
120
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5MetaDataCacheException.html
121
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ObjectHeaderException.html
122
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5PropertyListInterfaceException.html
123
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ReferenceException.html
124
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ResourceUnavailableException.html
125
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5SymbolTableException.html
126
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-frame.html
127
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-summary.html
128
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-tree.html
129
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5_ih_info_t.html
130
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5A_info_t.html
131
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5AC_cache_config_t.html
132
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5G_info_t.html
133
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5L_info_t.html
134
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5O_hdr_info_t.html
135
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5O_info_t.html
136
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-frame.html
137
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-summary.html
138
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-tree.html
139
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/H5.html
140
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDF5Constants.html
141
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDF5GroupInfo.html
142
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDFArray.html
143
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDFNativeData.html
144
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-frame.html
145
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-summary.html
146
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-tree.html
147
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Attribute.html
148
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/CompoundDS.html
149
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/DataFormat.html
150
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Dataset.html
151
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Datatype.html
152
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/FileFormat.html
153
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Group.html
154
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/HObject.html
155
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Metadata.html
156
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/ScalarDS.html
157
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Datatype.html
158
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4File.html
159
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4GRImage.html
160
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Group.html
161
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4SDS.html
162
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Vdata.html
163
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-frame.html
164
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-summary.html
165
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-tree.html
166
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5CompoundDS.html
167
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Datatype.html
168
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5File.html
169
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Group.html
170
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Link.html
171
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5ScalarDS.html
172
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-frame.html
173
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-summary.html
174
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-tree.html
175
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-frame.html
176
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-summary.html
177
%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-tree.html
178
%%PORTDOCS%%%%DOCSDIR%%/javadocs/package-list
179
%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-frame.html
180
%%PORTDOCS%%%%DOCSDIR%%/javadocs/constant-values.html
181
%%PORTDOCS%%%%DOCSDIR%%/javadocs/serialized-form.html
182
%%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/inherit.gif
183
%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-tree.html
184
%%PORTDOCS%%%%DOCSDIR%%/javadocs/index-all.html
185
%%PORTDOCS%%%%DOCSDIR%%/javadocs/deprecated-list.html
186
%%PORTDOCS%%%%DOCSDIR%%/javadocs/allclasses-frame.html
187
%%PORTDOCS%%%%DOCSDIR%%/javadocs/allclasses-noframe.html
188
%%PORTDOCS%%%%DOCSDIR%%/javadocs/index.html
189
%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-summary.html
190
%%PORTDOCS%%%%DOCSDIR%%/javadocs/help-doc.html
191
%%PORTDOCS%%%%DOCSDIR%%/javadocs/stylesheet.css
66
share/java/classes/ext/fitsobj.jar
192
share/java/classes/ext/fitsobj.jar
67
share/java/classes/ext/nc2obj.jar
193
share/java/classes/ext/nc2obj.jar
68
share/java/classes/fits.jar
194
share/java/classes/fits.jar
Lines 70-80 Link Here
70
share/java/classes/jhdf5obj.jar
196
share/java/classes/jhdf5obj.jar
71
share/java/classes/jhdfobj.jar
197
share/java/classes/jhdfobj.jar
72
share/java/classes/jhdfview.jar
198
share/java/classes/jhdfview.jar
73
share/java/classes/junit.jar
74
share/java/classes/netcdf.jar
199
share/java/classes/netcdf.jar
75
@dirrm share/java/classes/ext
200
@dirrmtry share/java/classes/ext
76
%%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide/images
201
%%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide/images
77
%%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide
202
%%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide
203
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/resources
204
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object/h5
205
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object/h4
206
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object
207
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs
208
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions
209
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks
210
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib
211
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdflib
212
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf
213
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa
214
%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs
78
%%PORTDOCS%%@dirrm %%DOCSDIR%%
215
%%PORTDOCS%%@dirrm %%DOCSDIR%%
79
@dirrm UsersGuide
80
@exec mkdir -p %D/UsersGuide
(-)files/patch-Makefile.in (+76 lines)
Added Link Here
1
--- ./Makefile.in.orig	2011-11-29 12:19:58.000000000 -0800
2
+++ ./Makefile.in	2011-12-21 15:03:05.000000000 -0800
3
@@ -283,18 +283,8 @@
4
 uninstall: uninstall-jhdfview uninstall-jhdfobj uninstall-lib uninstall-jhi uninstall-jhi5 
5
 
6
 install-lib: natives
7
-	-mkdir -p $(LIBDIR);
8
-	-mkdir -p $(LIBDIR)/@JAVATARG@
9
 	@if test -n "$(H5INC)" ; then \
10
-	cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
11
-	@if test -n "$(H5INC)/../lib" ; then \
12
-	cp $(H5INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
13
-	@if test -n "$(H4INC)" ; then \
14
-	cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
15
-	@if test -n "$(H4INC)/../lib" ; then \
16
-	cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
17
-	@if test -n "$(H45INC)" ; then \
18
-	cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
19
+	INSTALL_LIB $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/ ; fi
20
 	@echo "Install Natives complete"
21
 
22
 install-hdflib: 
23
@@ -325,7 +315,6 @@
24
 	@if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf ; fi
25
 
26
 do-install-jhdf: jhdf-packages
27
-	-mkdir -p $(LIBDIR);
28
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
29
 	@echo "Install JHI complete"
30
 
31
@@ -333,42 +322,30 @@
32
 	@if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5 ; fi
33
 
34
 do-install-jhdf5: jhdf5-packages
35
-	-mkdir -p $(LIBDIR);
36
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
37
 	@echo "Install JHI5 complete"
38
 
39
 install-jhdfobj: ncsa.hdf.object
40
-	-mkdir -p $(LIBDIR);
41
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
42
 	@if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf4obj ; fi
43
 	@if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5obj ; fi
44
 	@echo "Install HDFOBJ complete"
45
 
46
 do-install-jhdf4obj: ncsa.hdf.object.h4
47
-	-mkdir -p $(LIBDIR);
48
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
49
 	@echo "Install JHDF4 complete"
50
 
51
 do-install-jhdf5obj: ncsa.hdf.object.h5
52
-	-mkdir -p $(LIBDIR);
53
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
54
 	@echo "Install JHDF4 complete"
55
 
56
 install-jhdfview: ncsa.hdf.view
57
-	-mkdir -p $(LIBDIR);
58
 	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
59
-	-mkdir -p $(LIBDIR)/ext
60
+	-mkdir -p $(JH45INSTALLDIR)/lib/ext
61
 	$(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
62
 	$(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
63
-	$(RM) -rf $(UGDIR);
64
-	-mkdir -p $(UGDIR);
65
-	cp -R docs/hdfview/UsersGuide/* $(UGDIR);	
66
-	$(RM) -rf $(UGDIR)/.svn
67
-	$(RM) -rf $(UGDIR)/images/.svn
68
-	-mkdir -p $(BINDIR);
69
-	cp lib/netcdf.jar $(LIBDIR)
70
-	cp lib/fits.jar $(LIBDIR)
71
-	cp lib/junit.jar $(LIBDIR)
72
+	cp lib/netcdf.jar $(JH45INSTALLDIR)/lib
73
+	cp lib/fits.jar $(JH45INSTALLDIR)/lib
74
 	cp bin/hdfview.sh $(BINDIR)
75
 	chmod a+x $(BINDIR)/hdfview.sh
76
 	@echo "Install HDFVIEW complete"
(-)files/patch-configure (-17 / +17 lines)
Lines 1-28 Link Here
1
--- configure.orig	2010-11-01 02:54:27.000000000 -0700
1
--- ./configure.orig	2011-12-21 15:16:44.000000000 -0800
2
+++ configure	2010-11-01 02:56:20.000000000 -0700
2
+++ ./configure	2011-12-21 15:18:28.000000000 -0800
3
@@ -4424,12 +4424,6 @@
3
@@ -4424,12 +4424,6 @@
4
 	if test \( ! -d "$JH45INST" \); then
4
   if test \( ! -d "$JH45INST" \); then
5
 		JH45INST_FOUND=0
5
     JH45INST_FOUND=0
6
 	fi
6
   fi
7
-	if test \( ! -w "$JH45INST" \); then
7
-  if test \( ! -w "$JH45INST" \); then
8
-		{ { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
8
-    { { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
9
-echo "$as_me: error:  $JAVINST : not writable " >&2;}
9
-echo "$as_me: error:  $JAVINST : not writable " >&2;}
10
-   { (exit 1); exit 1; }; }
10
-   { (exit 1); exit 1; }; }
11
-		JH45INST_FOUND=0
11
-    JH45INST_FOUND=0
12
-	fi
12
-  fi
13
 fi
13
 fi
14
 until test $JH45INST_FOUND -eq 1; do
14
 until test $JH45INST_FOUND -eq 1; do
15
 	echo "Please type the directory in which to install the JH45"
15
   echo "Please type the directory in which to install the JH45"
16
@@ -4438,12 +4432,6 @@
16
@@ -4438,12 +4432,6 @@
17
 	if test \( ! -d "$JH45INST" \); then
17
   if test \( ! -d "$JH45INST" \); then
18
 		JH45INST_FOUND=0
18
     JH45INST_FOUND=0
19
 	fi
19
   fi
20
-	if test \( ! -w "$JH45INST" \); then
20
-  if test \( ! -w "$JH45INST" \); then
21
-		{ { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
21
-    { { echo "$as_me:$LINENO: error:  $JAVINST : not writable " >&5
22
-echo "$as_me: error:  $JAVINST : not writable " >&2;}
22
-echo "$as_me: error:  $JAVINST : not writable " >&2;}
23
-   { (exit 1); exit 1; }; }
23
-   { (exit 1); exit 1; }; }
24
-		JH45INST_FOUND=0
24
-    JH45INST_FOUND=0
25
-	fi
25
-  fi
26
 done
26
 done
27
 
27
 
28
 ac_cv_lib_JH45INST=$JH45INST
28
 ac_cv_lib_JH45INST=$JH45INST

Return to bug 163601