Return to BSD News archive
Path: sserve!newshost.anu.edu.au!munnari.oz.au!news.Hawaii.Edu!ames!haven.umd.edu!darwin.sura.net!news-feed-2.peachnet.edu!concert!borg.cs.unc.edu!not-for-mail
From: martin@cs.unc.edu (Kevin Martin)
Newsgroups: comp.os.386bsd.apps
Subject: Re: [NetBSD] Anyone port Interviews?
Date: 20 Oct 1993 09:51:24 -0400
Organization: The University of North Carolina at Chapel Hill
Lines: 239
Message-ID: <2a3fosINNfcq@franck.cs.unc.edu>
References: <29vtvs$dr7@introl.introl.com> <2a1oprINNchq@franck.cs.unc.edu>
NNTP-Posting-Host: franck.cs.unc.edu
In article <2a1oprINNchq@franck.cs.unc.edu> martin@cs.unc.edu (Kevin Martin) writes:
>I recently built Interviews 3.1 for FreeBSD and the patches should
>work without changes on 386BSD or NetBSD.
Due to the overwhelming response, I am posting the patches here and when
I get some more time (this weekend), I'll create a package for everyone.
The original sources to Interviews 3.1 can be obtained from
interviews.stanford.edu in /pub/3.1.tar.Z.
Kevin
___
Kevin E. Martin University of North Carolina at Chapel Hill
martin@cs.unc.edu Department of Computer Science
*** iv/src/bin/iclass/dialogs.c.orig Sat Oct 16 21:47:57 1993
--- iv/src/bin/iclass/dialogs.c Sat Oct 16 21:04:02 1993
***************
*** 45,51 ****
--- 45,55 ----
#if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
/* sigh, not all systems have this prototype */
extern "C" {
+ #ifdef __386BSD__
+ char* getcwd(char*, unsigned int);
+ #else
char* getcwd(char*, int);
+ #endif
}
#endif
*** iv/src/config/InterViews/TIFF.def.orig Sat Oct 16 21:49:56 1993
--- iv/src/config/InterViews/TIFF.def Sat Oct 16 19:55:37 1993
***************
*** 126,131 ****
--- 126,136 ----
-DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \
-DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=0 -A nansi
#endif
+ #if defined(i386BsdArchitecture)
+ #define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+ #endif
#endif
#if defined(LinuxArchitecture)
#define TIFFStdCDefines \
*** iv/src/config/InterViews/arch.def.orig Sat Oct 16 21:50:17 1993
--- iv/src/config/InterViews/arch.def Sat Oct 16 17:27:13 1993
***************
*** 291,296 ****
--- 291,305 ----
#define MacroFile InterViews/iv-ibm.cf
#endif /* ibm */
+ #ifdef __386BSD__
+ #undef __386BSD__
+ #define i386BsdArchitecture
+ #define ArchitectureName i386BSD
+ #define architectureName i386bsd
+ #define MacroIncludeFile <InterViews/iv-386bsd.cf>
+ #define MacroFile InterViews/iv-386bsd.cf
+ #endif
+
#ifdef linux
#undef linux
#define LinuxArchitecture
*** iv/src/config/InterViews/gcc.def.orig Tue Sep 8 15:38:23 1992
--- iv/src/config/InterViews/gcc.def Sat Oct 16 16:42:11 1993
***************
*** 9,16 ****
#define CCDriver g++
#endif
#ifndef DependCCFlags
! #define DependCCFlags $(CCDEFINES) $(CCINCLUDES)
#endif
#ifndef ExtraCCLdLibs
--- 9,31 ----
#define CCDriver g++
#endif
+ #ifndef CcCmd
+ #define CcCmd gcc
+ #endif
+
+ #if defined(SunArchitecture)
+ #ifndef TIFFStdCDefines
+ #define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1
+ #endif
+ #endif
+
+ /* The below include directories can be figured out by examining the
+ * output from gcc -v ...
+ */
#ifndef DependCCFlags
! #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/local/gcc-2.3.3/lib/g++-include -I/usr/local/gcc-2.3.3/lib/gcc-lib/sun4/2.3.3/include
#endif
#ifndef ExtraCCLdLibs
***************
*** 19,21 ****
--- 34,42 ----
#undef HasSunOSSharedLibraries
#define HasSunOSSharedLibraries NO
+
+ /*
+ * Right now, libg++ cannot be used to build the RPC classes.
+ */
+ #undef BuildRPCClasses
+ #define BuildRPCClasses NO
*** iv/src/config/InterViews/iv-386bsd.cf.orig Sat Oct 16 21:49:04 1993
--- iv/src/config/InterViews/iv-386bsd.cf Sat Oct 16 16:58:26 1993
***************
*** 0 ****
--- 1,2 ----
+ #include <x386.cf>
+ #include <InterViews/xparams.cf>
*** iv/src/config/InterViews/local.def.orig Tue Nov 24 12:08:37 1992
--- iv/src/config/InterViews/local.def Sat Oct 16 20:19:56 1993
***************
*** 6,11 ****
--- 6,19 ----
#define LanguageCCDefines -Dcplusplus_2_0
/*
+ * Build RPC classes on machines that support it.
+ */
+ #if defined(SGIArchitecture) || defined(SunArchitecture)
+ #undef BuildRPCClasses
+ #define BuildRPCClasses YES
+ #endif
+
+ /*
* If you are using gcc/g++, then uncomment the include below.
*/
/* #include <InterViews/gcc.def> */
***************
*** 26,39 ****
#endif
/*
- * If you are using g++, define BuildRPCClasses to NO.
- */
- #if defined(SGIArchitecture) || defined(SunArchitecture)
- #undef BuildRPCClasses
- #define BuildRPCClasses YES
- #endif
-
- /*
* Delete this definition if your /tmp space is less than five megabytes.
*/
#undef HasLargeTmp
--- 34,39 ----
***************
*** 68,70 ****
--- 68,90 ----
#undef XLibDir
#define XLibDir /usr/X11R5/lib
*/
+
+ #include <InterViews/gcc.def>
+
+ /*
+ * If we are going to define the above, then, we might as well have it
+ * take effect. (mrs)
+ */
+ #undef InstallRelative
+ #define InstallRelative NO /* need absolute pathnames */
+
+ #define BinDir InstalledRoot/bin
+ #define LibDir InstalledRoot/lib
+ #define LibAllDir InstalledRoot/lib
+
+ #undef XConfigDir
+ #define XConfigDir /usr/X386/lib/X11/config
+ #undef XIncDir
+ #define XIncDir /usr/X386/include/X11
+ #undef XLibDir
+ #define XLibDir /usr/X386/lib
*** iv/src/include/InterViews/glyph.h.orig Mon Apr 13 09:58:51 1992
--- iv/src/include/InterViews/glyph.h Sat Oct 16 16:42:12 1993
***************
*** 42,48 ****
typedef long GlyphIndex;
typedef unsigned int GlyphBreakType;
! class Glyph : public Resource {
public:
enum { no_break, pre_break, in_break, post_break };
--- 42,48 ----
typedef long GlyphIndex;
typedef unsigned int GlyphBreakType;
! class Glyph : virtual public Resource {
public:
enum { no_break, pre_break, in_break, post_break };
*** iv/src/include/InterViews/handler.h.orig Tue Feb 11 09:33:28 1992
--- iv/src/include/InterViews/handler.h Sat Oct 16 16:42:12 1993
***************
*** 31,37 ****
class Event;
! class Handler : public Resource {
protected:
Handler();
virtual ~Handler();
--- 31,37 ----
class Event;
! class Handler : virtual public Resource {
protected:
Handler();
virtual ~Handler();
*** iv/src/lib/IV-X11/xwindow.c.orig Sat Oct 16 21:48:32 1993
--- iv/src/lib/IV-X11/xwindow.c Sat Oct 16 20:15:26 1993
***************
*** 64,70 ****
--- 64,74 ----
/* no standard place for this */
extern "C" {
+ #ifdef __386BSD__
+ extern int ioctl(int, unsigned long, ...);
+ #else
extern int ioctl(int, int, ...);
+ #endif
}
implementPtrList(WindowVisualList,WindowVisual)