Date: Wed, 18 Oct 2000 15:34:17 +0100 From: "Koster, K.J." <K.J.Koster@kpn.com> To: "'ob-users@ooc.com'" <ob-users@ooc.com>, "'ejc@bazzle.com'" <ejc@bazzle.com>, 'Steve Dobson' <sdobson@allstor-sw.com> Cc: "'freebsd-ports@freebsd.org'" <freebsd-ports@freebsd.org> Subject: ORBacus 4.0 for FreeBSD patches Message-ID: <59063B5B4D98D311BC0D0001FA7E4522026D794B@l04.research.kpn.com>
next in thread | raw e-mail | index | archive | help
This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. ------_=_NextPart_000_01C03910.7E989444 Content-Type: text/plain; charset="iso-8859-1" Dear OOC, ejc@bazzle.com, Steve Dobson and ports mailing list, I have written a few patches to get ORBacus 4.0.3 to compile and run on FreeBSD 4.0. I hope that you will find them useful. If you look at the patches in ob.patch, you will find that my patch to ob/demo/chat/X11/Makefile.in does not carry over to other platforms. Someone with more "make" knowledge than I should have a look at this. Since JThreads/C++ is not available for FreeBSD, these patches are for single-threaded versions of ORBacus only. For those who want to use fully automatic installation, I have also added the scripts that would otherwise be generated by "runconfig". Kees Jan ================================================ You are only young once, but you can stay immature all your life. <<ob.patches>> <<current>> <<config.env>> ------_=_NextPart_000_01C03910.7E989444 Content-Type: application/octet-stream; name="ob.patches" Content-Disposition: attachment; filename="ob.patches" --- ob/demo/chat/X11/Makefile.in.orig Thu Sep 7 23:25:26 2000 +++ ob/demo/chat/X11/Makefile.in Wed Oct 18 11:48:32 2000 @@ -44,7 +44,7 @@ $(CPPFLAGS) ALL_LDFLAGS = $(OB_LDFLAGS) $(LDFLAGS) ALL_LIBS = $(OB_X11_PRE_LIBS) $(OB_LIBS) $(OB_XM_LIBS) $(OB_X11_LIBS) \ - $(LIBS) + $(LIBS) $(MOTIFLIB) -lXext -lXp $(CLIENT_NAME): $(OBJS) rm -f $@ --- ob/demo/chat/Receiver_impl.h.orig Thu Sep 7 23:25:31 2000 +++ ob/demo/chat/Receiver_impl.h Wed Oct 18 15:04:50 2000 @@ -17,7 +17,11 @@ #include <Broadcaster.h> #include <ReceiverBase_impl.h> +#ifdef __FreeBSD__ +#include <termios.h> +#else #include <termio.h> +#endif namespace chat { --- ob/demo/chat/Client.cpp.orig Thu Sep 7 23:25:32 2000 +++ ob/demo/chat/Client.cpp Wed Oct 18 15:16:41 2000 @@ -46,8 +46,12 @@ #ifdef HAVE_TERMIO_H ioctl(STDIN_FILENO, TCSETA, &TerminalSettings); #else +#ifdef __FreeBSD__ + ioctl(STDIN_FILENO, TCSANOW, &TerminalSettings); +#else ioctl(STDIN_FILENO, TCSETS, &TerminalSettings); #endif +#endif // // Send signal again @@ -126,17 +130,26 @@ ioctl(STDIN_FILENO, TCGETA, &ctl); #else struct termios ctl; +#ifdef __FreeBSD__ + tcgetattr(STDIN_FILENO, &TerminalSettings); + tcgetattr(STDIN_FILENO, &ctl); +#else ioctl(STDIN_FILENO, TCGETS, &TerminalSettings); ioctl(STDIN_FILENO, TCGETS, &ctl); #endif +#endif ctl.c_lflag &= ~(ICANON | ECHO); ctl.c_cc[VMIN] = 1; ctl.c_cc[VTIME] = 0; #ifdef HAVE_TERMIO_H ioctl(STDIN_FILENO, TCSETA, &ctl); #else +#ifdef __FreeBSD__ + tcsetattr(STDIN_FILENO, TCSANOW, &ctl); +#else ioctl(STDIN_FILENO, TCSETS, &ctl); #endif +#endif // // Set signal handler @@ -187,7 +200,11 @@ #ifdef HAVE_TERMIO_H ioctl(STDIN_FILENO, TCSETA, &TerminalSettings); #else +#ifdef __FreeBSD__ + tcsetattr(STDIN_FILENO, TCSANOW, &TerminalSettings); +#else ioctl(STDIN_FILENO, TCSETS, &TerminalSettings); +#endif #endif return status; --- time/src/TimeHelper.cpp.orig Thu Sep 7 23:25:34 2000 +++ time/src/TimeHelper.cpp Wed Oct 18 15:17:48 2000 @@ -89,7 +89,11 @@ // lt = localtime(&tv.tv_sec); #endif +#ifdef __FreeBSD__ + tdf = -(lt->tm_gmtoff / 60); +#else tdf = -(::timezone / 60); +#endif // // Adjust for daylight savings time --- naming/src/NamingDatabase.cpp.orig Thu Sep 7 23:25:34 2000 +++ naming/src/NamingDatabase.cpp Wed Oct 18 15:09:26 2000 @@ -147,7 +147,9 @@ // int mode = O_WRONLY|O_APPEND; #ifndef WIN32 +#ifndef __FreeBSD__ mode |= O_SYNC; +#endif #endif if(create) mode |= O_CREAT; ------_=_NextPart_000_01C03910.7E989444 Content-Type: application/octet-stream; name="current" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="current" config_install_path=3D"/usr/local"=0A= config_berkeleydb=3D"no"=0A= config_extra_cxx_flags=3D"-pipe"=0A= config_oracle=3D"no"=0A= config_optimized=3D"yes"=0A= config_shared=3D"yes"=0A= config_jtc=3D"no"=0A= config_platform=3D"5"=0A= config_jtc_stop=3D"no"=0A= config_debug=3D"no"=0A= config_shell=3D"b"=0A= ------_=_NextPart_000_01C03910.7E989444 Content-Type: application/octet-stream; name="config.env" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="config.env" LIBEXT=3D".so"; export LIBEXT=0A= AR=3D"c++"; export AR=0A= TMPL_REPOS_DIR=3D""; export TMPL_REPOS_DIR=0A= LIBVERFLAG=3D"-Wl,-soname,"; export LIBVERFLAG=0A= LD_LIBRARY_PATH=3D"$PWD/bidir/lib:$PWD/event/lib:$PWD/time/lib:$PWD/prop= erty/lib:$PWD/naming/lib:$PWD/ob/lib:$LD_LIBRARY_PATH"; export = LD_LIBRARY_PATH=0A= LDOPTS=3D""; export LDOPTS=0A= LDFLAGS=3D""; export LDFLAGS=0A= CFLAGS=3D""; export CFLAGS=0A= ARFLAGS=3D"-fPIC -shared -o"; export ARFLAGS=0A= CPPFLAGS=3D""; export CPPFLAGS=0A= LIBPATH=3D""; export LIBPATH=0A= CXX=3D"c++"; export CXX=0A= RANLIB=3D":"; export RANLIB=0A= CC=3D"gcc"; export CC=0A= RUNCONFIG=3D"yes"; export RUNCONFIG=0A= CXXFLAGS=3D"-pipe -fPIC -Wall -fpermissive"; export CXXFLAGS=0A= ------_=_NextPart_000_01C03910.7E989444-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?59063B5B4D98D311BC0D0001FA7E4522026D794B>