Index: head/math/metis/Makefile =================================================================== --- head/math/metis/Makefile (revision 469180) +++ head/math/metis/Makefile (revision 469181) @@ -1,137 +1,122 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= metis PORTVERSION= 5.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ MAINTAINER= ports@FreeBSD.org COMMENT= Package for unstructured graph partitioning LICENSE= APACHE20 CONFLICTS= metis4-4* metis-edf-[0-9]* USES= cmake:noninja OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS OPENMP_DESC= multithreading via OpenMP #PROFILE_DESC= profiling libraries SHARED_DESC= shared library and dynamically-linked executables STATIC_DESC= libmetis archive OPTIONS_DEFAULT= SHARED STATIC BINS= cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis .include .if ${PORT_OPTIONS:MOPENMP} CMAKE_ARGS+= -DOPENMP=1 USE_GCC= any .endif -#.if ${PORT_OPTIONS:MPROFILE} -#.if !exists(/usr/lib/libc_p.a) -#IGNORE = : you have enabled the PROFILE option, but have not installed \ -# the base system profiling libraries -#.endif -#ALL_TARGET_PROFILE= metis -#CMAKE_ARGS_PROFILE= -DGPROF=1 -#PLIST_SUB+= PROFILE="" -##PROFILE_FLAGS ?= -pg -#WRKSRC_PROFILE = ${WRKSRC}_PROFILE -#INSTALL_WRKSRC_PROFILE = ${WRKSRC_PROFILE}/libmetis -#.else -#PLIST_SUB+= PROFILE="@comment " -#.endif - .if ${PORT_OPTIONS:MSHARED} ALL_TARGET_SHARED= all CMAKE_ARGS_SHARED= -DSHARED=1 PLIST_SUB+= SHARED="" .if ${ARCH} == "sparc64" SHARED_FLAGS?= -fPIC .else SHARED_FLAGS?= -fpic .endif SHLIB_MAJOR?= 2 CMAKE_ARGS+= -DSHLIB_MAJOR="${SHLIB_MAJOR}" USE_LDCONFIG= yes WRKSRC_SHARED= ${WRKSRC}_SHARED INSTALL_WRKSRC_SHARED= ${WRKSRC_SHARED} .else PLIST_SUB+= SHARED="@comment " .endif .if ${PORT_OPTIONS:MSTATIC} ALL_TARGET_STATIC= metis PLIST_SUB+= STATIC="" WRKSRC_STATIC= ${WRKSRC} INSTALL_WRKSRC_STATIC= ${WRKSRC_STATIC}/libmetis .else PLIST_SUB+= STATIC="@comment " .endif -post-patch: +pre-configure: @${REINPLACE_CMD} -e "/^# Add compiler flags/,/^$$/d" \ -e "/^check_include_file(execinfo.h/d" \ ${WRKSRC}/GKlib/GKlibSystem.cmake @${REINPLACE_CMD} -e "\|/home/karypis/|d" \ ${WRKSRC}/programs/CMakeLists.txt .for o in SHARED #PROFILE .if ${PORT_OPTIONS:M${o}} @${CP} -R ${WRKSRC} ${WRKSRC_${o}} .endif .endfor do-configure: .for o in SHARED STATIC #PROFILE .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\nConfiguring ${o}:\n\n\n" @cd ${WRKSRC_${o}}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS:C|${CFLAGS}|& ${${o}_FLAGS}|g} ${CMAKE_ARGS_${o}} \ -DGKLIB_PATH="${WRKSRC_${o}}/GKlib" ${CMAKE_SOURCE_PATH} .endif .endfor do-build: .for o in SHARED STATIC #PROFILE .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\nBuilding ${o}:\n\n\n" @cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ ${MAKE_ARGS} ${ALL_TARGET_${o}} .endif .endfor .if ${PORT_OPTIONS:MSHARED} @cd ${WRKSRC_SHARED}/programs; ${STRIP_CMD} ${BINS} @cd ${WRKSRC_SHARED}/libmetis; ${STRIP_CMD} libmetis.so.* .endif .if ${PORT_OPTIONS:MSTATIC} @cd ${WRKSRC_STATIC}/libmetis; ${STRIP_CMD} libmetis.a .endif check regression-test test: build cd ${WRKSRC_SHARED}/graphs ; ../programs/gpmetis ./4elt.graph 5 do-install: .for o in SHARED STATIC #PROFILE .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\nInstalling ${o}:\n\n\n" @cd ${INSTALL_WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ ${MAKE_ARGS} install .endif .endfor .if ${PORT_OPTIONS:MDOCS} PORTDOCS= manual.pdf post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${STAGEDIR}${DOCSDIR} .endif .include Index: head/math/metis/files/patch-CMakeLists.txt =================================================================== --- head/math/metis/files/patch-CMakeLists.txt (nonexistent) +++ head/math/metis/files/patch-CMakeLists.txt (revision 469181) @@ -0,0 +1,8 @@ +--- CMakeLists.txt.orig 2013-03-30 16:24:45 UTC ++++ CMakeLists.txt +@@ -25,3 +25,5 @@ include_directories(include) + add_subdirectory("include") + add_subdirectory("libmetis") + add_subdirectory("programs") ++# Borrowed from metis-edf ++add_subdirectory("GKlib") Property changes on: head/math/metis/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/metis/files/patch-libmetis__CMakeLists.txt =================================================================== --- head/math/metis/files/patch-libmetis__CMakeLists.txt (revision 469180) +++ head/math/metis/files/patch-libmetis__CMakeLists.txt (revision 469181) @@ -1,12 +1,23 @@ ---- libmetis/CMakeLists.txt.orig 2011-06-22 13:47:13.000000000 -0400 -+++ libmetis/CMakeLists.txt 2012-07-07 11:05:47.000000000 -0400 -@@ -4,6 +4,9 @@ +--- libmetis/CMakeLists.txt.orig 2013-03-30 16:24:45 UTC ++++ libmetis/CMakeLists.txt +@@ -2,8 +2,13 @@ + include_directories(.) + # Find sources. file(GLOB metis_sources *.c) ++# Borrowed from metis-edf ++file(GLOB libmetis_h *.h) # Build libmetis. add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) +if(SHARED) + set_target_properties(metis PROPERTIES SOVERSION ${SHLIB_MAJOR}) +endif() if(UNIX) target_link_libraries(metis m) + endif() +@@ -13,4 +18,6 @@ if(METIS_INSTALL) + LIBRARY DESTINATION lib + RUNTIME DESTINATION lib + ARCHIVE DESTINATION lib) ++# Borrowed from metis-edf ++ install(FILES ${libmetis_h} DESTINATION include/libmetis) endif() Index: head/math/metis/files/patch-programs_CMakeLists.txt =================================================================== --- head/math/metis/files/patch-programs_CMakeLists.txt (nonexistent) +++ head/math/metis/files/patch-programs_CMakeLists.txt (revision 469181) @@ -0,0 +1,17 @@ +--- programs/CMakeLists.txt.orig 2013-03-30 16:24:45 UTC ++++ programs/CMakeLists.txt +@@ -13,9 +13,14 @@ foreach(prog gpmetis ndmetis mpmetis m2g + # target_link_libraries(${prog} metis profiler) + endforeach(prog) + ++# Borrowed from metis-edf ++file(GLOB metis_h *.h) ++ + if(METIS_INSTALL) + install(TARGETS gpmetis ndmetis mpmetis m2gmetis graphchk cmpfillin + RUNTIME DESTINATION bin) ++# Borrowed from metis-edf ++ install(FILES ${metis_h} DESTINATION include/programs) + endif() + + # Try to find subversion revision. Property changes on: head/math/metis/files/patch-programs_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/metis/pkg-plist =================================================================== --- head/math/metis/pkg-plist (revision 469180) +++ head/math/metis/pkg-plist (revision 469181) @@ -1,10 +1,44 @@ %%SHARED%%bin/cmpfillin %%SHARED%%bin/gpmetis %%SHARED%%bin/graphchk %%SHARED%%bin/m2gmetis %%SHARED%%bin/mpmetis %%SHARED%%bin/ndmetis +%%SHARED%%include/GKlib.h +%%SHARED%%include/gk_arch.h +%%SHARED%%include/gk_defs.h +%%SHARED%%include/gk_externs.h +%%SHARED%%include/gk_getopt.h +%%SHARED%%include/gk_macros.h +%%SHARED%%include/gk_mkblas.h +%%SHARED%%include/gk_mkmemory.h +%%SHARED%%include/gk_mkpqueue.h +%%SHARED%%include/gk_mkpqueue2.h +%%SHARED%%include/gk_mkrandom.h +%%SHARED%%include/gk_mksort.h +%%SHARED%%include/gk_mkutils.h +%%SHARED%%include/gk_proto.h +%%SHARED%%include/gk_struct.h +%%SHARED%%include/gk_types.h +%%SHARED%%include/gkregex.h +%%STATIC%%include/libmetis/defs.h +%%STATIC%%include/libmetis/gklib_defs.h +%%STATIC%%include/libmetis/gklib_rename.h +%%STATIC%%include/libmetis/macros.h +%%STATIC%%include/libmetis/metislib.h +%%STATIC%%include/libmetis/proto.h +%%STATIC%%include/libmetis/rename.h +%%STATIC%%include/libmetis/stdheaders.h +%%STATIC%%include/libmetis/struct.h %%SHARED%%include/metis.h +%%SHARED%%include/ms_inttypes.h +%%SHARED%%include/ms_stat.h +%%SHARED%%include/ms_stdint.h +%%SHARED%%include/programs/defs.h +%%SHARED%%include/programs/metisbin.h +%%SHARED%%include/programs/proto.h +%%SHARED%%include/programs/struct.h +%%SHARED%%lib/libGKlib.a %%STATIC%%lib/libmetis.a %%SHARED%%lib/libmetis.so %%SHARED%%lib/libmetis.so.2