Index: head/science/cgnslib/Makefile =================================================================== --- head/science/cgnslib/Makefile (revision 559284) +++ head/science/cgnslib/Makefile (revision 559285) @@ -1,64 +1,63 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= cgnslib PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= science MAINTAINER= thierry@FreeBSD.org COMMENT= CFD General Notation System library code LICENSE= AS-IS LICENSE_NAME= AS-IS LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cmake USE_GITHUB= yes GH_ACCOUNT= CGNS GH_PROJECT= CGNS USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes - -CONFLICTS_INSTALL= xcrysden-1.* # bin/unitconv TEST_TARGET= test FFLAGS+= -std=legacy OPTIONS_DEFINE= FORTRAN HDF5 TESTS TOOLS OPTIONS_DEFAULT= FORTRAN HDF5 TESTS TOOLS OPTIONS_SUB= yes HDF5_DESC= Enable HDF5 interface TESTS_DESC= Enable test programs TOOLS_DESC= Build the CGNSTools package FORTRAN_USES= fortran FORTRAN_CMAKE_BOOL= CGNS_ENABLE_FORTRAN HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 libsz.so:science/szip HDF5_CMAKE_BOOL= CGNS_ENABLE_HDF5 HDF5_CMAKE_ON= -DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include" TESTS_CMAKE_BOOL= CGNS_ENABLE_TESTS TOOLS_USES= gl localbase tk xorg TOOLS_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 TOOLS_USE= GL=egl,gl,glu \ XORG=ice,sm,x11,xau,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xtst,xv,xxf86vm TOOLS_CMAKE_BOOL= CGNS_BUILD_CGNSTOOLS TOOLS_CMAKE_ON= -DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \ -DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}" post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R} \ ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R} do-test: cd ${TEST_WRKSRC} && \ ${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE} .include Index: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt =================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt (nonexistent) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt (revision 559285) @@ -0,0 +1,15 @@ +--- src/cgnstools/cgnscalc/CMakeLists.txt.orig 2020-08-18 19:44:35 UTC ++++ src/cgnstools/cgnscalc/CMakeLists.txt +@@ -77,10 +77,10 @@ else (WIN32) + cgnscalc.sh + DESTINATION bin + RENAME cgnscalc) ++ # Do not install as unitconv to avoid a conflicy with XCrySDen + install(PROGRAMS + unitconv.sh +- DESTINATION bin +- RENAME unitconv) ++ DESTINATION bin) + install(FILES + cgnscalc.tcl + unitconv.tcl Property changes on: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_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/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix =================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix (nonexistent) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix (revision 559285) @@ -0,0 +1,14 @@ +--- src/cgnstools/cgnscalc/Makefile.unix.orig 2020-08-18 19:44:35 UTC ++++ src/cgnstools/cgnscalc/Makefile.unix +@@ -45,8 +45,9 @@ install-prog : + @echo "installing cgnscalc shell scripts to $(BIN_INSTALL_DIR)" + @$(INSTALL_PROG) cgnscalc.sh $(BIN_INSTALL_DIR)/cgnscalc + @chmod +x $(BIN_INSTALL_DIR)/cgnscalc +- @$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv +- @chmod +x $(BIN_INSTALL_DIR)/unitconv ++ # Do not install as unitconv to avoid a conflicy with XCrySDen ++ @$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv.sh ++ @chmod +x $(BIN_INSTALL_DIR)/unitconv.sh + @if [ ! -f $(EXE_INSTALL_DIR)/cgconfig ] ; then \ + echo "installing configuration file to $(EXE_INSTALL_DIR)"; \ + $(INSTALL_DATA) ../cgconfig $(EXE_INSTALL_DIR)/cgconfig; \ Property changes on: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix ___________________________________________________________________ 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/science/cgnslib/pkg-plist =================================================================== --- head/science/cgnslib/pkg-plist (revision 559284) +++ head/science/cgnslib/pkg-plist (revision 559285) @@ -1,103 +1,103 @@ %%HDF5%%bin/adf2hdf %%HDF5%%bin/hdf2adf %%TOOLS%%bin/cgconfig %%TOOLS%%bin/cgnscalc %%TOOLS%%bin/cgnsnodes %%TOOLS%%bin/cgnsplot %%TOOLS%%bin/cgnstools/aflr3_to_cgns %%TOOLS%%bin/cgnstools/calcwish %%TOOLS%%bin/cgnstools/cgiowish %%TOOLS%%bin/cgnstools/cgns_to_aflr3 %%TOOLS%%bin/cgnstools/cgns_to_fast %%TOOLS%%bin/cgnstools/cgns_to_plot3d %%TOOLS%%bin/cgnstools/cgns_to_tecplot %%TOOLS%%bin/cgnstools/cgns_to_vtk %%TOOLS%%bin/cgnstools/convert_dataclass %%TOOLS%%bin/cgnstools/convert_location %%TOOLS%%bin/cgnstools/convert_variables %%TOOLS%%bin/cgnstools/extract_subset %%TOOLS%%bin/cgnstools/fast_to_cgns %%TOOLS%%bin/cgnstools/interpolate_cgns %%TOOLS%%bin/cgnstools/patran_to_cgns %%TOOLS%%bin/cgnstools/plot3d_to_cgns %%TOOLS%%bin/cgnstools/plotwish %%TOOLS%%bin/cgnstools/tecplot_to_cgns %%TOOLS%%bin/cgnstools/tetgen_to_cgns %%TOOLS%%bin/cgnstools/update_ngon %%TOOLS%%bin/cgnstools/vgrid_to_cgns %%TOOLS%%bin/cgnsview -%%TOOLS%%bin/unitconv +%%TOOLS%%bin/unitconv.sh bin/cgnscheck bin/cgnscompress bin/cgnsconvert bin/cgnsdiff bin/cgnslist bin/cgnsnames bin/cgnsupdate %%FORTRAN%%include/cgns.mod include/cgnsBuild.defs include/cgns_io.h include/cgnsconfig.h include/cgnslib.h include/cgnstypes.h include/cgnstypes_f.h include/cgnstypes_f03.h include/cgnswin_f.h lib/libcgns.a lib/libcgns.so lib/libcgns.so.4 lib/libcgns.so.4.1 %%TOOLS%%share/cgnstools/aflr3.tcl %%TOOLS%%share/cgnstools/balloon.tcl %%TOOLS%%share/cgnstools/cgns-icon.xbm %%TOOLS%%share/cgnstools/cgns-mask.xbm %%TOOLS%%share/cgnstools/cgns.ico %%TOOLS%%share/cgnstools/cgns.png %%TOOLS%%share/cgnstools/cgns.tcl %%TOOLS%%share/cgnstools/cgnscalc-icon.xbm %%TOOLS%%share/cgnstools/cgnscalc-mask.xbm %%TOOLS%%share/cgnstools/cgnscalc.ico %%TOOLS%%share/cgnstools/cgnscalc.png %%TOOLS%%share/cgnstools/cgnscalc.tcl %%TOOLS%%share/cgnstools/cgnsnodes.tcl %%TOOLS%%share/cgnstools/cgnsplot-icon.xbm %%TOOLS%%share/cgnstools/cgnsplot-mask.xbm %%TOOLS%%share/cgnstools/cgnsplot.ico %%TOOLS%%share/cgnstools/cgnsplot.png %%TOOLS%%share/cgnstools/cgnsplot.tcl %%TOOLS%%share/cgnstools/cgnsview.tcl %%TOOLS%%share/cgnstools/color.tcl %%TOOLS%%share/cgnstools/combobox.tcl %%TOOLS%%share/cgnstools/config.tcl %%TOOLS%%share/cgnstools/conserved.cnv %%TOOLS%%share/cgnstools/convert.tcl %%TOOLS%%share/cgnstools/dialog.tcl %%TOOLS%%share/cgnstools/dimensional.cnv %%TOOLS%%share/cgnstools/editfile.tcl %%TOOLS%%share/cgnstools/export.tcl %%TOOLS%%share/cgnstools/fast.tcl %%TOOLS%%share/cgnstools/filesel.tcl %%TOOLS%%share/cgnstools/findfile.tcl %%TOOLS%%share/cgnstools/frame.tcl %%TOOLS%%share/cgnstools/help.tcl %%TOOLS%%share/cgnstools/import.tcl %%TOOLS%%share/cgnstools/menubar.tcl %%TOOLS%%share/cgnstools/patran.tcl %%TOOLS%%share/cgnstools/plot3d.tcl %%TOOLS%%share/cgnstools/primitive.cnv %%TOOLS%%share/cgnstools/tclIndex %%TOOLS%%share/cgnstools/tclreg.tcl %%TOOLS%%share/cgnstools/tecplot.tcl %%TOOLS%%share/cgnstools/tetgen.tcl %%TOOLS%%share/cgnstools/tkdir.tcl %%TOOLS%%share/cgnstools/tools.tcl %%TOOLS%%share/cgnstools/tree.tcl %%TOOLS%%share/cgnstools/unitconv.ico %%TOOLS%%share/cgnstools/unitconv.png %%TOOLS%%share/cgnstools/unitconv.tcl %%TOOLS%%share/cgnstools/unitconv.xbm %%TOOLS%%share/cgnstools/units.tcl %%TOOLS%%share/cgnstools/util.tcl %%TOOLS%%share/cgnstools/utilities.mnu %%TOOLS%%share/cgnstools/vgrid.tcl %%TOOLS%%share/cgnstools/vtk.tcl Index: head/science/xcrysden/Makefile =================================================================== --- head/science/xcrysden/Makefile (revision 559284) +++ head/science/xcrysden/Makefile (revision 559285) @@ -1,55 +1,55 @@ # $FreeBSD$ PORTNAME= xcrysden DISTVERSION= 1.6.2 CATEGORIES= science MASTER_SITES= http://www.xcrysden.org/download/ MAINTAINER= yuri@FreeBSD.org COMMENT= Crystalline and molecular structure visualisation program LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfftw3.so:math/fftw3 \ libgl2ps.so:print/gl2ps \ libTogl2.0.so:graphics/togl RUN_DEPENDS= bwidget>0:x11-toolkits/bwidget \ obabel:science/openbabel \ convert:graphics/ImageMagick6 \ ppmtompeg:graphics/netpbm \ xwd:x11/xwd USES= fortran gl gmake localbase:ldflags tcl tk xorg USE_GL= gl glu USE_XORG= x11 xmu -CONFLICTS_INSTALL= cgnslib-4.* # bin/unitconv +CONFLICTS_INSTALL= cgnslib-4.1.2,1 # bin/unitconv MAKE_ARGS= prefix=${STAGEDIR}${PREFIX} CFLAGS+= -fcommon # notified xcrysden ML on Sep 20, 2020 BINARY_ALIAS= make=gmake gcc=cc gfortran=gfortran${GCC_DEFAULT} OPTIONS_DEFINE= EXAMPLES PORTEXAMPLES= * post-patch: @${CP} ${FILESDIR}/Make.sys ${WRKSRC} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Make.sys @${RM} -r ${WRKSRC}/external/src post-install: # stagedir shouldn't be in executables @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${PREFIX}/bin/* # remove bad symlinks @${RM} \ ${STAGEDIR}${PREFIX}/share/doc/xcrysden/examples/examples \ ${STAGEDIR}${PREFIX}/share/xcrysden/examples @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xcrysden/* # move examples from the docs dir @${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR} .include