debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetBSD port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-02-20 19:19:17 +01:00
committed by Jon Trulson
parent a4f9413950
commit 2712d5f787
94 changed files with 2443 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtaction/Imakefile
View File

@@ -19,6 +19,10 @@ SYS_LIBRARIES = -lm -lcrypt
SYS_LIBRARIES = -lm -lcrypt
#endif
#ifdef NetBSDArchitecture
SYS_LIBRARIES = -lm -lcrypt
#endif
#ifdef SCOArchitecture
SYS_LIBRARIES = -lm -lcrypt
#endif

2
cde/programs/dtappbuilder/src/libAButil/util.c
View File

@@ -225,7 +225,7 @@ extern "C" {
#endif
#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4)
extern int putenv(const char *string);
#elif !(defined(__osf__) || defined(__aix))
#elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__))
extern int putenv(char *string);
#endif
#ifdef __cplusplus

15
cde/programs/dtcm/dtcm/cm_i18n.c
View File

@@ -68,13 +68,6 @@ should be fixed in the future.
#include <locale.h>
#include <sys/param.h> /* for MAXPATHLEN */
#include <Xm/Xm.h>
#include "util.h"
#include "timeops.h"
#include "cm_i18n.h"
#include "deskset.h"
/*
#include "gettext.h"
*/
#include <langinfo.h>
/* Iconv not defined for linux. Use the EUSCompat stubs instead. */
@@ -83,6 +76,14 @@ should be fixed in the future.
#endif
#include <EUSCompat.h>
#include "util.h"
#include "timeops.h"
#include "cm_i18n.h"
#include "deskset.h"
/*
#include "gettext.h"
*/
char *fontset1[2];
char *fontset2[2];
int use_octal = FALSE;

4
cde/programs/dtcm/server/v4ops.c
View File

@@ -37,7 +37,11 @@
#include <pwd.h>
#include <time.h>
#if defined(CSRG_BASED)
#if defined(__NetBSD__)
#include <limits.h>
#else
#include <sys/limits.h>
#endif
#define MAXINT INT_MAX
#else
#include <values.h>

1
cde/programs/dtcreate/cmncbs.c
View File

@@ -29,6 +29,7 @@
/* */
/*****************************************************************************/
#include <stdio.h>
#include <sys/types.h>
#include <sys/signal.h>
#include <X11/cursorfont.h>

45
cde/programs/dtdocbook/tcl/Imakefile
View File

@@ -7,58 +7,61 @@ XCOMM $XConsortium: Imakefile /main/4 1996/08/08 14:42:19 cde-hp $
#define LibHeaders NO
#define LibInstall NO
#if defined(FreeBSDArchitecture)
VERSION = 8.5
#else
VERSION = 7.5
#endif
prefix = /usr/local
#if defined(LinuxArchitecture)
prefix = /usr/lib
#elif defined(OpenBSDArchitecture)
prefix = /usr/local/lib/tcl
#elif defined(NetBSDArchitecture)
prefix = /usr/pkg/lib
#else
prefix = /usr/local/lib
#endif
XCOMM Directory from which applications will reference the library of Tcl
XCOMM scripts (note: you can set the TCL_LIBRARY environment variable at
XCOMM run-time to override this value):
TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
#ifdef OpenBSDArchitecture
#ifdef TclLibrary
TCL_LIBRARY = TclLibrary
#else
TCL_LIBRARY = $(prefix)/tcl$(VERSION)
#endif
#ifdef SunArchitecture
#if defined(SunArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H \
-DTCL_GOT_TIMEZONE
#else
# ifdef IBMArchitecture
#elif defined(IBMArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR -Dvfork=fork \
-DTCL_GOT_TIMEZONE -DHAVE_SYS_SELECT_H
# else
# ifdef AlphaArchitecture
#elif defined(AlphaArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
-DTCL_GOT_TIMEZONE -DTIME_WITH_SYS_TIME
# else
# ifdef OpenBSDArchitecture
#elif defined(OpenBSDArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H \
-DTCL_GOT_TIMEZONE
# else
# ifdef FreeBSDArchitecture
#elif defined(FreeBSDArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H \
-DTCL_GOT_TIMEZONE
# else
#elif defined(NetBSDArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
-DTCL_GOT_TIMEZONE
# endif
# endif
# endif
# endif
#else
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
-DTCL_GOT_TIMEZONE
#endif
INCLUDES = -I.

8
cde/programs/dtdocbook/tcl/tclExpr.c
View File

@@ -392,7 +392,11 @@ ExprParseString(interp, string, valuePtr)
}
} else {
errno = 0;
#ifdef __NetBSD__
valuePtr->doubleValue = (double)strtof(string, &term);
#else
valuePtr->doubleValue = strtod(string, &term);
#endif
if ((term != string) && (*term == 0)) {
if (errno != 0) {
Tcl_ResetResult(interp);
@@ -496,7 +500,11 @@ ExprLex(interp, infoPtr, valuePtr)
return TCL_OK;
} else {
errno = 0;
#ifdef __NetBSD__
valuePtr->doubleValue = (double)strtof(p, &term);
#else
valuePtr->doubleValue = strtod(p, &term);
#endif
if (term != p) {
if (errno != 0) {
TclExprFloatError(interp, valuePtr->doubleValue);

8
cde/programs/dtfile/Trash.c
View File

@@ -4120,15 +4120,19 @@ CheckDeletePermission(
char *parentdir,
char *destinationPath)
{
#if defined(CSRG_BASED)
#if defined(__FreeBSD__) || defined(__OpenBSD__)
struct statfs statbuf;
#elif defined(__NetBSD__)
struct statvfs statbuf;
#else
struct stat statbuf;
#endif
char fname[1024];
#if defined(CSRG_BASED)
#if defined(__FreeBSD__) || defined(__OpenBSD__)
if (statfs(parentdir,&statbuf) < 0) /* does not exist */
#elif defined(__NetBSD__)
if (statvfs(parentdir,&statbuf) < 0) /* does not exist */
#else
if (lstat(parentdir,&statbuf) < 0) /* does not exist */
#endif

8
cde/programs/dtfile/dtcopy/sharedFuncs.c
View File

@@ -452,15 +452,19 @@ CopyCheckDeletePermission(
char *parentdir,
char *destinationPath)
{
#if defined(CSRG_BASED)
#if defined(__FreeBSD__) || defined(__OpenBSD__)
struct statfs statbuf;
#elif defined(__NetBSD__)
struct statvfs statbuf;
#else
struct stat statbuf;
#endif
char fname[1024];
#if defined(CSRG_BASED)
#if defined(__FreeBSD__) || defined(__OpenBSD__)
if (statfs(parentdir,&statbuf) < 0) /* does not exist */
#elif defined(__NetBSD__)
if (statvfs(parentdir,&statbuf) < 0) /* does not exist */
#else
if (lstat(parentdir,&statbuf) < 0) /* does not exist */
#endif

1
cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C
View File

@@ -23,6 +23,7 @@
// $TOG: autoNumber.C /main/6 1998/04/17 11:47:13 mgreess $
#include <ctype.h>
#include <limits.h>
#if defined(CSRG_BASED)
#define MAXINT INT_MAX
#else

4
cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C
View File

@@ -500,7 +500,7 @@ FeatureValue::operator const char *() const
FeatureValueReal::operator int() const
{
return f_value ;
return (int)f_value ;
}
FeatureValueReal::operator float() const
@@ -612,7 +612,7 @@ FeatureValueExpression::operator const char *() const
FeatureValueDimension::operator int () const
{
if ( f_cachedValue != -1 )
return f_cachedValue;
return (int)f_cachedValue;
if ( f_value == 0 )
throw(CASTBEEXCEPT badEvaluationException()) ;

6
cde/programs/dtinfo/dtinfo/src/Agents/BookTabMotif.C
View File

@@ -101,7 +101,7 @@ BookTab::set_tab (UAS_Pointer<UAS_Common> &tab_ptr)
{
f_tab_ptr = tab_ptr;
if (f_tab_ptr != (const int)NULL)
if (f_tab_ptr != (const int)0)
{
UAS_String st = f_tab_ptr->tab_title();
LabelString ((char *) st);
@@ -127,7 +127,7 @@ BookTab::set_tab (UAS_Pointer<UAS_Common> &tab_ptr)
void
BookTab::activate()
{
Xassert (f_tab_ptr != (const int)NULL);
Xassert (f_tab_ptr != (const int)0);
node_mgr().set_preferred_window (f_node_window_agent);
f_tab_ptr->retrieve();
}
@@ -141,7 +141,7 @@ BookTab::activate()
void
BookTab::select_if_same (UAS_Pointer<UAS_Common> &doc_ptr)
{
Xassert (f_tab_ptr != (const int)NULL);
Xassert (f_tab_ptr != (const int)0);
// If this tab points to the Node in question, select the tab,
// otherwise deselect the tab.
if (f_tab_ptr == doc_ptr)

8
cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C
View File

@@ -1224,7 +1224,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
parent);
}
if (d != (const int)NULL) {
if (d != (const int)0) {
d->retrieve ();
} else {
#ifdef DEBUG
@@ -1243,7 +1243,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
// but with keyword error.
// report error only if likely from retrieval; others handled already
if( d != (const int)NULL )
if( d != (const int)0 )
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 4,
@@ -1538,7 +1538,7 @@ void
LibraryAgent::track_to (UAS_Pointer<UAS_Common> &node_ptr)
{
ON_DEBUG (printf ("LibraryAgent::track_to: popped_down = %d, track set = %d, node_ptr = %p\n", f_popped_down, XmToggleButtonGadgetGetState(f_auto_track),(UAS_Common *) node_ptr));
if (f_popped_down || !XmToggleButtonGadgetGetState(f_auto_track) || node_ptr == (const int)NULL)
if (f_popped_down || !XmToggleButtonGadgetGetState(f_auto_track) || node_ptr == (const int)0)
return;
Wait_Cursor bob;
ON_DEBUG (puts ("TRYING to locate document in doc tree!"));
@@ -1556,7 +1556,7 @@ LibraryAgent::track_to (UAS_Pointer<UAS_Common> &node_ptr)
// Trace up to the root.
free_tracking_hierarchy();
while (doc_root != (const int)NULL && !in_subtree)
while (doc_root != (const int)0 && !in_subtree)
{
f_tracking_hierarchy = new TrackingEntry(doc_root, f_tracking_hierarchy);
for (unsigned int i = 0; i < rootList.length(); i ++) {

8
cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C
View File

@@ -1199,12 +1199,12 @@ OutlineListView::activate (WCallback *wcb)
{
UAS_List<UAS_Common> kids =
((TOC_Element *)oe)->toc()->children();
if ( (kids != (const int)NULL)
&& (kids[0] != (const int)NULL)
if ( (kids != (const int)0)
&& (kids[0] != (const int)0)
&& (kids[0]->type() == UAS_BOOKCASE))
{
UAS_List<UAS_Common> bckids = kids[0]->children();
if (! (bckids[0] == (const int)NULL))
if (! (bckids[0] == (const int)0))
{
bckids[0]->retrieve();
}
@@ -1216,7 +1216,7 @@ OutlineListView::activate (WCallback *wcb)
{
UAS_List<UAS_Common> kids =
((TOC_Element *)oe)->toc()->children();
if (! (kids[0] == (const int)NULL))
if (! (kids[0] == (const int)0))
{
kids[0]->retrieve();
}

12
cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
View File

@@ -1264,13 +1264,13 @@ SearchScopeAgent::generate_component_list()
OutlineElement *oe;
ADD (components, CATGETS(Set_Messages, 22, "Everything"), parts, True);
ADD (parts, CATGETS(Set_Messages, 23, "Titles"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 24, "Body"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 25, "Examples"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 26, "Index"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 27, "Tables"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 23, "Titles"), 0, False);
ADD (parts, CATGETS(Set_Messages, 24, "Body"), 0, False);
ADD (parts, CATGETS(Set_Messages, 25, "Examples"), 0, False);
ADD (parts, CATGETS(Set_Messages, 26, "Index"), 0, False);
ADD (parts, CATGETS(Set_Messages, 27, "Tables"), 0, False);
#ifndef DtinfoClient
ADD (parts, CATGETS(Set_Messages, 28, "Graphics"), NULL, False);
ADD (parts, CATGETS(Set_Messages, 28, "Graphics"), 0, False);
#endif
return (components);

8
cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C
View File

@@ -144,7 +144,7 @@ UrlAgent::document( char *locator,
delete [] buffer;
// if no result, the unique ID was not found in a loaded infolib
if( d == (const int)NULL ) sts = NOT_FOUND ;
if( d == (const int)0 ) sts = NOT_FOUND ;
}
else if( strchr( locator, ':' ) && strchr( locator, '=' ) )
{
@@ -160,7 +160,7 @@ UrlAgent::document( char *locator,
sts = BAD_ARG_FORMAT ;
}
if( d != (const int)NULL )
if( d != (const int)0 )
{
// always use new window to display external requests
if( new_window ) node_mgr().force_new_window() ;
@@ -275,7 +275,7 @@ UrlAgent::print_document(char *locator)
delete [] buffer;
// if no result, the unique ID was not found in a loaded infolib
if( d == (const int)NULL ) sts = NOT_FOUND ;
if( d == (const int)0 ) sts = NOT_FOUND ;
}
else if( strchr( locator, ':' ) && strchr( locator, '=' ) )
{
@@ -294,7 +294,7 @@ UrlAgent::print_document(char *locator)
}
// if we have a setion add it to the print list
if( d != (const int)NULL ) {
if( d != (const int)0 ) {
// Need to put this single node on the print list so that
// reset_ui() can determine the number of nodes being printed

2
cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh
View File

@@ -24,7 +24,7 @@
* Campbell, CA 95008
*
*/
#if defined(SVR4) || defined(hpux) || defined(linux)
#if defined(SVR4) || defined(hpux) || defined(linux) || defined(__NetBSD__)
#include <limits.h>
#else
#include <sys/limits.h>

2
cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C
View File

@@ -237,7 +237,7 @@ LibraryMgr::display (UAS_Pointer<UAS_Common> &toc)
OutlineList *ol = new OutlineList(fObjList.length());
for (i = 0; i < fObjList.length(); i ++) {
ol->append (new TOC_Element (fObjList[i]));
if (toc->parent() == (const int)NULL) {
if (toc->parent() == (const int)0) {
BitHandle handle = ol->get_data_handle();
((OutlineElement *) (*ol)[i])->set_expanded (handle);
ol->free_data_handle (handle);

8
cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C
View File

@@ -276,7 +276,7 @@ ServiceMgr::process_olias_event (Window client,
char *buffer = new char[bufferlen];
snprintf (buffer, bufferlen, "mmdb:LOCATOR=%s", locator);
d = UAS_Common::create (buffer);
if (d != (const int)NULL)
if (d != (const int)0)
{
// (evil hack alert)
g_scroll_to_locator = TRUE;
@@ -296,7 +296,7 @@ ServiceMgr::process_olias_event (Window client,
}
end_try;
if (d != (const int)NULL)
if (d != (const int)0)
{
d->retrieve();
reply_to_client(client, OLIAS_SUCCESS);
@@ -423,7 +423,7 @@ olias_send_event (Widget, OliasEvent *event)
snprintf (buffer, bufferlen, "mmdb:LOCATOR=%s", locator);
d = UAS_Common::create (buffer);
delete [] buffer;
if (d != (const int)NULL)
if (d != (const int)0)
{
// (evil hack alert)
if (locator == NULL)
@@ -446,7 +446,7 @@ olias_send_event (Widget, OliasEvent *event)
d = NULL;
}
end_try;
if (d != (const int)NULL)
if (d != (const int)0)
{
d->retrieve();
return (OLIAS_SUCCESS);

2
cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C
View File

@@ -450,7 +450,7 @@ TtIpcMgr::do_print(Tt_message msg)
// add UAS_Common pointer to list of sections to print
if (d != (const int)NULL)
if (d != (const int)0)
{
print_list->append(d);
}

2
cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C
View File

@@ -132,7 +132,7 @@ UAS_Pointer<UAS_Common> &
Mark_mmdb::doc_ptr()
{
// If the doc_ptr isn't known yet, find it.
if (f_doc_ptr == (const int)NULL)
if (f_doc_ptr == (const int)0)
{
UAS_String url = "mmdb:LOCATOR=";

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Common.C
View File

@@ -246,7 +246,7 @@ UAS_Common::subtree_size()
int tree_size = 1;
for (unsigned int i = 0; i < num_kids; i++) {
if (! (kids[i] == (const int)NULL))
if (! (kids[i] == (const int)0))
tree_size += kids[i]->subtree_size();
}

4
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C
View File

@@ -56,7 +56,7 @@ DtSR_BookcaseSearchEntry::DtSR_BookcaseSearchEntry(
{
f_dbname = DtSR_SearchEngine::search_engine().db_name(f_dbn);
if (f_dbname == (const int)NULL) {
if (f_dbname == (const int)0) {
#ifdef DEBUG
fprintf(stderr, "(ERROR) could not instantiate DtSR_BookcaseScopeEntry\n");
abort();
@@ -188,7 +188,7 @@ DtSR_BookcaseSearchEntry::_search_zones(UAS_SearchZones& search_zones)
UAS_List<DtSR_BookcaseSearchEntry>&
DtSR_BookcaseSearchEntry::bcases()
{
if (f_bcases == (const int)NULL)
if (f_bcases == (const int)0)
f_bcases = new UAS_List<DtSR_BookcaseSearchEntry>();
return *(UAS_List<DtSR_BookcaseSearchEntry>*)f_bcases;
}

24
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C
View File

@@ -373,11 +373,11 @@ DtSR_SearchEngine::init(UAS_PtrList<const char> *bcases)
continue;
UAS_Pointer<UAS_Common> obj;
if ((obj = UAS_Factory::create(bookcase_url)) == (int)NULL)
if ((obj = UAS_Factory::create(bookcase_url)) == (int)0)
continue;
UAS_Pointer<UAS_Common> bookcase;
if ((bookcase =
((UAS_Collection*)(UAS_Common *)obj)->root()) == (int)NULL)
((UAS_Collection*)(UAS_Common *)obj)->root()) == (int)0)
continue;
new DtSR_BookcaseSearchEntry(dbn++, bookcase, True);
@@ -478,7 +478,7 @@ resolve_bookid(UAS_Pointer<UAS_Common> &bcase, int serial)
{
UAS_String rval;
if (bcase == (int)NULL || bcase->type() != UAS_BOOKCASE)
if (bcase == (int)0 || bcase->type() != UAS_BOOKCASE)
return rval;
if (serial < 1) // apparently wrong serial number
@@ -642,7 +642,7 @@ DtSR_SearchEngine::search(UAS_String oql, UAS_SearchScope& scope,
UAS_Pointer<UAS_List<UAS_SearchResultsEntry> > res;
if ((res = compress_DtSrResult(DtSr_res, rescount)) == (int)NULL)
if ((res = compress_DtSrResult(DtSr_res, rescount)) == (int)0)
continue;
// book#s specified, apply book-level scope here
@@ -683,7 +683,7 @@ DtSR_SearchEngine::search(UAS_String oql, UAS_SearchScope& scope,
}
for (i = 0; i < (int) res->length(); i++) {
if (res->item(i) == (int)NULL)
if (res->item(i) == (int)0)
res->remove_item(i--);
}
}
@@ -698,23 +698,23 @@ DtSR_SearchEngine::search(UAS_String oql, UAS_SearchScope& scope,
new DtSR_SearchResults(q, n, res, res->length(),
stems, scope.search_zones(), stype);
if (DtSR_result == (int)NULL)
if (DtSR_result == (int)0)
DtSR_result = DtSR_res;
else // merge uas_res into result
DtSR_result->merge(DtSR_res);
}
if (DtSR_result == (int)NULL)
if (DtSR_result == (int)0)
UAS_result = new UAS_SearchResults(new UAS_String(oql),
new UAS_String(scope.name()));
if (UAS_result == (int)NULL) {
assert( DtSR_result != (int)NULL );
if (UAS_result == (int)0) {
assert( DtSR_result != (int)0 );
UAS_result = (UAS_SearchResults*)(DtSR_SearchResults*)DtSR_result;
}
assert( UAS_result != (int)NULL );
assert( UAS_result != (int)0 );
if (current_bc != 0) {
targets.remove(current_bc);
@@ -750,7 +750,7 @@ DtSR_SearchEngine::compress_DtSrResult(DtSrResult*& res, long& count)
char* abstract = iter->abstractp;
UAS_Pointer<UAS_String> id, book, section;
if (DtSR_SearchResultsEntry::
parse_abstract(abstract, id, book, section) == (int)NULL) {
parse_abstract(abstract, id, book, section) == (int)0) {
#ifdef DEBUG
fprintf(stderr, "parse_abstract failed\n");
abort();
@@ -759,7 +759,7 @@ DtSR_SearchEngine::compress_DtSrResult(DtSrResult*& res, long& count)
}
UAS_String Id(*(UAS_String*)id);
UAS_Pointer<DtSR_SearchResultsEntry>& sre = map[Id];
if (sre == (int)NULL) { // not found in map, create one
if (sre == (int)0) { // not found in map, create one
#ifdef DEBUG
cerr << "(DEBUG) " << (char*)Id << ' ' <<
"not found in map" << '\n' << flush;

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C
View File

@@ -102,7 +102,7 @@ DtSR_SearchResults::create_results(int index, int nres)
void
DtSR_SearchResults::merge(UAS_Pointer<DtSR_SearchResults> & res)
{
if (res == (const int)NULL || res->f_ndocs == 0) // nothing to merge
if (res == (const int)0 || res->f_ndocs == 0) // nothing to merge
return;
int i;

4
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C
View File

@@ -196,7 +196,7 @@ DtSR_SearchResultsEntry::section_in_abstract(char* abstract, const char* id)
UAS_Pointer<UAS_String> section_id, book, section;
if (parse_abstract(abstract, section_id, book, section) == (const int)NULL) {
if (parse_abstract(abstract, section_id, book, section) == (const int)0) {
#ifdef DEBUG
fprintf(stderr, "(ERROR) parse_abstract failed\n");
#endif
@@ -221,7 +221,7 @@ static unsigned int proximity2relevance(int prox)
else
inv_prox = 1 / (float)prox; // 0 to 1;
return inv_prox * DtSR_SearchResultsEntry::Utmost_Relevance;
return (unsigned int)(inv_prox * DtSR_SearchResultsEntry::Utmost_Relevance);
}
unsigned int

17
cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
View File

@@ -276,6 +276,23 @@ case "$OS" in
esac
;;
NetBSD*)
case "`uname -m`" in
i386*)
ARCH=i386
;;
amd64*)
ARCH=amd64
;;
*)
ARCH=unknown
;;
esac
;;
*)
err_f "Does not run under [$OS]"
;;

3
cde/programs/dtinfo/tools/misc/Imakefile
View File

@@ -3,6 +3,9 @@ XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:56:17 drk $
XCOMM These tools are used during "make includes".
includes:: all
LOCAL_SED_DEFINES = -e 's|PERL|$(PERL)|g'
SedSourceFile(treeres,treeres.src,$(LOCAL_SED_DEFINES))
NormalCplusplusObjectRule()
NormalLibraryObjectRule()
AllTarget(dfiles)

8
cde/programs/dtinfo/tools/misc/treeres → cde/programs/dtinfo/tools/misc/treeres.src
View File

@@ -1,5 +1,5 @@
# feed this into perl
eval '(exit $?0)' && eval 'exec /usr/bin/perl $0 ${1+"$@"}' & eval 'exec /usr/bin/perl $0 $argv'
eval '(exit $?0)' && eval 'exec PERL $0 ${1+"$@"}' & eval 'exec PERL $0 $argv'
if 0;
# treeres - resource file preprocessor
@@ -34,7 +34,7 @@ eval '(exit $?0)' && eval 'exec /usr/bin/perl $0 ${1+"$@"}' & eval 'exec /usr/bi
*IN = STDIN;
$file = "<stdin>";
if ($#ARGV >= 0)
{
{
open(IN,$ARGV[0]) || die "Can't open file $ARGV[0].\n";
$file = $ARGV[0];
}
@@ -65,7 +65,7 @@ while (<IN>)
$continuation = /[^\\](\\\\)*\\$/;
# Multiple blank lines are compressed to one
if (/^([ \t]*)(!x.*)?$/) {
if (/^([ \t]*)(!x.*)?$/) {
if ($blankcount++ == 0) { print; }
next;
}
@@ -92,7 +92,7 @@ while (<IN>)
# Make base array length match current level
#DEBUG print "! oldlevel = $oldlevel, level = $level\n";
if ($oldlevel > 0 && $level <= $oldlevel && ! $did_gen)
{ print STDERR $file, ":", $line,
{ print STDERR $file, ":", $line,
": Level <= previous with no generation.\n"; }
$#base = $level - 1;

3
cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh
View File

@@ -30,7 +30,7 @@ ifs=$IFS
magic=4400000
map=
regress=
shell=`(eval 'typeset -l x=$((0+0))KSH; echo ${x#0}') 2>/dev/null`
shell=`(eval 'x=$((0+0))ksh; echo ${x#0}') 2>/dev/null`
something=
PATH=$PATH:/usr/kvm:/usr/ccs/bin:/usr/local/bin:/usr/add-on/gnu/bin:/usr/add-on/GNU/bin:/opt/gnu/bin:/opt/GNU/bin
export PATH
@@ -442,7 +442,6 @@ main()
;;
esac
case $shell in
ksh) typeset -l type=$type ;;
*) type=`echo $type | tr '[A-Z]' '[a-z]'` ;;
esac

5
cde/programs/dtlogin/Imakefile
View File

@@ -125,7 +125,8 @@ SYS_LIBRARIES = -ls
SYS_LIBRARIES = -lm -lXdmcp
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || \
defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
SYS_LIBRARIES = -lm -lcrypt
EXTRA_DEFINES = $(XINOPT)
LOGINXLIB = $(XLIB) $(XINLIB)
@@ -207,6 +208,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
NATIVEXBINDIR = /usr/local/bin
#elif defined(OpenBSDArchitecture)
NATIVEXBINDIR = /usr/X11R6/bin
#elif defined(NetBSDArchitecture)
NATIVEXBINDIR = /usr/X11R7/bin
#else
NATIVEXBINDIR = /usr/bin/X11
#endif

2
cde/programs/dtlogin/config/0060.dtsysenv.src
View File

@@ -27,7 +27,7 @@ XCOMM ####################################################################
#define HASH #
#if !defined(__FreeBSD__)
#if !defined(CSRG_BASED)
HASH
HASH Source TIMEZONE
HASH

4
cde/programs/dtlogin/config/Xfailsafe.src
View File

@@ -59,6 +59,10 @@ XCOMM
#endif
#if defined(__FreeBSD__)
XDIR=/usr/local/bin
#elif defined(__OpenBSD__)
XDIR=/usr/X11R6/bin
#elif defined(__NetBSD__)
XDIR=/usr/X11R7/bin
#endif
$XDIR/xsetroot -default &

2
cde/programs/dtlogin/config/Xservers.src
View File

@@ -115,6 +115,8 @@ XCOMM * Local local@console /usr/bin/X11/X :0
:0 Local local_uid@tty1 root /usr/bin/X :0
#elif defined (__OpenBSD__)
:0 Local local@console /usr/X11R6/bin/X :0
#elif defined (__NetBSD__)
:0 Local local@console /usr/X11R7/bin/X :0
#elif defined (__FreeBSD__)
:0 Local local@console /usr/local/bin/X :0
#else

8
cde/programs/dtlogin/config/Xsession.src
View File

@@ -95,6 +95,14 @@ XCOMM ##########################################################################
# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
#endif
#ifdef __NetBSD__
# define cpp_MAIL "/var/mail/$USER"
# define cpp_XINITUSER "$HOME/.xinitrc"
# define cpp_XDMSYS "/etc/X11/xdm/Xsession"
# undef cpp_HELLO
# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
#endif
#if 0
/*

2
cde/programs/dtlogin/config/Xsetup.src
View File

@@ -60,6 +60,8 @@ fi
XDIR=/usr/bin
#elif defined(__OpenBSD__)
XDIR=/usr/X11R6/bin
#elif defined(__NetBSD__)
XDIR=/usr/X11R7/bin
#elif defined(__FreeBSD__)
XDIR=/usr/local/bin
#else

2
cde/programs/dtlogin/config/Xstartup.src
View File

@@ -60,7 +60,7 @@ then
#if defined (__OpenBSD__)
/sbin/chown $USER /dev/$ITE
/bin/chgrp $USER_GID /dev/$ITE
#elif defined (__FreeBSD__)
#elif defined (__FreeBSD__) || defined(__NetBSD__)
/usr/sbin/chown $USER /dev/$ITE
/usr/bin/chgrp $USER_GID /dev/$ITE
#else

4
cde/programs/dtlogin/config/_common.ksh.src
View File

@@ -32,7 +32,7 @@
HASH
HASH Determine Xsession parent
HASH
#if defined (__osf__) || defined(__OpenBSD__)
#if defined (__osf__) || defined(__OpenBSD__) || defined(__NetBSD__)
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
#elif defined(USL) && (OSMAJORVERSION > 1)
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}')
@@ -503,6 +503,8 @@ SetKeyboardMap()
FONTLIB=/usr/local/lib/X11/fonts
#elif defined(__OpenBSD__)
FONTLIB=/usr/X11R6/lib/X11/fonts
#elif defined(__NetBSD__)
FONTLIB=/usr/X11R7/lib/X11/fonts
#endif
for i in misc 75dpi 100dpi Speedo Type1 PJE
do

3
cde/programs/dtlogin/dm.c
View File

@@ -51,6 +51,7 @@
* display manager
*/
# include <sys/types.h>
# include <sys/signal.h>
# include <sys/stat.h>
#if defined(__FreeBSD__) && OSMAJORVERSION > 8
@@ -61,7 +62,7 @@
# include <time.h>
# include <utime.h>
# include <pwd.h>
#if defined(linux) || defined(__FreeBSD__)
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
# include <stdarg.h>
#else
# include <varargs.h>

1
cde/programs/dtlogin/reset.c
View File

@@ -53,6 +53,7 @@
*/
# include <setjmp.h>
# include <sys/types.h>
# include <sys/signal.h>
# include "dm.h"
# include "vgmsg.h"

1
cde/programs/dtlogin/server.c
View File

@@ -46,6 +46,7 @@
* Author: Keith Packard, MIT X Consortium
*/
# include <sys/types.h>
# include <sys/signal.h>
# include <setjmp.h>
# include <pwd.h>

2
cde/programs/dtmail/libDtMail/Common/Session.C
View File

@@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs)
DtMailEnv error;
iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
#if defined(_AIX) || defined(sun) || defined(__FreeBSD__)
#if defined(_AIX) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
const char *ip = (const char *) *bp;
#else
char *ip = *bp;

2
cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
View File

@@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs)
DtMailEnv error;
iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
#if defined(_aix) || defined(sun) || defined(__FreeBSD__)
#if defined(_aix) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
const char *ip = (const char *) *bp;
#else
char *ip = *bp;

2
cde/programs/dtprintinfo/dtprintinfo.msg.src
View File

@@ -1,5 +1,5 @@
$ $XConsortium: dtprintinfo.msg.src /main/1 1995/12/04 17:07:27 rswiston $
$quote "
$quote XDQUOTE
$set DTPRINTER_SET
$ ----- These are the titles that appear on dialogs and the main window -----

2
cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
View File

@@ -105,7 +105,7 @@ SysErrorMsg(
int n
)
{
#if !defined(linux) && !defined(__FreeBSD__)
#if !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
extern char *sys_errlist[];
extern int sys_nerr;
#endif

12
cde/programs/dtprintinfo/sym2num
View File

@@ -10,13 +10,11 @@
# by gencat.
#
typeset -u CAP_SYMBOL_NAME
(( $# != 2 )) && { print "usage: sym2num <symbol name> <source file>" ;\
exit 1 ; }
SYMBOL_NAME=$1
CAP_SYMBOL_NAME=$1 # capitalized symbol name
CAP_SYMBOL_NAME=`echo $1 | tr '[:lower:]' '[:upper:]'` # capitalized symbol
SOURCE_FILE=$2
inc_file=${SYMBOL_NAME}_msg.h # include file
@@ -61,11 +59,15 @@ then
elif [[ -f /usr/libexec/cpp ]] #BSD
then
cpp_path=/usr/libexec
elif [[ -f /usr/bin/cpp ]] #BSD
then
cpp_path=/usr/bin
elif [[ -f /lib/cpp ]] #HP
then
cpp_path=/lib
fi
( cat ${inc_file} | sed -n /define/p ; cat ${SOURCE_FILE} ) | \
${cpp_path}/cpp -P | sed '/^$/d' | sed 's/^\([1-9][0-9]*\)[ ]*\(.*\)/\1 \2/'
${cpp_path}/cpp -P | sed -e '/^$/d' -e 's/^\$$/\$ /' \
-e 's/\"\"$/\"/' -e 's/XDQUOTE/\"/' -e "s/XSQUOTE/\'/" \
-e 's/^\([1-9][0-9]*\)[ ]*[\"]*\(\"\)\(.*\)/\1 \2\3/'

2
cde/programs/dtsearchpath/dtappg/Options.C
View File

@@ -31,7 +31,7 @@
#include "Options.h"
#include <stdlib.h>
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/dtsearchpath/dtappg/dtappgather.C
View File

@@ -75,7 +75,7 @@
#include "dtappgather.h"
#include "DirIterator.h"
#include <stdlib.h>
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

4
cde/programs/dtsearchpath/dtsp/ManSearchPath.C
View File

@@ -136,7 +136,7 @@ void ManSearchPath::Print()
}
}
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
std::ostream & operator<<
(
std::ostream & os,
@@ -150,7 +150,7 @@ ostream & operator<<
)
#endif
{
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
os << sp.GetEnvVar() << std::endl;
#else
os << sp.GetEnvVar() << endl;

2
cde/programs/dtsearchpath/dtsp/Options.C
View File

@@ -33,7 +33,7 @@
#include "Options.h"
#include <stdlib.h>
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

10
cde/programs/dtsearchpath/dtsp/SearchPath.C
View File

@@ -387,7 +387,7 @@ void SearchPath::Print()
*
****************************************************************/
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
void SearchPath::PrettyPrint
(
std::ostream & os
@@ -402,14 +402,14 @@ void SearchPath::PrettyPrint
CTokenizedString path (GetSearchPath(), Separator().data());
CString subpath = path.next();
while (!subpath.isNull()) {
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
os << " " << subpath << std::endl;
#else
os << " " << subpath << endl;
#endif
subpath = path.next();
}
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
os << std::endl;
#else
os << endl;
@@ -424,7 +424,7 @@ void SearchPath::PrettyPrint
*
****************************************************************/
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
std::ostream & operator<<
(
std::ostream & os,
@@ -438,7 +438,7 @@ ostream & operator<<
)
#endif
{
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
#else
os << sp.GetEnvVar() << "SEARCHPATH:" << endl;

6
cde/programs/dtsearchpath/dtsp/SearchPath.h
View File

@@ -34,7 +34,7 @@
#include "Environ.h"
#include "cstring.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>
@@ -51,7 +51,7 @@ class SearchPath {
virtual void Print();
virtual void AddPredefinedPath();
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
virtual void PrettyPrint (std::ostream &) const;
friend std::ostream & operator<< (std::ostream &, const SearchPath &);
@@ -186,7 +186,7 @@ class ManSearchPath : public SearchPath {
virtual void ExportPath ();
virtual void Print();
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
friend std::ostream & operator<< (std::ostream &, const ManSearchPath &);
#else
friend ostream & operator<< (ostream &, const ManSearchPath &);

2
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
View File

@@ -84,6 +84,8 @@ UnixEnvironment::UnixEnvironment()
manpath = "/usr/share/man:/usr/X11R6/man:/usr/local/man:/usr/ports/infrastructure/man";
#elif defined(__FreeBSD__)
manpath = "/usr/share/man:/usr/local/man";
#elif defined(__NetBSD__)
manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man";
#endif
else
manpath = temp;

2
cde/programs/dtsession/Imakefile
View File

@@ -76,7 +76,7 @@ EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT
SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lXss -ldl -lcrypt -lm
#endif
#if defined(FreeBSDArchitecture)
#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT)
SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lcrypt -lm
#endif

2
cde/programs/fontaliases/Imakefile
View File

@@ -16,6 +16,8 @@ SUBDIRS = linux
SUBDIRS = freebsd
#elif defined(OpenBSDArchitecture)
SUBDIRS = openbsd
#elif defined(NetBSDArchitecture)
SUBDIRS = netbsd
#elif defined(USLArchitecture)
SUBDIRS = novell
#elif defined(UXPArchitecture)

3
cde/programs/fontaliases/netbsd/C/Imakefile Normal file
View File

@@ -0,0 +1,3 @@
XCOMM $XConsortium: Imakefile /main/3 1996/09/13 17:50:44 drk $
#include "../../bdf/fonts.tmpl"

178
cde/programs/fontaliases/netbsd/C/fonts.alias Normal file
View File

@@ -0,0 +1,178 @@
! $XConsortium: fonts.alias /main/3 1996/10/29 17:06:58 drk $
"-dt-interface system-medium-r-normal-xxs sans-10-100-72-72-p-61-iso8859-1" "-adobe-helvetica-medium-r-normal--10-*-75-75-p-56-iso8859-1"
"-dt-interface system-medium-r-normal-xs sans-11-110-72-72-p-64-iso8859-1" "-adobe-helvetica-medium-r-normal--11-80-100-100-p-56-iso8859-1"
"-dt-interface system-medium-r-normal-s sans-12-120-72-72-p-73-iso8859-1" "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
"-dt-interface system-medium-r-normal-m sans-13-130-72-72-p-87-iso8859-1" "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1"
"-dt-interface system-medium-r-normal-l sans-15-150-72-72-p-100-iso8859-1" "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1"
"-dt-interface system-medium-r-normal-xl sans-18-180-72-72-p-114-iso8859-1" "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1"
"-dt-interface system-medium-r-normal-xxl sans-21-210-72-72-p-123-iso8859-1" "-adobe-helvetica-medium-r-normal--20-140-100-100-p-100-iso8859-1"
"-dt-application-bold-i-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-bold-o-normal--11-80-100-100-m-60-iso8859-1"
"-dt-application-bold-i-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-bold-o-normal--14-100-100-100-m-90-iso8859-1"
"-dt-application-bold-i-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-bold-o-normal--17-120-100-100-m-100-iso8859-1"
"-dt-application-bold-i-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-bold-o-normal--20-140-100-100-m-110-iso8859-1"
"-dt-application-bold-i-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-bold-o-normal--25-180-100-100-m-150-iso8859-1"
"-dt-application-bold-i-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-bold-o-normal--34-240-100-100-m-200-iso8859-1"
"-dt-application-bold-i-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-bold-o-normal--8-80-75-75-m-50-iso8859-1"
"-dt-application-bold-i-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-bold-o-normal--10-100-75-75-m-60-iso8859-1"
"-dt-application-bold-i-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1"
"-dt-application-bold-i-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-bold-o-normal--14-140-75-75-m-90-iso8859-1"
"-dt-application-bold-i-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-bold-o-normal--18-180-75-75-m-110-iso8859-1"
"-dt-application-bold-i-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-bold-o-normal--24-240-75-75-m-150-iso8859-1"
"-dt-application-bold-i-normal-sans-11-80-100-100-p-60-iso8859-1" "-adobe-helvetica-bold-o-normal--11-80-100-100-p-60-iso8859-1"
"-dt-application-bold-i-normal-sans-14-100-100-100-p-82-iso8859-1" "-adobe-helvetica-bold-o-normal--14-100-100-100-p-82-iso8859-1"
"-dt-application-bold-i-normal-sans-17-120-100-100-p-92-iso8859-1" "-adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1"
"-dt-application-bold-i-normal-sans-20-140-100-100-p-103-iso8859-1" "-adobe-helvetica-bold-o-normal--20-140-100-100-p-103-iso8859-1"
"-dt-application-bold-i-normal-sans-25-180-100-100-p-138-iso8859-1" "-adobe-helvetica-bold-o-normal--25-180-100-100-p-138-iso8859-1"
"-dt-application-bold-i-normal-sans-34-240-100-100-p-182-iso8859-1" "-adobe-helvetica-bold-o-normal--34-240-100-100-p-182-iso8859-1"
"-dt-application-bold-i-normal-serif-11-80-100-100-p-57-iso8859-1" "-adobe-times-bold-i-normal--11-80-100-100-p-57-iso8859-1"
"-dt-application-bold-i-normal-serif-14-100-100-100-p-77-iso8859-1" "-adobe-times-bold-i-normal--14-100-100-100-p-77-iso8859-1"
"-dt-application-bold-i-normal-serif-17-120-100-100-p-86-iso8859-1" "-adobe-times-bold-i-normal--17-120-100-100-p-86-iso8859-1"
"-dt-application-bold-i-normal-serif-20-140-100-100-p-98-iso8859-1" "-adobe-times-bold-i-normal--20-140-100-100-p-98-iso8859-1"
"-dt-application-bold-i-normal-serif-25-180-100-100-p-128-iso8859-1" "-adobe-times-bold-i-normal--25-180-100-100-p-128-iso8859-1"
"-dt-application-bold-i-normal-serif-34-240-100-100-p-170-iso8859-1" "-adobe-times-bold-i-normal--34-240-100-100-p-170-iso8859-1"
"-dt-application-bold-i-normal-sans-8-80-75-75-p-50-iso8859-1" "-adobe-helvetica-bold-o-normal--8-80-75-75-p-50-iso8859-1"
"-dt-application-bold-i-normal-sans-10-100-75-75-p-60-iso8859-1" "-adobe-helvetica-bold-o-normal--10-100-75-75-p-60-iso8859-1"
"-dt-application-bold-i-normal-sans-12-120-75-75-p-69-iso8859-1" "-adobe-helvetica-bold-o-normal--12-120-75-75-p-69-iso8859-1"
"-dt-application-bold-i-normal-sans-14-140-75-75-p-82-iso8859-1" "-adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1"
"-dt-application-bold-i-normal-sans-18-180-75-75-p-104-iso8859-1" "-adobe-helvetica-bold-o-normal--18-180-75-75-p-104-iso8859-1"
"-dt-application-bold-i-normal-sans-24-240-75-75-p-138-iso8859-1" "-adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1"
"-dt-application-bold-i-normal-serif-8-80-75-75-p-47-iso8859-1" "-adobe-times-bold-i-normal--8-80-75-75-p-47-iso8859-1"
"-dt-application-bold-i-normal-serif-10-100-75-75-p-57-iso8859-1" "-adobe-times-bold-i-normal--10-100-75-75-p-57-iso8859-1"
"-dt-application-bold-i-normal-serif-12-120-75-75-p-68-iso8859-1" "-adobe-times-bold-i-normal--12-120-75-75-p-68-iso8859-1"
"-dt-application-bold-i-normal-serif-14-140-75-75-p-77-iso8859-1" "-adobe-times-bold-i-normal--14-140-75-75-p-77-iso8859-1"
"-dt-application-bold-i-normal-serif-18-180-75-75-p-98-iso8859-1" "-adobe-times-bold-i-normal--18-180-75-75-p-98-iso8859-1"
"-dt-application-bold-i-normal-serif-24-240-75-75-p-128-iso8859-1" "-adobe-times-bold-i-normal--24-240-75-75-p-128-iso8859-1"
"-dt-application-bold-r-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-bold-r-normal--11-80-100-100-m-60-iso8859-1"
"-dt-application-bold-r-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-bold-r-normal--14-100-100-100-m-90-iso8859-1"
"-dt-application-bold-r-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-bold-r-normal--17-120-100-100-m-100-iso8859-1"
"-dt-application-bold-r-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-bold-r-normal--20-140-100-100-m-110-iso8859-1"
"-dt-application-bold-r-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-bold-r-normal--25-180-100-100-m-150-iso8859-1"
"-dt-application-bold-r-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1"
"-dt-application-bold-r-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-bold-r-normal--8-80-75-75-m-50-iso8859-1"
"-dt-application-bold-r-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-bold-r-normal--10-100-75-75-m-60-iso8859-1"
"-dt-application-bold-r-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1"
"-dt-application-bold-r-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-bold-r-normal--14-140-75-75-m-90-iso8859-1"
"-dt-application-bold-r-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-bold-r-normal--18-180-75-75-m-110-iso8859-1"
"-dt-application-bold-r-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-bold-r-normal--24-240-75-75-m-150-iso8859-1"
"-dt-application-bold-r-normal-sans-11-80-100-100-p-60-iso8859-1" "-adobe-helvetica-bold-r-normal--11-80-100-100-p-60-iso8859-1"
"-dt-application-bold-r-normal-sans-14-100-100-100-p-82-iso8859-1" "-adobe-helvetica-bold-r-normal--14-100-100-100-p-82-iso8859-1"
"-dt-application-bold-r-normal-sans-17-120-100-100-p-92-iso8859-1" "-adobe-helvetica-bold-r-normal--17-120-100-100-p-92-iso8859-1"
"-dt-application-bold-r-normal-sans-20-140-100-100-p-105-iso8859-1" "-adobe-helvetica-bold-r-normal--20-140-100-100-p-105-iso8859-1"
"-dt-application-bold-r-normal-sans-25-180-100-100-p-138-iso8859-1" "-adobe-helvetica-bold-r-normal--25-180-100-100-p-138-iso8859-1"
"-dt-application-bold-r-normal-sans-34-240-100-100-p-182-iso8859-1" "-adobe-helvetica-bold-r-normal--34-240-100-100-p-182-iso8859-1"
"-dt-application-bold-r-normal-serif-11-80-100-100-p-57-iso8859-1" "-adobe-times-bold-r-normal--11-80-100-100-p-57-iso8859-1"
"-dt-application-bold-r-normal-serif-14-100-100-100-p-76-iso8859-1" "-adobe-times-bold-r-normal--14-100-100-100-p-76-iso8859-1"
"-dt-application-bold-r-normal-serif-17-120-100-100-p-88-iso8859-1" "-adobe-times-bold-r-normal--17-120-100-100-p-88-iso8859-1"
"-dt-application-bold-r-normal-serif-20-140-100-100-p-100-iso8859-1" "-adobe-times-bold-r-normal--20-140-100-100-p-100-iso8859-1"
"-dt-application-bold-r-normal-serif-25-180-100-100-p-132-iso8859-1" "-adobe-times-bold-r-normal--25-180-100-100-p-132-iso8859-1"
"-dt-application-bold-r-normal-serif-34-240-100-100-p-177-iso8859-1" "-adobe-times-bold-r-normal--34-240-100-100-p-177-iso8859-1"
"-dt-application-bold-r-normal-sans-8-80-75-75-p-50-iso8859-1" "-adobe-helvetica-bold-r-normal--8-80-75-75-p-50-iso8859-1"
"-dt-application-bold-r-normal-sans-10-100-75-75-p-60-iso8859-1" "-adobe-helvetica-bold-r-normal--10-100-75-75-p-60-iso8859-1"
"-dt-application-bold-r-normal-sans-12-120-75-75-p-70-iso8859-1" "-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1"
"-dt-application-bold-r-normal-sans-14-140-75-75-p-82-iso8859-1" "-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1"
"-dt-application-bold-r-normal-sans-18-180-75-75-p-103-iso8859-1" "-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1"
"-dt-application-bold-r-normal-sans-24-240-75-75-p-138-iso8859-1" "-adobe-helvetica-bold-r-normal--24-240-75-75-p-138-iso8859-1"
"-dt-application-bold-r-normal-serif-8-80-75-75-p-47-iso8859-1" "-adobe-times-bold-r-normal--8-80-75-75-p-47-iso8859-1"
"-dt-application-bold-r-normal-serif-10-100-75-75-p-57-iso8859-1" "-adobe-times-bold-r-normal--10-100-75-75-p-57-iso8859-1"
"-dt-application-bold-r-normal-serif-12-120-75-75-p-67-iso8859-1" "-adobe-times-bold-r-normal--12-120-75-75-p-67-iso8859-1"
"-dt-application-bold-r-normal-serif-14-140-75-75-p-77-iso8859-1" "-adobe-times-bold-r-normal--14-140-75-75-p-77-iso8859-1"
"-dt-application-bold-r-normal-serif-18-180-75-75-p-99-iso8859-1" "-adobe-times-bold-r-normal--18-180-75-75-p-99-iso8859-1"
"-dt-application-bold-r-normal-serif-24-240-75-75-p-132-iso8859-1" "-adobe-times-bold-r-normal--24-240-75-75-p-132-iso8859-1"
"-dt-application-medium-i-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-medium-o-normal--11-80-100-100-m-60-iso8859-1"
"-dt-application-medium-i-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-medium-o-normal--14-100-100-100-m-90-iso8859-1"
"-dt-application-medium-i-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-medium-o-normal--17-120-100-100-m-100-iso8859-1"
"-dt-application-medium-i-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-medium-o-normal--20-140-100-100-m-110-iso8859-1"
"-dt-application-medium-i-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-medium-o-normal--25-180-100-100-m-150-iso8859-1"
"-dt-application-medium-i-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-medium-o-normal--34-240-100-100-m-200-iso8859-1"
"-dt-application-medium-i-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-medium-o-normal--8-80-75-75-m-50-iso8859-1"
"-dt-application-medium-i-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-medium-o-normal--10-100-75-75-m-60-iso8859-1"
"-dt-application-medium-i-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-medium-o-normal--12-120-75-75-m-70-iso8859-1"
"-dt-application-medium-i-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-medium-o-normal--14-140-75-75-m-90-iso8859-1"
"-dt-application-medium-i-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-medium-o-normal--18-180-75-75-m-110-iso8859-1"
"-dt-application-medium-i-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-medium-o-normal--24-240-75-75-m-150-iso8859-1"
"-dt-application-medium-i-normal-sans-11-80-100-100-p-57-iso8859-1" "-adobe-helvetica-medium-o-normal--11-80-100-100-p-57-iso8859-1"
"-dt-application-medium-i-normal-sans-14-100-100-100-p-78-iso8859-1" "-adobe-helvetica-medium-o-normal--14-100-100-100-p-78-iso8859-1"
"-dt-application-medium-i-normal-sans-17-120-100-100-p-88-iso8859-1" "-adobe-helvetica-medium-o-normal--17-120-100-100-p-88-iso8859-1"
"-dt-application-medium-i-normal-sans-20-140-100-100-p-98-iso8859-1" "-adobe-helvetica-medium-o-normal--20-140-100-100-p-98-iso8859-1"
"-dt-application-medium-i-normal-sans-25-180-100-100-p-130-iso8859-1" "-adobe-helvetica-medium-o-normal--25-180-100-100-p-130-iso8859-1"
"-dt-application-medium-i-normal-sans-34-240-100-100-p-176-iso8859-1" "-adobe-helvetica-medium-o-normal--34-240-100-100-p-176-iso8859-1"
"-dt-application-medium-i-normal-serif-11-80-100-100-p-52-iso8859-1" "-adobe-times-medium-i-normal--11-80-100-100-p-52-iso8859-1"
"-dt-application-medium-i-normal-serif-14-100-100-100-p-73-iso8859-1" "-adobe-times-medium-i-normal--14-100-100-100-p-73-iso8859-1"
"-dt-application-medium-i-normal-serif-17-120-100-100-p-84-iso8859-1" "-adobe-times-medium-i-normal--17-120-100-100-p-84-iso8859-1"
"-dt-application-medium-i-normal-serif-20-140-100-100-p-94-iso8859-1" "-adobe-times-medium-i-normal--20-140-100-100-p-94-iso8859-1"
"-dt-application-medium-i-normal-serif-25-180-100-100-p-125-iso8859-1" "-adobe-times-medium-i-normal--25-180-100-100-p-125-iso8859-1"
"-dt-application-medium-i-normal-serif-34-240-100-100-p-168-iso8859-1" "-adobe-times-medium-i-normal--34-240-100-100-p-168-iso8859-1"
"-dt-application-medium-i-normal-sans-8-80-75-75-p-47-iso8859-1" "-adobe-helvetica-medium-o-normal--8-80-75-75-p-47-iso8859-1"
"-dt-application-medium-i-normal-sans-10-100-75-75-p-57-iso8859-1" "-adobe-helvetica-medium-o-normal--10-100-75-75-p-57-iso8859-1"
"-dt-application-medium-i-normal-sans-12-120-75-75-p-67-iso8859-1" "-adobe-helvetica-medium-o-normal--12-120-75-75-p-67-iso8859-1"
"-dt-application-medium-i-normal-sans-14-140-75-75-p-78-iso8859-1" "-adobe-helvetica-medium-o-normal--14-140-75-75-p-78-iso8859-1"
"-dt-application-medium-i-normal-sans-18-180-75-75-p-98-iso8859-1" "-adobe-helvetica-medium-o-normal--18-180-75-75-p-98-iso8859-1"
"-dt-application-medium-i-normal-sans-24-240-75-75-p-130-iso8859-1" "-adobe-helvetica-medium-o-normal--24-240-75-75-p-130-iso8859-1"
"-dt-application-medium-i-normal-serif-8-80-75-75-p-42-iso8859-1" "-adobe-times-medium-i-normal--8-80-75-75-p-42-iso8859-1"
"-dt-application-medium-i-normal-serif-10-100-75-75-p-52-iso8859-1" "-adobe-times-medium-i-normal--10-100-75-75-p-52-iso8859-1"
"-dt-application-medium-i-normal-serif-12-120-75-75-p-63-iso8859-1" "-adobe-times-medium-i-normal--12-120-75-75-p-63-iso8859-1"
"-dt-application-medium-i-normal-serif-14-140-75-75-p-73-iso8859-1" "-adobe-times-medium-i-normal--14-140-75-75-p-73-iso8859-1"
"-dt-application-medium-i-normal-serif-18-180-75-75-p-94-iso8859-1" "-adobe-times-medium-i-normal--18-180-75-75-p-94-iso8859-1"
"-dt-application-medium-i-normal-serif-24-240-75-75-p-125-iso8859-1" "-adobe-times-medium-i-normal--24-240-75-75-p-125-iso8859-1"
"-dt-application-medium-r-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-medium-r-normal--11-80-100-100-m-60-iso8859-1"
"-dt-application-medium-r-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-medium-r-normal--14-100-100-100-m-90-iso8859-1"
"-dt-application-medium-r-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-medium-r-normal--17-120-100-100-m-100-iso8859-1"
"-dt-application-medium-r-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-medium-r-normal--20-140-100-100-m-110-iso8859-1"
"-dt-application-medium-r-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-medium-r-normal--25-180-100-100-m-150-iso8859-1"
"-dt-application-medium-r-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-medium-r-normal--34-240-100-100-m-200-iso8859-1"
"-dt-application-medium-r-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-medium-r-normal--8-80-75-75-m-50-iso8859-1"
"-dt-application-medium-r-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-medium-r-normal--10-100-75-75-m-60-iso8859-1"
"-dt-application-medium-r-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-medium-r-normal--12-120-75-75-m-70-iso8859-1"
"-dt-application-medium-r-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1"
"-dt-application-medium-r-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-medium-r-normal--18-180-75-75-m-110-iso8859-1"
"-dt-application-medium-r-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-medium-r-normal--24-240-75-75-m-150-iso8859-1"
"-dt-application-medium-r-normal--11-80-100-100-p-61-dtsymbol-1" "-adobe-symbol-medium-r-normal--11-80-100-100-p-61-adobe-fontspecific"
"-dt-application-medium-r-normal--14-100-100-100-p-85-dtsymbol-1" "-adobe-symbol-medium-r-normal--14-100-100-100-p-85-adobe-fontspecific"
"-dt-application-medium-r-normal--17-120-100-100-p-95-dtsymbol-1" "-adobe-symbol-medium-r-normal--17-120-100-100-p-95-adobe-fontspecific"
"-dt-application-medium-r-normal--20-140-100-100-p-107-dtsymbol-1" "-adobe-symbol-medium-r-normal--20-140-100-100-p-107-adobe-fontspecific"
"-dt-application-medium-r-normal--25-180-100-100-p-142-dtsymbol-1" "-adobe-symbol-medium-r-normal--25-180-100-100-p-142-adobe-fontspecific"
"-dt-application-medium-r-normal--34-240-100-100-p-191-dtsymbol-1" "-adobe-symbol-medium-r-normal--34-240-100-100-p-191-adobe-fontspecific"
"-dt-application-medium-r-normal-sans-11-80-100-100-p-56-iso8859-1" "-adobe-helvetica-medium-r-normal--11-80-100-100-p-56-iso8859-1"
"-dt-application-medium-r-normal-sans-14-100-100-100-p-76-iso8859-1" "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1"
"-dt-application-medium-r-normal-sans-17-120-100-100-p-88-iso8859-1" "-adobe-helvetica-medium-r-normal--17-120-100-100-p-88-iso8859-1"
"-dt-application-medium-r-normal-sans-20-140-100-100-p-100-iso8859-1" "-adobe-helvetica-medium-r-normal--20-140-100-100-p-100-iso8859-1"
"-dt-application-medium-r-normal-sans-25-180-100-100-p-130-iso8859-1" "-adobe-helvetica-medium-r-normal--25-180-100-100-p-130-iso8859-1"
"-dt-application-medium-r-normal-sans-34-240-100-100-p-176-iso8859-1" "-adobe-helvetica-medium-r-normal--34-240-100-100-p-176-iso8859-1"
"-dt-application-medium-r-normal-serif-11-80-100-100-p-54-iso8859-1" "-adobe-times-medium-r-normal--11-80-100-100-p-54-iso8859-1"
"-dt-application-medium-r-normal-serif-14-100-100-100-p-74-iso8859-1" "-adobe-times-medium-r-normal--14-100-100-100-p-74-iso8859-1"
"-dt-application-medium-r-normal-serif-17-120-100-100-p-84-iso8859-1" "-adobe-times-medium-r-normal--17-120-100-100-p-84-iso8859-1"
"-dt-application-medium-r-normal-serif-20-140-100-100-p-96-iso8859-1" "-adobe-times-medium-r-normal--20-140-100-100-p-96-iso8859-1"
"-dt-application-medium-r-normal-serif-25-180-100-100-p-125-iso8859-1" "-adobe-times-medium-r-normal--25-180-100-100-p-125-iso8859-1"
"-dt-application-medium-r-normal-serif-34-240-100-100-p-170-iso8859-1" "-adobe-times-medium-r-normal--34-240-100-100-p-170-iso8859-1"
"-dt-application-medium-r-normal--8-80-75-75-p-51-dtsymbol-1" "-adobe-symbol-medium-r-normal--8-80-75-75-p-51-adobe-fontspecific"
"-dt-application-medium-r-normal--10-100-75-75-p-61-dtsymbol-1" "-adobe-symbol-medium-r-normal--10-100-75-75-p-61-adobe-fontspecific"
"-dt-application-medium-r-normal--12-120-75-75-p-74-dtsymbol-1" "-adobe-symbol-medium-r-normal--12-120-75-75-p-74-adobe-fontspecific"
"-dt-application-medium-r-normal--14-140-75-75-p-85-dtsymbol-1" "-adobe-symbol-medium-r-normal--14-140-75-75-p-85-adobe-fontspecific"
"-dt-application-medium-r-normal--18-180-75-75-p-107-dtsymbol-1" "-adobe-symbol-medium-r-normal--18-180-75-75-p-107-adobe-fontspecific"
"-dt-application-medium-r-normal--24-240-75-75-p-142-dtsymbol-1" "-adobe-symbol-medium-r-normal--24-240-75-75-p-142-adobe-fontspecific"
"-dt-application-medium-r-normal-sans-8-80-75-75-p-46-iso8859-1" "-adobe-helvetica-medium-r-normal--8-80-75-75-p-46-iso8859-1"
"-dt-application-medium-r-normal-sans-10-100-75-75-p-56-iso8859-1" "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
"-dt-application-medium-r-normal-sans-12-120-75-75-p-67-iso8859-1" "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
"-dt-application-medium-r-normal-sans-14-140-75-75-p-77-iso8859-1" "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1"
"-dt-application-medium-r-normal-sans-18-180-75-75-p-98-iso8859-1" "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1"
"-dt-application-medium-r-normal-sans-24-240-75-75-p-130-iso8859-1" "-adobe-helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1"
"-dt-application-medium-r-normal-serif-8-80-75-75-p-44-iso8859-1" "-adobe-times-medium-r-normal--8-80-75-75-p-44-iso8859-1"
"-dt-application-medium-r-normal-serif-10-100-75-75-p-54-iso8859-1" "-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1"
"-dt-application-medium-r-normal-serif-12-120-75-75-p-64-iso8859-1" "-adobe-times-medium-r-normal--12-120-75-75-p-64-iso8859-1"
"-dt-application-medium-r-normal-serif-14-140-75-75-p-74-iso8859-1" "-adobe-times-medium-r-normal--14-140-75-75-p-74-iso8859-1"
"-dt-application-medium-r-normal-serif-18-180-75-75-p-94-iso8859-1" "-adobe-times-medium-r-normal--18-180-75-75-p-94-iso8859-1"
"-dt-application-medium-r-normal-serif-24-240-75-75-p-124-iso8859-1" "-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1"
"-dt-interface user-bold-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-8-80-72-72-m-50-iso8859-1"
"-dt-interface user-bold-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-10-100-72-72-m-60-iso8859-1"
"-dt-interface user-bold-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-12-120-72-72-m-70-iso8859-1"
"-dt-interface user-bold-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-14-140-72-72-m-90-iso8859-1"
"-dt-interface user-bold-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-17-170-72-72-m-100-iso8859-1"
"-dt-interface user-bold-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-20-200-72-72-m-120-iso8859-1"
"-dt-interface user-bold-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-24-240-72-72-m-145-iso8859-1"
"-dt-interface user-medium-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-8-80-72-72-m-50-iso8859-1"
"-dt-interface user-medium-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-10-100-72-72-m-60-iso8859-1"
"-dt-interface user-medium-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-12-120-72-72-m-70-iso8859-1"
"-dt-interface user-medium-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-14-140-72-72-m-90-iso8859-1"
"-dt-interface user-medium-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-17-170-72-72-m-100-iso8859-1"
"-dt-interface user-medium-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-20-200-72-72-m-120-iso8859-1"
"-dt-interface user-medium-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-24-240-72-72-m-145-iso8859-1"

8
cde/programs/fontaliases/netbsd/Imakefile Normal file
View File

@@ -0,0 +1,8 @@
XCOMM $XConsortium: Imakefile /main/1 1996/09/13 16:34:13 drk $
#define IHaveSubdirs
#define PassCDebugFlags /**/
SUBDIRS = C
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))

6
cde/programs/localized/de_DE.ISO8859-1/msg/dtprintinfo.msg
View File

@@ -27,9 +27,9 @@ $ The information in this document is subject to special
$ restrictions in a confidential disclosure agreement between
$ HP, IBM, Sun, USL, SCO and Univel. Do not distribute this
$ document outside HP, IBM, Sun, USL, SCO, or Univel without
$ Sun's specific written approval. This document and all copies
$ SunXSQUOTEs specific written approval. This document and all copies
$ and derivative works thereof must be returned or destroyed at
$ Sun's request.
$ SunXSQUOTEs request.
$
$ Copyright 1993, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
$
@@ -62,7 +62,7 @@ $ Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A.
$ Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan
$ Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan
$quote "
$quote XDQUOTE
$set DTPRINTER_SET
$ ----- These are the titles that appear on dialogs and the main window -----

6
cde/programs/localized/es_ES.ISO8859-1/msg/dtprintinfo.msg
View File

@@ -27,9 +27,9 @@ $ The information in this document is subject to special
$ restrictions in a confidential disclosure agreement between
$ HP, IBM, Sun, USL, SCO and Univel. Do not distribute this
$ document outside HP, IBM, Sun, USL, SCO, or Univel without
$ Sun's specific written approval. This document and all copies
$ SunXSQUOTEs specific written approval. This document and all copies
$ and derivative works thereof must be returned or destroyed at
$ Sun's request.
$ SunXSQUOTEs request.
$
$ Copyright 1993, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
$
@@ -62,7 +62,7 @@ $ Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A.
$ Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan
$ Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan
$quote "
$quote XDQUOTE
$set DTPRINTER_SET
$ ----- These are the titles that appear on dialogs and the main window -----

6
cde/programs/localized/fr_FR.ISO8859-1/msg/dtprintinfo.msg
View File

@@ -27,9 +27,9 @@ $ The information in this document is subject to special
$ restrictions in a confidential disclosure agreement between
$ HP, IBM, Sun, USL, SCO and Univel. Do not distribute this
$ document outside HP, IBM, Sun, USL, SCO, or Univel without
$ Sun's specific written approval. This document and all copies
$ SunXSQUOTEs specific written approval. This document and all copies
$ and derivative works thereof must be returned or destroyed at
$ Sun's request.
$ SunXSQUOTEs request.
$
$ Copyright 1993, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
$
@@ -62,7 +62,7 @@ $ Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A.
$ Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan
$ Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan
$quote "
$quote XDQUOTE
$set DTPRINTER_SET
$ ----- These are the titles that appear on dialogs and the main window -----

6
cde/programs/localized/it_IT.ISO8859-1/msg/dtprintinfo.msg
View File

@@ -27,9 +27,9 @@ $ The information in this document is subject to special
$ restrictions in a confidential disclosure agreement between
$ HP, IBM, Sun, USL, SCO and Univel. Do not distribute this
$ document outside HP, IBM, Sun, USL, SCO, or Univel without
$ Sun's specific written approval. This document and all copies
$ SunXSQUOTEs specific written approval. This document and all copies
$ and derivative works thereof must be returned or destroyed at
$ Sun's request.
$ SunXSQUOTEs request.
$
$ Copyright 1993, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
$
@@ -62,7 +62,7 @@ $ Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A.
$ Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan
$ Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan
$quote "
$quote XDQUOTE
$set DTPRINTER_SET

2
cde/programs/localized/templates/header2.tmpl
View File

@@ -90,6 +90,6 @@ includes:: @@\
#endif
MAKEMESSCAT = $(KORNSHELL) $(CDESRC)/localized/util/makeMessCat
SYM2NUM_CMD = $(SHELL) $(CDESRC)/dtprintinfo/sym2num
SYM2NUM_CMD = $(KORNSHELL) $(CDESRC)/dtprintinfo/sym2num
MsgCatRule()

2
cde/programs/nsgmls/EUCJPCodingSystem.C
View File

@@ -29,7 +29,7 @@
#ifdef SP_MULTI_BYTE
#include "EUCJPCodingSystem.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/Fixed2CodingSystem.C
View File

@@ -34,7 +34,7 @@
#include "Fixed2CodingSystem.h"
#include "macros.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/IdentityCodingSystem.C
View File

@@ -26,7 +26,7 @@
#include "splib.h"
#include "IdentityCodingSystem.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/SJISCodingSystem.C
View File

@@ -30,7 +30,7 @@
#include "SJISCodingSystem.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/UTF8CodingSystem.C
View File

@@ -30,7 +30,7 @@
#include "UTF8CodingSystem.h"
#include "constant.h"
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/UnicodeCodingSystem.C
View File

@@ -39,7 +39,7 @@ extern "C" {
void *memmove(void *, const void *, size_t);
}
#endif
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/ttsnoop/stringChooser_stubs.C.src
View File

@@ -42,7 +42,7 @@
#include <Xm/TextF.h>
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
#include <fstream>
#else
#include <fstream.h>

2
cde/programs/types/Imakefile
View File

@@ -6,8 +6,6 @@ CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
#if defined (SunArchitecture)
LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LOCAL_CPP_DEFINES = $(CPP_DEFINES) -DNO_DTINFO
#else
LOCAL_CPP_DEFINES = $(CPP_DEFINES)
#endif

64
cde/programs/types/dtwm.fp.src
View File

@@ -182,7 +182,6 @@ CONTROL Applications
HELP_VOLUME FPanel
}
#ifdef NO_DTINFO
CONTROL Help
{
TYPE icon
@@ -196,21 +195,6 @@ CONTROL Help
HELP_TOPIC FPOnItemHelpMgr
HELP_VOLUME FPanel
}
#else
CONTROL InfoManager
{
TYPE icon
CONTAINER_NAME Top
CONTAINER_TYPE BOX
POSITION_HINTS 12
ICON Dtinfo
LABEL %|nls-18031-#Information Manager#|
PUSH_ACTION DtLoadInfoLib
DROP_ACTION DtLoadInfoLib
HELP_TOPIC FPOnItemInfoMgr
HELP_VOLUME FPanel
}
#endif
CONTROL Trash
{
@@ -349,28 +333,16 @@ CONTROL PrintManager
HELP_VOLUME Printmgr
}
#ifndef NO_DTINFO
SUBPANEL InfoManagerSubpanel
{
CONTAINER_NAME InfoManager
TITLE %|nls-18032-#Information#|
}
#else
SUBPANEL HelpSubpanel
{
CONTAINER_NAME Help
TITLE %|nls-18019-#Help#|
}
#endif
CONTROL HelpOverview
{
TYPE icon
#ifndef NO_DTINFO
CONTAINER_NAME InfoManagerSubpanel
#else
CONTAINER_NAME HelpSubpanel
#endif
CONTAINER_TYPE SUBPANEL
POSITION_HINTS 1
ICON Dthover
@@ -383,11 +355,7 @@ CONTROL HelpOverview
CONTROL FPHelp
{
TYPE icon
#ifndef NO_DTINFO
CONTAINER_NAME InfoManagerSubpanel
#else
CONTAINER_NAME HelpSubpanel
#endif
CONTAINER_TYPE SUBPANEL
POSITION_HINTS 2
ICON Fpfphlp
@@ -397,21 +365,6 @@ CONTROL FPHelp
HELP_VOLUME FPanel
}
#ifndef NO_DTINFO
CONTROL HelpMgr
{
TYPE icon
CONTAINER_NAME InfoManagerSubpanel
CONTAINER_TYPE SUBPANEL
POSITION_HINTS 3
ICON Fphelp
LABEL %|nls-18009-#Help Manager#|
PUSH_ACTION Dthelpview
HELP_TOPIC FPOnItemHelpMgr
HELP_VOLUME FPanel
}
#endif
XCOMM
XCOMM OnItem help uses a pseudo push action FPOnItemHelp. Dtwm is looking for
XCOMM an exact match on this push action string. Do not localize this push
@@ -421,9 +374,9 @@ XCOMM
CONTROL OnItem
{
TYPE icon
CONTAINER_NAME InfoManagerSubpanel
CONTAINER_NAME HelpSubpanel
CONTAINER_TYPE SUBPANEL
POSITION_HINTS 4
POSITION_HINTS 3
ICON DthonFP
LABEL %|nls-18021-#On Item Help#|
PUSH_ACTION FPOnItemHelp
@@ -431,6 +384,19 @@ CONTROL OnItem
HELP_VOLUME FPanel
}
CONTROL InfoMgr
{
TYPE icon
CONTAINER_NAME HelpSubpanel
CONTAINER_TYPE SUBPANEL
POSITION_HINTS 4
ICON Dtinfo
LABEL %|nls-18031-#Information Manager#|
PUSH_ACTION DtLoadInfoLib
HELP_TOPIC FPOnItemInfoMgr
HELP_VOLUME FPanel
}
ANIMATION TrashDrop
{
ANIMATION Fptrsh1 100