From 71c24b7d64b6833911e9b13c6dfd16e68abdab5f Mon Sep 17 00:00:00 2001 From: fd0 Date: Sat, 30 Nov 2013 20:28:06 +0900 Subject: [PATCH] CBFlib-0.9.3.3 (WIP) --- CBFlib/CBFlib-0.9.2.4-1bl1.cygport | 22 --- CBFlib/CBFlib-0.9.2.4-1bl1.src.patch | 108 ----------- CBFlib/CBFlib-0.9.3.3-1bl1.cygport | 34 ++++ CBFlib/CBFlib-0.9.3.3-1bl1.src.patch | 266 +++++++++++++++++++++++++++ CBFlib/CBFlib.hint | 10 - CBFlib/README | 131 +++++++------ CBFlib/libcbf-devel.hint | 11 -- CBFlib/libcbf0.hint | 11 -- 8 files changed, 371 insertions(+), 222 deletions(-) delete mode 100644 CBFlib/CBFlib-0.9.2.4-1bl1.cygport delete mode 100644 CBFlib/CBFlib-0.9.2.4-1bl1.src.patch create mode 100644 CBFlib/CBFlib-0.9.3.3-1bl1.cygport create mode 100644 CBFlib/CBFlib-0.9.3.3-1bl1.src.patch delete mode 100644 CBFlib/CBFlib.hint delete mode 100644 CBFlib/libcbf-devel.hint delete mode 100644 CBFlib/libcbf0.hint diff --git a/CBFlib/CBFlib-0.9.2.4-1bl1.cygport b/CBFlib/CBFlib-0.9.2.4-1bl1.cygport deleted file mode 100644 index c0e38ebf1..000000000 --- a/CBFlib/CBFlib-0.9.2.4-1bl1.cygport +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Crystallographic Binary File and Image Library" -HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" -SRC_URI="mirror://sourceforge/cbflib/${P}.tar.gz" - -DIFF_EXCLUDES="Makefile" - -PKG_NAMES=" - ${PN} - libcbf0 - libcbf-devel -" -CBFlib_CONTENTS=" - usr/bin/*.exe - usr/share -" -libcbf0_CONTENTS=" - usr/bin/*.dll -" -libcbf_devel_CONTENTS=" - usr/include - usr/lib -" diff --git a/CBFlib/CBFlib-0.9.2.4-1bl1.src.patch b/CBFlib/CBFlib-0.9.2.4-1bl1.src.patch deleted file mode 100644 index a0b04325f..000000000 --- a/CBFlib/CBFlib-0.9.2.4-1bl1.src.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- origsrc/CBFlib-0.9.2.4/Makefile.am 1970-01-01 09:00:00.000000000 +0900 -+++ src/CBFlib-0.9.2.4/Makefile.am 2012-03-28 11:20:44.111713800 +0900 -@@ -0,0 +1,64 @@ -+ -+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/examples -+ -+ -+bin_PROGRAMS = adscimg2cbf cbf2adscimg adscimg2cbf \ -+convert_image convert_minicbf makecbf img2cif cif2cbf cif2c -+ -+adscimg2cbf_SOURCES = examples/adscimg2cbf.c examples/adscimg2cbf_sub.c -+adscimg2cbf_LDADD = libcbf.la -+cbf2adscimg_SOURCES = examples/cbf2adscimg.c examples/cbf2adscimg_sub.c -+cbf2adscimg_LDADD = libcbf.la -+convert_image_SOURCES = examples/convert_image.c -+convert_image_LDADD = libcbf.la -+convert_minicbf_SOURCES = examples/convert_minicbf.c -+convert_minicbf_LDADD = libcbf.la -+makecbf_SOURCES = examples/makecbf.c -+makecbf_LDADD = libcbf.la -+img2cif_SOURCES = examples/img2cif.c -+img2cif_LDADD = libcbf.la -+cif2cbf_SOURCES = examples/cif2cbf.c -+cif2cbf_LDADD = libcbf.la -+cif2c_SOURCES = examples/cif2c.c -+cif2c_LDADD = libcbf.la -+ -+ -+cbf_includedir = $(includedir)/cbf -+cbf_include_HEADERS = examples/img.h \ -+include/cbf.h include/cbf_alloc.h \ -+include/cbf_ascii.h include/cbf_binary.h \ -+include/cbf_byte_offset.h include/cbf_canonical.h \ -+include/cbf_codes.h include/cbf_compress.h \ -+include/cbf_context.h include/cbf_copy.h \ -+include/cbf_file.h include/cbf_getopt.h \ -+include/cbf_lex.h include/cbf_packed.h \ -+include/cbf_predictor.h include/cbf_read_binary.h \ -+include/cbf_read_mime.h include/cbf_simple.h \ -+include/cbf_string.h include/cbf_stx.h \ -+include/cbf_tree.h include/cbf_uncompressed.h \ -+include/cbf_write.h include/cbf_write_binary.h \ -+include/cbf_ws.h include/cbff.h \ -+include/global.h include/md5.h -+ -+ -+lib_LTLIBRARIES = libcbf.la libfcb.la -+ -+libcbf_la_CPPFLAGS = -DCBF_DONT_USE_LONG_LONG -D_USE_XOPEN_EXTENDED -+libcbf_la_LDFLAGS = -no-undefined -+libcbf_la_SOURCES = examples/img.c \ -+src/cbf.c src/cbf_alloc.c src/cbf_ascii.c \ -+src/cbf_binary.c src/cbf_byte_offset.c src/cbf_canonical.c \ -+src/cbf_codes.c src/cbf_compress.c src/cbf_context.c \ -+src/cbf_copy.c src/cbf_file.c src/cbf_getopt.c \ -+src/cbf_lex.c src/cbf_packed.c src/cbf_predictor.c \ -+src/cbf_read_binary.c src/cbf_read_mime.c src/cbf_simple.c \ -+src/cbf_string.c src/cbf_stx.c src/cbf_tree.c \ -+src/cbf_uncompressed.c src/cbf_write.c src/cbf_write_binary.c \ -+src/cbf_ws.c src/cbff.c src/md5c.c -+ -+libfcb_la_FCFLAGS = -fno-range-check -+libfcb_la_LDFLAGS = -no-undefined -+libfcb_la_SOURCES = \ -+src/fcb_atol_wcnt.f90 src/fcb_ci_strncmparr.f90 src/fcb_nblen_array.f90 \ -+src/fcb_read_byte.f90 src/fcb_read_line.f90 src/fcb_skip_whitespace.f90 -+ ---- origsrc/CBFlib-0.9.2.4/configure.ac 1970-01-01 09:00:00.000000000 +0900 -+++ src/CBFlib-0.9.2.4/configure.ac 2012-03-28 11:18:02.033588800 +0900 -@@ -0,0 +1,38 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.68]) -+AC_INIT([CBFlib], [0.9.2.4]) -+AC_CONFIG_SRCDIR([examples/adscimg2cbf.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_YACC -+AC_PROG_CC -+AC_PROG_CPP -+AC_PROG_FC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_PROG_MAKE_SET -+LT_INIT([disable-static]) -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_FUNC_ALLOCA -+AC_CHECK_HEADERS([float.h libintl.h limits.h malloc.h stddef.h stdlib.h string.h unistd.h wchar.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_HEADER_STDBOOL -+AC_TYPE_SIZE_T -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_FUNC_REALLOC -+AC_FUNC_STRTOD -+AC_CHECK_FUNCS([floor memmove memset pow regcomp rint sqrt strcasecmp strchr strcspn strerror strncasecmp strpbrk strspn strstr strtol strtoul]) -+ -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT diff --git a/CBFlib/CBFlib-0.9.3.3-1bl1.cygport b/CBFlib/CBFlib-0.9.3.3-1bl1.cygport new file mode 100644 index 000000000..517eac570 --- /dev/null +++ b/CBFlib/CBFlib-0.9.3.3-1bl1.cygport @@ -0,0 +1,34 @@ +HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" +SRC_URI="mirror://sourceforge/cbflib/${P}.tar.gz" + +CATEGORY="Science" +SUMMARY="Library providing a simple mechanism for accessing CBF files and imgCIF files" +DESCRIPTION="CBFLIB is a library of ANSI-C functions providing a simple mechanism for +accessing Crystallographic Binary Files (CBF files) and Image-supporting CIF +(imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for mmCIF +files." + +export FCFLAGS="-fno-range-check" + +inherit cmake + +PKG_NAMES=" + ${PN} + libcbf2.0.0 + libcbf-devel +" +CBFlib_CONTENTS=" + usr/bin/*.exe + usr/share +" +libcbf2_0_0_CONTENTS=" + usr/bin/*.dll +" +libcbf_devel_CONTENTS=" + usr/include + usr/lib +" + +CBFlib_SUMMARY="${SUMMARY} (utilities)" +libcbf2_0_0_SUMMARY="${SUMMARY} (runtime)" +libcbf_devel_SUMMARY="${SUMMARY} (development)" diff --git a/CBFlib/CBFlib-0.9.3.3-1bl1.src.patch b/CBFlib/CBFlib-0.9.3.3-1bl1.src.patch new file mode 100644 index 000000000..f7bdc88c0 --- /dev/null +++ b/CBFlib/CBFlib-0.9.3.3-1bl1.src.patch @@ -0,0 +1,266 @@ +--- origsrc/CBFlib-0.9.3.3/CMakeLists.txt 2013-11-08 23:54:21.000000000 +0900 ++++ src/CBFlib-0.9.3.3/CMakeLists.txt 2013-11-30 20:10:34.208261400 +0900 +@@ -281,6 +281,8 @@ set (CBF_CMAKE_DEBUG "ON") + + set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing") + ++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") ++ + # + # User setable parameters + # +@@ -366,12 +368,20 @@ endmacro(CBF_LOAD_TARBALL) + # + macro(CBF_ADD_C_EXAMPLE PGMNAME EXDIR EXTRASRCS EXTRALIBS) + add_executable(${PGMNAME} "${EXDIR}/${PGMNAME}.c" "${EXTRASRCS}") +- target_link_libraries(${PGMNAME} cbf_static ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ if (CYGWIN) ++ target_link_libraries(${PGMNAME} cbf_shared ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ else (CYGWIN) ++ target_link_libraries(${PGMNAME} cbf_static ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ endif (CYGWIN) + endmacro(CBF_ADD_C_EXAMPLE) + + macro(CBF_ADD_CXX_EXAMPLE PGMNAME EXDIR EXTRASRCS EXTRALIBS) + add_executable(${PGMNAME} "${EXDIR}/${PGMNAME}.C" "${EXTRASRCS}") +- target_link_libraries(${PGMNAME} cbf_static ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ if (CYGWIN) ++ target_link_libraries(${PGMNAME} cbf_shared ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ else (CYGWIN) ++ target_link_libraries(${PGMNAME} cbf_static ${CBF_HDF5_LIBRARY_PATH} ${EXTRALIBS}) ++ endif (CYGWIN) + endmacro(CBF_ADD_CXX_EXAMPLE) + + +@@ -531,6 +541,10 @@ find_package(ZLIB) + + + #Load external packages in build directory at cmake time ++if (CYGWIN) ++find_package(HDF5) ++find_package(PCRE) ++else (CYGWIN) + add_subdirectory(${CBF__EXTERNAL_PACKAGES} "${CBF__EXT_PKG}") + + find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}") +@@ -564,7 +578,7 @@ if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUA + MESSAGE(STATUS "Then rerun cmake") + MESSAGE(WARNING "Finishing run to make Makefiles") + endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||") +- ++endif (CYGWIN) + + # + # Data Directories +@@ -588,6 +602,7 @@ CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATA + # + # Verify the checksums + # ++if (NOT CYGWIN) + file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*") + file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*") + foreach(loop_file ${CBF_DATADIRI_FILES} ) +@@ -608,7 +623,7 @@ foreach(loop_file ${CBF_DATADIRO_FILES} + endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) + endif (NOT "${loop_file}" MATCHES "[*.]md5") + endforeach(loop_file) +- ++endif (CYGWIN) + + # + # Source files +@@ -761,13 +776,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CB + # Build the static and shared CBF libraries + # + +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") +-add_library(cbf_static STATIC ${CBF_C_SOURCES}) +-set_target_properties(cbf_static PROPERTIES OUTPUT_NAME "cbf") +-set_target_properties(cbf_static PROPERTIES LINKER_LANGUAGE C) +-set_target_properties(cbf_static PROPERTIES SOVERSION "${CBF_APIVERSION}") +- ++if (NOT CYGWIN) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") ++ add_library(cbf_static STATIC ${CBF_C_SOURCES}) ++ set_target_properties(cbf_static PROPERTIES OUTPUT_NAME "cbf") ++ set_target_properties(cbf_static PROPERTIES LINKER_LANGUAGE C) ++ set_target_properties(cbf_static PROPERTIES SOVERSION "${CBF_APIVERSION}") ++endif (CYGWIN) + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") +@@ -775,22 +791,24 @@ add_library(cbf_shared SHARED ${CBF_C_S + set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf") + set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C) + set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}") +-target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH}) ++target_link_libraries(cbf_shared ${HDF5_hdf5_LIBRARY}) + + # + # Build the static and shared IMG libraries + # + +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") +-add_library(img_static STATIC ${CBF__EXAMPLES}/img.c) +-set_target_properties(img_static PROPERTIES OUTPUT_NAME "img") +-set_target_properties(img_static PROPERTIES LINKER_LANGUAGE C) +- ++if (NOT CYGWIN) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") ++ add_library(img_static STATIC ${CBF__EXAMPLES}/img.c) ++ set_target_properties(img_static PROPERTIES OUTPUT_NAME "cbfimg") ++ set_target_properties(img_static PROPERTIES LINKER_LANGUAGE C) ++endif (NOT CYGWIN) + + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") + add_library(img_shared SHARED ${CBF__EXAMPLES}/img.c) +-set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img") ++set_target_properties(img_shared PROPERTIES OUTPUT_NAME "cbfimg") + set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C) ++set_target_properties(img_shared PROPERTIES SOVERSION "${CBF_APIVERSION}") + target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH}) + + +@@ -813,30 +831,32 @@ endforeach(f90src) + # + # Build the fcb libraries + # +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") +-add_library(fcb_static STATIC ${CBF_F90_BUILT_SOURCES};${CBF_F90_SOURCES}) +-set_target_properties(fcb_static PROPERTIES OUTPUT_NAME "fcb") +-set_target_properties(fcb_static PROPERTIES LINKER_LANGUAGE C) +- ++if (NOT CYGWIN) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/lib") ++ add_library(fcb_static STATIC ${CBF_F90_BUILT_SOURCES};${CBF_F90_SOURCES}) ++ set_target_properties(fcb_static PROPERTIES OUTPUT_NAME "fcb") ++ set_target_properties(fcb_static PROPERTIES LINKER_LANGUAGE C) ++endif (NOT CYGWIN) + + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") + add_library(fcb_shared SHARED ${CBF_F90_BUILT_SOURCES};${CBF_F90_SOURCES}) + set_target_properties(fcb_shared PROPERTIES OUTPUT_NAME "fcb") + set_target_properties(fcb_shared PROPERTIES LINKER_LANGUAGE C) ++set_target_properties(fcb_shared PROPERTIES SOVERSION "${CBF_APIVERSION}") + target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH}) + + + # + # C and C++ examples + # +-CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static") ++CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_shared") + CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "") +-CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static") ++CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_shared") + CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "") + CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "") + CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "") +-CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static") ++CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_shared") + CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "") +@@ -844,7 +864,9 @@ CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF_ + CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "") + CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "") ++if (NOT CYGWIN) + CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}") ++endif (NOT CYGWIN) + CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "") + CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "") +@@ -868,8 +890,8 @@ add_custom_command(OUTPUT "${CBF__BLDEXM + + add_executable(test_fcb_read_image "${CBF__BLDEXMP}/test_fcb_read_image.f90") + add_executable(test_xds_binary "${CBF__BLDEXMP}/test_xds_binary.f90") +-target_link_libraries(test_fcb_read_image fcb_static) +-target_link_libraries(test_xds_binary fcb_static) ++target_link_libraries(test_fcb_read_image fcb_shared) ++target_link_libraries(test_xds_binary fcb_shared) + + + +@@ -889,13 +911,33 @@ install (TARGETS cbf_template_t DESTINAT + install (TARGETS testcell DESTINATION bin) + install (TARGETS sauter_test DESTINATION bin) + install (TARGETS sequence_match DESTINATION bin) +-install (TARGETS tiff2cbf DESTINATION bin) +-install (TARGETS cbf_static DESTINATION lib) +-install (TARGETS cbf_shared DESTINATION lib) +-install (TARGETS fcb_static DESTINATION lib) +-install (TARGETS fcb_shared DESTINATION lib) +-install (TARGETS img_static DESTINATION lib) +-install (TARGETS img_shared DESTINATION lib) ++if (NOT CYGWIN) ++ install (TARGETS tiff2cbf DESTINATION bin) ++endif (NOT CYGWIN) ++if (NOT CYGWIN) ++ install (TARGETS cbf_static DESTINATION lib) ++endif (NOT CYGWIN) ++if (CYGWIN) ++ install (TARGETS cbf_shared RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) ++else (CYGWIN) ++ install (TARGETS cbf_shared DESTINATION lib) ++endif (CYGWIN) ++if (NOT CYGWIN) ++ install (TARGETS fcb_static DESTINATION lib) ++endif (NOT CYGWIN) ++if (CYGWIN) ++ install (TARGETS fcb_shared RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) ++else (CYGWIN) ++ install (TARGETS fcb_shared DESTINATION lib) ++endif (CYGWIN) ++if (NOT CYGWIN) ++ install (TARGETS img_static DESTINATION lib) ++endif (NOT CYGWIN) ++if (CYGWIN) ++ install (TARGETS img_shared RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) ++else (CYGWIN) ++ install (TARGETS img_shared DESTINATION lib) ++endif (CYGWIN) + install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") + install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") + +--- origsrc/CBFlib-0.9.3.3/FindPCRE.cmake 1970-01-01 09:00:00.000000000 +0900 ++++ src/CBFlib-0.9.3.3/FindPCRE.cmake 2013-11-30 19:19:32.318613000 +0900 +@@ -0,0 +1,35 @@ ++# ++# $Id$ ++# ++# - Find pcre ++# Find the native PCRE includes and library ++# ++# PCRE_INCLUDE_DIRS - where to find pcre.h, etc. ++# PCRE_LIBRARIES - List of libraries when using pcre. ++# PCRE_FOUND - True if pcre found. ++ ++ ++IF (PCRE_INCLUDE_DIRS) ++ # Already in cache, be silent ++ SET(PCRE_FIND_QUIETLY TRUE) ++ENDIF (PCRE_INCLUDE_DIRS) ++ ++FIND_PATH(PCRE_INCLUDE_DIR pcre.h) ++ ++SET(PCRE_NAMES pcre) ++FIND_LIBRARY(PCRE_LIBRARY NAMES ${PCRE_NAMES} ) ++ ++# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if ++# all listed variables are TRUE ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) ++ ++IF(PCRE_FOUND) ++ SET( PCRE_LIBRARIES ${PCRE_LIBRARY} ) ++ SET( PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR} ) ++ELSE(PCRE_FOUND) ++ SET( PCRE_LIBRARIES ) ++ SET( PCRE_INCLUDE_DIRS ) ++ENDIF(PCRE_FOUND) ++ ++MARK_AS_ADVANCED( PCRE_LIBRARIES PCRE_INCLUDE_DIRS ) diff --git a/CBFlib/CBFlib.hint b/CBFlib/CBFlib.hint deleted file mode 100644 index 5d5d64bd5..000000000 --- a/CBFlib/CBFlib.hint +++ /dev/null @@ -1,10 +0,0 @@ -category: Libs -requires: cygwin libcbf0 -sdesc: "Crystallographic Binary File and Image Library (utilities)" -ldesc: "CBFlib (Crystallographic Binary File library) is a library of ANSI-C -functions providing a simple mechanism for accessing Crystallographic Binary -Files (CBF files) and Image-supporting CIF (imgCIF) files. The CBFlib API is -loosely based on the CIFPARSE API for mmCIF files. Like CIFPARSE, CBFlib does -not perform any semantic integrity checks; rather it simply provides functions -to create, read, modify and write CBF binary data files and imgCIF ASCII data -files." diff --git a/CBFlib/README b/CBFlib/README index fdd6b631b..07ae18d8f 100644 --- a/CBFlib/README +++ b/CBFlib/README @@ -1,49 +1,50 @@ CBFlib ------------------------------------------ -CBFlib (Crystallographic Binary File library) is a library of ANSI-C functions -providing a simple mechanism for accessing Crystallographic Binary Files (CBF -files) and Image-supporting CIF (imgCIF) files. The CBFlib API is loosely -based on the CIFPARSE API for mmCIF files. Like CIFPARSE, CBFlib does not -perform any semantic integrity checks; rather it simply provides functions to -create, read, modify and write CBF binary data files and imgCIF ASCII data +CBFLIB is a library of ANSI-C functions providing a simple mechanism for +accessing Crystallographic Binary Files (CBF files) and Image-supporting CIF +(imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for mmCIF files. Runtime requirements: - cygwin-1.7.11-1 - libgfortran3-4.5.3-3 + cygwin-1.7.26-1 + libcbf2.0.0-0.9.3.3-1bl1 + libgcc1-4.8.2-1 + libgfortran3-4.8.2-1 + libhdf5_8-1.8.11-1 + libstdc++6-4.8.2-1 Build requirements: (besides corresponding -devel packages) - autoconf-10-1 - automake-4-10 - binutils-2.22.51-2 - cygport-0.10.9-1 - gawk-4.0.0-1 - gcc4-core-4.5.3-3 - gcc4-gfortran-4.5.3-3 + binutils-2.23.51-1 + bison-2.7.1-1 + cmake-2.8.11.2-1 + cygport-0.14.1-1 + gcc-core-4.8.2-1 + gcc-fortran-4.8.2-1 + gcc-g++-4.8.2-1 libtool-2.4-1 - make-3.82.90-1 + make-4.0-2 Canonical website: http://www.bernstein-plus-sons.com/software/CBF/ Canonical download: - mirror://sourceforge/cbflib/CBFlib-0.9.2.4.tar.gz + mirror://sourceforge/cbflib/CBFlib-0.9.3.3.tar.gz ------------------------------------------- Build instructions: - unpack CBFlib-0.9.2.4-X-src.tar.bz2 + unpack CBFlib-0.9.3.3-X-src.tar.xz if you use setup to install this src package, it will be - unpacked under /usr/src automatically + unpacked under /usr/src automatically cd /usr/src - cygport ./CBFlib-0.9.2.4-X.cygport all + cygport ./CBFlib-0.9.3.3-X.cygport all This will create: - /usr/src/CBFlib-0.9.2.4-X-src.tar.bz2 - /usr/src/CBFlib-0.9.2.4-X.tar.bz2 - /usr/src/libcbf0-0.9.2.4-X.tar.bz2 - /usr/src/libcbf-devel-0.9.2.4-X.tar.bz2 + /usr/src/CBFlib-0.9.3.3-X-src.tar.xz + /usr/src/CBFlib-0.9.3.3-X.tar.xz + /usr/src/libcbf2.0.0-0.9.3.3-X.tar.xz + /usr/src/libcbf-devel-0.9.3.3-X.tar.xz ------------------------------------------- @@ -52,59 +53,69 @@ Files included in the binary package: (CBFlib) /usr/bin/adscimg2cbf.exe /usr/bin/cbf2adscimg.exe - /usr/bin/cif2c.exe + /usr/bin/cbf_template_t.exe + /usr/bin/changtestcompression.exe /usr/bin/cif2cbf.exe /usr/bin/convert_image.exe /usr/bin/convert_minicbf.exe /usr/bin/img2cif.exe /usr/bin/makecbf.exe - /usr/share/doc/CBFlib/GPL.txt + /usr/bin/minicbf2nexus.exe + /usr/bin/sauter_test.exe + /usr/bin/sequence_match.exe + /usr/bin/testcell.exe /usr/share/doc/CBFlib/README /usr/share/doc/Cygwin/CBFlib.README -(libcbf0) - /usr/bin/cygcbf-0.dll - /usr/bin/cygfcb-0.dll +(libcbf2.0.0) + /usr/bin/cygcbf-2.0.0.dll + /usr/bin/cygcbfimg-2.0.0.dll + /usr/bin/cygfcb-2.0.0.dll (libcbf-devel) - /usr/include/cbf/cbf.h - /usr/include/cbf/cbf_alloc.h - /usr/include/cbf/cbf_ascii.h - /usr/include/cbf/cbf_binary.h - /usr/include/cbf/cbf_byte_offset.h - /usr/include/cbf/cbf_canonical.h - /usr/include/cbf/cbf_codes.h - /usr/include/cbf/cbf_compress.h - /usr/include/cbf/cbf_context.h - /usr/include/cbf/cbf_copy.h - /usr/include/cbf/cbf_file.h - /usr/include/cbf/cbf_getopt.h - /usr/include/cbf/cbf_lex.h - /usr/include/cbf/cbf_packed.h - /usr/include/cbf/cbf_predictor.h - /usr/include/cbf/cbf_read_binary.h - /usr/include/cbf/cbf_read_mime.h - /usr/include/cbf/cbf_simple.h - /usr/include/cbf/cbf_string.h - /usr/include/cbf/cbf_stx.h - /usr/include/cbf/cbf_tree.h - /usr/include/cbf/cbf_uncompressed.h - /usr/include/cbf/cbf_write.h - /usr/include/cbf/cbf_write_binary.h - /usr/include/cbf/cbf_ws.h - /usr/include/cbf/cbff.h - /usr/include/cbf/global.h - /usr/include/cbf/img.h - /usr/include/cbf/md5.h + /usr/include/cbflib/cbf.h + /usr/include/cbflib/cbf_alloc.h + /usr/include/cbflib/cbf_ascii.h + /usr/include/cbflib/cbf_binary.h + /usr/include/cbflib/cbf_byte_offset.h + /usr/include/cbflib/cbf_canonical.h + /usr/include/cbflib/cbf_codes.h + /usr/include/cbflib/cbf_compress.h + /usr/include/cbflib/cbf_context.h + /usr/include/cbflib/cbf_copy.h + /usr/include/cbflib/cbf_file.h + /usr/include/cbflib/cbf_getopt.h + /usr/include/cbflib/cbf_hdf5.h + /usr/include/cbflib/cbf_hdf5_filter.h + /usr/include/cbflib/cbf_lex.h + /usr/include/cbflib/cbf_nibble_offset.h + /usr/include/cbflib/cbf_packed.h + /usr/include/cbflib/cbf_predictor.h + /usr/include/cbflib/cbf_read_binary.h + /usr/include/cbflib/cbf_read_mime.h + /usr/include/cbflib/cbf_simple.h + /usr/include/cbflib/cbf_string.h + /usr/include/cbflib/cbf_stx.h + /usr/include/cbflib/cbf_tree.h + /usr/include/cbflib/cbf_ulp.h + /usr/include/cbflib/cbf_uncompressed.h + /usr/include/cbflib/cbf_write.h + /usr/include/cbflib/cbf_write_binary.h + /usr/include/cbflib/cbf_ws.h + /usr/include/cbflib/cbff.h + /usr/include/cbflib/global.h + /usr/include/cbflib/md5.h /usr/lib/libcbf.dll.a - /usr/lib/libcbf.la + /usr/lib/libcbfimg.dll.a /usr/lib/libfcb.dll.a - /usr/lib/libfcb.la ------------------ Port Notes: +----- version 0.9.3.3-1bl1 ----- +Version bump. + ----- version 0.9.2.4-1bl1 ----- Initial release for Cygwin-1.7 by fd0 diff --git a/CBFlib/libcbf-devel.hint b/CBFlib/libcbf-devel.hint deleted file mode 100644 index 4bb8406d2..000000000 --- a/CBFlib/libcbf-devel.hint +++ /dev/null @@ -1,11 +0,0 @@ -category: Devel Libs -requires: cygwin libcbf0 -external-source: CBFlib -sdesc: "Crystallographic Binary File and Image Library (development)" -ldesc: "CBFlib (Crystallographic Binary File library) is a library of ANSI-C -functions providing a simple mechanism for accessing Crystallographic Binary -Files (CBF files) and Image-supporting CIF (imgCIF) files. The CBFlib API is -loosely based on the CIFPARSE API for mmCIF files. Like CIFPARSE, CBFlib does -not perform any semantic integrity checks; rather it simply provides functions -to create, read, modify and write CBF binary data files and imgCIF ASCII data -files." diff --git a/CBFlib/libcbf0.hint b/CBFlib/libcbf0.hint deleted file mode 100644 index 6e6cb4ee9..000000000 --- a/CBFlib/libcbf0.hint +++ /dev/null @@ -1,11 +0,0 @@ -category: Libs -requires: cygwin libgfortran3 -external-source: CBFlib -sdesc: "Crystallographic Binary File and Image Library (runtime)" -ldesc: "CBFlib (Crystallographic Binary File library) is a library of ANSI-C -functions providing a simple mechanism for accessing Crystallographic Binary -Files (CBF files) and Image-supporting CIF (imgCIF) files. The CBFlib API is -loosely based on the CIFPARSE API for mmCIF files. Like CIFPARSE, CBFlib does -not perform any semantic integrity checks; rather it simply provides functions -to create, read, modify and write CBF binary data files and imgCIF ASCII data -files."