From 9a8005b8ae8a787e47f79ad470d37e2f3368ba06 Mon Sep 17 00:00:00 2001 From: Tim Hentenaar Date: Tue, 28 Apr 2026 11:57:22 -0400 Subject: [PATCH] arb: change openmotif to motif and bump revision * Remove unneeded dependency on libXp and sablotron * Add a dependency on libXi to satisfy XLIBS * files/changeset_18439.diff dos -> unix line endings * Update the compiler blacklist as this version of arb fails with anything newer than clang 13. --- science/arb/Portfile | 18 +- science/arb/files/arb-no-xprint.diff | 11 + science/arb/files/changeset_18439.diff | 308 ++++++++++++------------- 3 files changed, 175 insertions(+), 162 deletions(-) create mode 100644 science/arb/files/arb-no-xprint.diff diff --git a/science/arb/Portfile b/science/arb/Portfile index d3400d5f965..24a60a13a98 100644 --- a/science/arb/Portfile +++ b/science/arb/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 name arb epoch 2 version 6.0.6 -revision 4 +revision 5 checksums rmd160 3bc93a511a6eabb108e9811a3c66ea25182da19f \ sha256 8b1fc3fd11bbb05aca4731ac8803c004a4f2b6b87c11b543660d07ea349a6c21 \ size 13286019 @@ -39,15 +39,16 @@ conflicts elixir depends_build port:makedepend \ port:pkgconfig -depends_lib port:openmotif \ +depends_lib port:motif \ port:lynx \ port:gsed \ - port:sablotron \ + path:bin/xsltproc:libxslt \ port:glw \ port:glew \ port:xfig \ port:gv \ port:xorg-libXaw \ + port:xorg-libXi \ port:gtime \ path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:libpng \ @@ -67,8 +68,9 @@ patchfiles patch-ARB-config.makefile.diff \ patch-ARB-intro.fig.diff \ patch-ARB-subfams.cpp.diff \ changeset_18439.diff \ - patch-ARB-arb.diff - + patch-ARB-arb.diff \ + arb-no-xprint.diff + platform darwin { if {${os.major} < 11} { depends_build-append path:libexec/coreutils/libstdbuf.so:coreutils @@ -93,7 +95,7 @@ build.env-append PREFIX=${prefix} \ ARBHOME=${worksrcpath} \ PATH=${worksrcpath}/bin:$env(PATH) -compiler.blacklist *gcc-4.0 *gcc-4.2 {clang < 138} +compiler.blacklist *gcc-4.0 *gcc-4.2 {clang < 138} {clang > 1400} {macports-clang-1[456789]} macports-clang-2* build.args-append CXX=${configure.cxx} \ CC=${configure.cc} @@ -153,7 +155,7 @@ You have two options (A is easier, B is more difficult): A) Easy - open a new terminal window and type arb_macsetup to set the necessary environment variables automatically. This script also enables keyboard shortcuts used in the sequence editor. or - + B) More difficult - follow the steps below: 1) @@ -167,7 +169,7 @@ bash users add the following lines to your ~/.profile or to your ~/.bashrc . ~/.profile 2) tcsh users add the following lines to your ~/.cshrc - + setenv ARBHOME ${prefix}/share/arb setenv PATH ${prefix}/share/arb\:\$PATH diff --git a/science/arb/files/arb-no-xprint.diff b/science/arb/files/arb-no-xprint.diff new file mode 100644 index 00000000000..387afbbd94d --- /dev/null +++ b/science/arb/files/arb-no-xprint.diff @@ -0,0 +1,11 @@ +--- Makefile 2026-04-28 13:29:08.000000000 -0400 ++++ Makefile 2026-04-28 13:29:22.000000000 -0400 +@@ -417,7 +417,7 @@ + ifeq ($(DARWIN),1) + XINCLUDES += -I$(OSX_FW)/GLUT.framework/Headers -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 + +- XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi ++ XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXmu -lXi + XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib + XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGLU.dylib:$(OSX_FW_OPENGL)/libGLU.dylib + else diff --git a/science/arb/files/changeset_18439.diff b/science/arb/files/changeset_18439.diff index 1b1734ba0cd..fdd459d2d0f 100644 --- a/science/arb/files/changeset_18439.diff +++ b/science/arb/files/changeset_18439.diff @@ -1,154 +1,154 @@ -improve error exit from script (kill self). -protect functions vs. wrong use (check param 3 of addpath; deny param 3 for append and prepend). -quote several expressions (to allow installation paths containing spaces) -http://bugs.arb-home.de/changeset/18439 ---- SH/arb (revision 18438) -+++ SH/arb (revision 18439) -@@ -3,8 +3,10 @@ - # set -x - --# error message function --err () { -- echo "`basename $0`: $@" 1>&2 -- exit 1 -+# error message function (nested exit): -+trap "exit 1" TERM -+export ARB_SCRIPT_PID=$$ -+abort_script_with() { -+ echo "`basename $0`: $@" 1>&2 -+ kill -s TERM $ARB_SCRIPT_PID - } - -@@ -16,5 +18,5 @@ - me="${BASH_SOURCE[0]}" - # while me is symlink -- while [ -h "$me" ]; do -+ while [ -h "$me" ]; do - # change to directory where symlink "$me" resides - cd "$(dirname "$me")" -@@ -37,5 +39,5 @@ - eval value=\"\$\{$1:-\}\" - case "$value" in -- *:$2:*|*:$2|$2:*|$2) -+ *:${2}:*|*:${2}|${2}:*|${2}) - result="$value" - ;; -@@ -45,13 +47,16 @@ - *) - case "$3" in -- p*) -+ prepend) - result="$2:${value}" - ;; -+ append) -+ result="${value}:$2" -+ ;; - *) -- result="${value}:$2" -+ abort_script_with "addpath expects param 'append' or 'prepend'" - ;; - esac - esac -- eval $1=$result -+ eval "$1=\"$result\"" - unset result value - } -@@ -59,4 +64,7 @@ - # convenience routine which appends a string to a path. - append () { -+ if [ -n "${3:-}" ]; then -+ abort_script_with too many arguments to append: "\$3=$3" -+ fi - addpath "$1" "$2" append - } -@@ -64,4 +72,7 @@ - # convenience routine which prepends a string to a path. - prepend () { -+ if [ -n "${3:-}" ]; then -+ abort_script_with too many arguments to prepend: "\$3=$3" -+ fi - addpath "$1" "$2" prepend - } -@@ -90,20 +101,20 @@ - - # use ARBHOME defined by location of script (comment out for old behavior) --ARBHOME=$ARBHOME_OF_SCRIPT -+ARBHOME="$ARBHOME_OF_SCRIPT" - - echo "Using ARBHOME='$ARBHOME'" - --prepend PATH $ARBHOME/bin --prepend LD_LIBRARY_PATH $ARBHOME/lib -+prepend PATH "$ARBHOME/bin" -+prepend LD_LIBRARY_PATH "$ARBHOME/lib" - append LD_LIBRARY_PATH /usr/dt/lib - append LD_LIBRARY_PATH /usr/openwin/lib --append LD_LIBRARY_PATH $ARBHOME/lib/addlibs --prepend SHLIB_PATH $ARBHOME/lib --append SHLIB_PATH $ARBHOME/lib/addlibs --append PYTHONPATH $ARBHOME/lib/python2.6 --append PERl5LIB $ARBHOME/lib/perl5 -+append LD_LIBRARY_PATH "$ARBHOME/lib/addlibs" -+prepend SHLIB_PATH "$ARBHOME/lib" -+append SHLIB_PATH "$ARBHOME/lib/addlibs" -+append PYTHONPATH "$ARBHOME/lib/python2.6" -+append PERl5LIB "$ARBHOME/lib/perl5" - - # environment variables that this shell script sets/changes: --export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH -+export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH - export PYTHONPATH PERL5LIB - -@@ -112,5 +123,5 @@ - export PWD HOME USER - --if [ -x $ARBHOME/bin/ghostview ] ; then -+if [ -x "$ARBHOME/bin/ghostview" ] ; then - GS_LIB="$ARBHOME/DEPOT/ghostscript" - export GS_LIB -@@ -120,17 +131,17 @@ - - if [ -z ${ARB_PROP:-} ]; then -- ARB_PROP=${HOME}/.arb_prop -+ ARB_PROP="${HOME}/.arb_prop" - fi - echo "Using properties from $ARB_PROP" --if [ ! -d ${ARB_PROP} ] ; then -+if [ ! -d "${ARB_PROP}" ] ; then - echo "Directory ${ARB_PROP} not found - creating ..." -- mkdir ${ARB_PROP} -+ mkdir "${ARB_PROP}" - fi - export ARB_PROP - --ARB_LOCAL_PTS=${HOME}/.arb_pts --if [ ! -d ${ARB_LOCAL_PTS} ] ; then -+ARB_LOCAL_PTS="${HOME}/.arb_pts" -+if [ ! -d "${ARB_LOCAL_PTS}" ] ; then - echo "Directory ${ARB_LOCAL_PTS} not found - creating ..." -- mkdir ${ARB_LOCAL_PTS} -+ mkdir "${ARB_LOCAL_PTS}" - fi - -@@ -138,16 +149,16 @@ - ARBMACROHOME="${ARB_PROP}/macros"; - fi --if [ ! -d ${ARBMACROHOME} ] ; then -+if [ ! -d "${ARBMACROHOME}" ] ; then - echo "Directory $ARBMACROHOME not found - creating ..." -- mkdir ${ARBMACROHOME} -+ mkdir "${ARBMACROHOME}" - fi - export ARBMACROHOME - --if [ -z ${ARBMACRO:-} ] ; then -+if [ -z "${ARBMACRO:-}" ] ; then - ARBMACRO="$ARBHOME/lib/macros" - fi --if [ ! -d ${ARBMACRO} ] ; then -+if [ ! -d "${ARBMACRO}" ] ; then - echo "Directory $ARBMACRO not found - creating ..." -- mkdir ${ARBMACRO} -+ mkdir "${ARBMACRO}" - fi - export ARBMACRO +improve error exit from script (kill self). +protect functions vs. wrong use (check param 3 of addpath; deny param 3 for append and prepend). +quote several expressions (to allow installation paths containing spaces) +http://bugs.arb-home.de/changeset/18439 +--- SH/arb (revision 18438) ++++ SH/arb (revision 18439) +@@ -3,8 +3,10 @@ + # set -x + +-# error message function +-err () { +- echo "`basename $0`: $@" 1>&2 +- exit 1 ++# error message function (nested exit): ++trap "exit 1" TERM ++export ARB_SCRIPT_PID=$$ ++abort_script_with() { ++ echo "`basename $0`: $@" 1>&2 ++ kill -s TERM $ARB_SCRIPT_PID + } + +@@ -16,5 +18,5 @@ + me="${BASH_SOURCE[0]}" + # while me is symlink +- while [ -h "$me" ]; do ++ while [ -h "$me" ]; do + # change to directory where symlink "$me" resides + cd "$(dirname "$me")" +@@ -37,5 +39,5 @@ + eval value=\"\$\{$1:-\}\" + case "$value" in +- *:$2:*|*:$2|$2:*|$2) ++ *:${2}:*|*:${2}|${2}:*|${2}) + result="$value" + ;; +@@ -45,13 +47,16 @@ + *) + case "$3" in +- p*) ++ prepend) + result="$2:${value}" + ;; ++ append) ++ result="${value}:$2" ++ ;; + *) +- result="${value}:$2" ++ abort_script_with "addpath expects param 'append' or 'prepend'" + ;; + esac + esac +- eval $1=$result ++ eval "$1=\"$result\"" + unset result value + } +@@ -59,4 +64,7 @@ + # convenience routine which appends a string to a path. + append () { ++ if [ -n "${3:-}" ]; then ++ abort_script_with too many arguments to append: "\$3=$3" ++ fi + addpath "$1" "$2" append + } +@@ -64,4 +72,7 @@ + # convenience routine which prepends a string to a path. + prepend () { ++ if [ -n "${3:-}" ]; then ++ abort_script_with too many arguments to prepend: "\$3=$3" ++ fi + addpath "$1" "$2" prepend + } +@@ -90,20 +101,20 @@ + + # use ARBHOME defined by location of script (comment out for old behavior) +-ARBHOME=$ARBHOME_OF_SCRIPT ++ARBHOME="$ARBHOME_OF_SCRIPT" + + echo "Using ARBHOME='$ARBHOME'" + +-prepend PATH $ARBHOME/bin +-prepend LD_LIBRARY_PATH $ARBHOME/lib ++prepend PATH "$ARBHOME/bin" ++prepend LD_LIBRARY_PATH "$ARBHOME/lib" + append LD_LIBRARY_PATH /usr/dt/lib + append LD_LIBRARY_PATH /usr/openwin/lib +-append LD_LIBRARY_PATH $ARBHOME/lib/addlibs +-prepend SHLIB_PATH $ARBHOME/lib +-append SHLIB_PATH $ARBHOME/lib/addlibs +-append PYTHONPATH $ARBHOME/lib/python2.6 +-append PERl5LIB $ARBHOME/lib/perl5 ++append LD_LIBRARY_PATH "$ARBHOME/lib/addlibs" ++prepend SHLIB_PATH "$ARBHOME/lib" ++append SHLIB_PATH "$ARBHOME/lib/addlibs" ++append PYTHONPATH "$ARBHOME/lib/python2.6" ++append PERl5LIB "$ARBHOME/lib/perl5" + + # environment variables that this shell script sets/changes: +-export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH ++export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH + export PYTHONPATH PERL5LIB + +@@ -112,5 +123,5 @@ + export PWD HOME USER + +-if [ -x $ARBHOME/bin/ghostview ] ; then ++if [ -x "$ARBHOME/bin/ghostview" ] ; then + GS_LIB="$ARBHOME/DEPOT/ghostscript" + export GS_LIB +@@ -120,17 +131,17 @@ + + if [ -z ${ARB_PROP:-} ]; then +- ARB_PROP=${HOME}/.arb_prop ++ ARB_PROP="${HOME}/.arb_prop" + fi + echo "Using properties from $ARB_PROP" +-if [ ! -d ${ARB_PROP} ] ; then ++if [ ! -d "${ARB_PROP}" ] ; then + echo "Directory ${ARB_PROP} not found - creating ..." +- mkdir ${ARB_PROP} ++ mkdir "${ARB_PROP}" + fi + export ARB_PROP + +-ARB_LOCAL_PTS=${HOME}/.arb_pts +-if [ ! -d ${ARB_LOCAL_PTS} ] ; then ++ARB_LOCAL_PTS="${HOME}/.arb_pts" ++if [ ! -d "${ARB_LOCAL_PTS}" ] ; then + echo "Directory ${ARB_LOCAL_PTS} not found - creating ..." +- mkdir ${ARB_LOCAL_PTS} ++ mkdir "${ARB_LOCAL_PTS}" + fi + +@@ -138,16 +149,16 @@ + ARBMACROHOME="${ARB_PROP}/macros"; + fi +-if [ ! -d ${ARBMACROHOME} ] ; then ++if [ ! -d "${ARBMACROHOME}" ] ; then + echo "Directory $ARBMACROHOME not found - creating ..." +- mkdir ${ARBMACROHOME} ++ mkdir "${ARBMACROHOME}" + fi + export ARBMACROHOME + +-if [ -z ${ARBMACRO:-} ] ; then ++if [ -z "${ARBMACRO:-}" ] ; then + ARBMACRO="$ARBHOME/lib/macros" + fi +-if [ ! -d ${ARBMACRO} ] ; then ++if [ ! -d "${ARBMACRO}" ] ; then + echo "Directory $ARBMACRO not found - creating ..." +- mkdir ${ARBMACRO} ++ mkdir "${ARBMACRO}" + fi + export ARBMACRO