Hello! On Sat, Feb 04, 2006 at 06:28:44PM -0500, Todd C. Miller wrote: >The following appears to work for me. I'm not really familiar >with erlang--I was just hoping to get ejabberd working...
Huh. For me, the patch patch-erts_etc_common_Install doesn't apply, because there's no file named Install in the upstream source tree (which *did* match the distinfo check). After removing the offending patch (the other one applies cleanly), building works, but packaging fails: Error in package: symlink /usr/ports/local/erlang.todd_miller_20060204/w-erlang-R10B-9/fake-i386//usr/local/lib/erlang/bin/epmd refers to /usr/ports/local/erlang.todd_miller_20060204/w-erlang-R10B-9/fake-i386/usr/local/lib/erlang/erts-5.4.12/bin/epmd After re-adding something to fix this, things seem to work. > - todd Diff against the port you sent follows. And... Please commit something before the upcoming release. The erlang port that is in the tree just doesn't work *at all*, so anything is better than that. Kind regards, Hannah. diff -urN /tmp/foo./erlang/patches/patch-erts_etc_common_Install ./patches/patch-erts_etc_common_Install --- /tmp/foo./erlang/patches/patch-erts_etc_common_Install Mon Feb 6 16:39:33 2006 +++ ./patches/patch-erts_etc_common_Install Thu Jan 1 01:00:00 1970 @@ -1,139 +0,0 @@ -$OpenBSD$ ---- erts/etc/common/Install.orig Sat Feb 4 15:44:27 2006 -+++ erts/etc/common/Install Sat Feb 4 17:53:07 2006 -@@ -13,7 +13,7 @@ while [ $# -ne 0 ]; do - shift - done - --if [ -z "$ERL_ROOT" -o ! -d "$ERL_ROOT" ] -+if [ -z "$ERL_ROOT" ] - then - echo "Install: need ERL_ROOT directory as argument" - exit 1 -@@ -25,24 +25,11 @@ then - exit 1 - fi - --if [ ! -d $ERL_ROOT/erts-5.4.12/bin ] -+if [ -d erts-5.4.12/obj ] - then -- echo "Install: The directory $ERL_ROOT/erts-5.4.12/bin does not exist" -- echo " Bad location or erts module not un-tared" -- exit 1 -+ ( cd erts-5.4.12/obj && sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" Makefile.src > Makefile ) - fi - --if [ -d $ERL_ROOT/erts-5.4.12/obj ] --then -- cd $ERL_ROOT/erts-5.4.12/obj -- sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" Makefile.src > Makefile --fi -- --if [ ! -d $ERL_ROOT/bin ] --then -- mkdir $ERL_ROOT/bin --fi -- - # - # Fetch target system. - # -@@ -57,44 +44,42 @@ case $SYS:$REL in - TARGET="" ;; - esac - --cd $ERL_ROOT/erts-5.4.12/bin -+(cd erts-5.4.12/bin; -+ sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" erl.src > erl; -+ chmod 755 erl) - --sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" erl.src > erl --chmod 755 erl -- - # - # Create start file for embedded system use, - # --(cd $ERL_ROOT/erts-5.4.12/bin; -+(cd erts-5.4.12/bin; - sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" start.src > start; - chmod 755 start) - --cd $ERL_ROOT/bin -+mkdir -p bin -+cp -p erts-5.4.12/bin/erl bin -+cp -p erts-5.4.12/bin/erlc bin - --cp -p $ERL_ROOT/erts-5.4.12/bin/erl . --cp -p $ERL_ROOT/erts-5.4.12/bin/erlc . -- - # - # Set a soft link to epmd - # This should not be done for an embedded system! - # - - # Remove old links first. --if [ -h epmd ]; then -- /bin/rm -f epmd -+if [ -h bin/epmd ]; then -+ /bin/rm -f bin/epmd - fi - --ln -s $ERL_ROOT/erts-5.4.12/bin/epmd epmd -+ln -s erts-5.4.12/bin/epmd bin/epmd - --cp -p $ERL_ROOT/erts-5.4.12/bin/run_erl . --cp -p $ERL_ROOT/erts-5.4.12/bin/to_erl . --cp -p $ERL_ROOT/erts-5.4.12/bin/start . --sed -e "s;%EMU%;beam;" $ERL_ROOT/erts-5.4.12/bin/start_erl.src > start_erl --chmod 755 start_erl -+cp -p erts-5.4.12/bin/run_erl bin -+cp -p erts-5.4.12/bin/to_erl bin -+cp -p erts-5.4.12/bin/start bin -+sed -e "s;%EMU%;beam;" erts-5.4.12/bin/start_erl.src > bin/start_erl -+chmod 755 bin/start_erl - echo "" - --echo 5.4.12 R10B > $ERL_ROOT/releases/start_erl.data --sed -e "s;%ERL_ROOT%;$ERL_ROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES -+echo 5.4.12 R10B > releases/start_erl.data -+sed -e "s;%ERL_ROOT%;$ERL_ROOT;" releases/RELEASES.src > releases/RELEASES - - if [ "$start_option" = "query" ] - then -@@ -118,17 +103,16 @@ case $start_option in - Name=start_sasl ;; - esac - --cp -p ../releases/R10B/start_*.boot . --cp -p $Name.boot start.boot --cp -p ../releases/R10B/$Name.script start.script -+cp -p releases/R10B/start_*.boot bin -+cp -p bin/$Name.boot bin/start.boot -+cp -p releases/R10B/$Name.script bin/start.script - - # - # We always run ranlib unless Solaris/SunOS 5 - # but ignore failures. - # --if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ROOT/usr/lib ]; then -- cd $ERL_ROOT/usr/lib -- for library in lib*.a -+if [ "X$TARGET" != "Xsunos5" -a -d usr/lib ]; then -+ for library in usr/lib/lib*.a - do - (ranlib $library) > /dev/null 2>&1 - done -@@ -139,10 +123,9 @@ fi - # Fixing the man pages - # - --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -+#if [ -d man ] -+#then -+# ./misc/format_man_pages $ERL_ROOT -+#fi - - diff -urN /tmp/foo./erlang/patches/patch-erts_etc_unix_Install_src ./patches/patch-erts_etc_unix_Install_src --- /tmp/foo./erlang/patches/patch-erts_etc_unix_Install_src Thu Jan 1 01:00:00 1970 +++ ./patches/patch-erts_etc_unix_Install_src Mon Feb 6 17:47:21 2006 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- erts/etc/unix/Install.src.orig Mon Feb 6 17:46:40 2006 ++++ erts/etc/unix/Install.src Mon Feb 6 17:47:10 2006 +@@ -84,7 +84,8 @@ if [ -h epmd ]; then + /bin/rm -f epmd + fi + +-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++#ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++ln -s ../erts-%I_VSN%/bin/epmd epmd + + cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . + cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
