From 2712d5f787702904f402543550e2d2af2bff561d Mon Sep 17 00:00:00 2001 From: Ulrich Wilkens Date: Thu, 20 Feb 2014 19:19:17 +0100 Subject: [PATCH] NetBSD port --- cde/.gitignore | 19 + cde/admin/IntegTools/dbTools/installCDE.src | 15 + cde/admin/IntegTools/dbTools/mkProd | 4 +- cde/admin/IntegTools/post_install/Imakefile | 4 + .../post_install/freebsd/configRun.src | 2 +- .../IntegTools/post_install/netbsd/Imakefile | 71 +++ .../post_install/netbsd/configMin.src | 257 ++++++++ .../post_install/netbsd/configRun.src | 416 +++++++++++++ .../post_install/netbsd/configShlibs.src | 105 ++++ .../post_install/netbsd/configTT.src | 214 +++++++ cde/config/cf/Imake.cf | 5 + cde/config/cf/Imake.rules | 42 +- cde/config/cf/Imake.tmpl | 8 + cde/config/cf/Motif.tmpl | 2 +- cde/config/cf/NetBSD.cf | 176 +++--- cde/config/cf/site.def | 4 + cde/config/imake/imakemdep.h | 9 +- cde/databases/CDE-FONTS.udb | 18 + cde/databases/CDE-SHLIBS.src | 188 ++++++ cde/databases/Imakefile | 5 +- cde/lib/DtHelp/NetBSD.lcx | 571 ++++++++++++++++++ cde/lib/DtWidget/Imakefile | 4 +- cde/programs/dtaction/Imakefile | 4 + .../dtappbuilder/src/libAButil/util.c | 2 +- cde/programs/dtcm/dtcm/cm_i18n.c | 15 +- cde/programs/dtcm/server/v4ops.c | 4 + cde/programs/dtcreate/cmncbs.c | 1 + cde/programs/dtdocbook/tcl/Imakefile | 43 +- cde/programs/dtdocbook/tcl/tclExpr.c | 8 + cde/programs/dtfile/Trash.c | 8 +- cde/programs/dtfile/dtcopy/sharedFuncs.c | 8 +- .../dtinfo/DtMmdb/HardCopy/autoNumber.C | 1 + .../dtinfo/DtMmdb/StyleSheet/FeatureValue.C | 4 +- .../dtinfo/dtinfo/src/Agents/BookTabMotif.C | 6 +- .../dtinfo/src/Agents/LibraryAgentMotif.C | 8 +- .../dtinfo/src/Agents/OutlineListViewMotif.C | 8 +- .../dtinfo/src/Agents/SearchScopeAgentMotif.C | 12 +- .../dtinfo/dtinfo/src/Agents/UrlAgentMotif.C | 8 +- .../dtinfo/dtinfo/src/Basic/BitField.hh | 2 +- .../dtinfo/dtinfo/src/Managers/LibraryMgr.C | 2 +- .../dtinfo/dtinfo/src/Managers/ServiceMgrX.C | 8 +- .../dtinfo/dtinfo/src/Managers/TtIpcMgr.C | 2 +- .../dtinfo/dtinfo/src/Marks/Mark_mmdb.C | 2 +- .../dtinfo/dtinfo/src/UAS/Base/UAS_Common.C | 2 +- .../dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C | 4 +- .../dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C | 24 +- .../dtinfo/src/UAS/DtSR/DtSR_SearchResults.C | 2 +- .../src/UAS/DtSR/DtSR_SearchResultsEntry.C | 4 +- .../dtinfo/dtinfogen/infolib/etc/dtinfogen | 17 + cde/programs/dtinfo/tools/misc/Imakefile | 3 + .../tools/misc/{treeres => treeres.src} | 8 +- .../dtksh/ksh93/src/lib/lib0ast/hostinfo.sh | 3 +- cde/programs/dtlogin/Imakefile | 5 +- cde/programs/dtlogin/config/0060.dtsysenv.src | 2 +- cde/programs/dtlogin/config/Xfailsafe.src | 4 + cde/programs/dtlogin/config/Xservers.src | 2 + cde/programs/dtlogin/config/Xsession.src | 8 + cde/programs/dtlogin/config/Xsetup.src | 2 + cde/programs/dtlogin/config/Xstartup.src | 2 +- cde/programs/dtlogin/config/_common.ksh.src | 4 +- cde/programs/dtlogin/dm.c | 3 +- cde/programs/dtlogin/reset.c | 1 + cde/programs/dtlogin/server.c | 1 + .../dtmail/libDtMail/Common/Session.C | 2 +- .../dtmail/libDtMail/RFC/RFCBodyPart.C | 2 +- cde/programs/dtprintinfo/dtprintinfo.msg.src | 2 +- .../dtprintinfo/libUI/MotifUI/Debug.c | 2 +- cde/programs/dtprintinfo/sym2num | 12 +- cde/programs/dtsearchpath/dtappg/Options.C | 2 +- .../dtsearchpath/dtappg/dtappgather.C | 2 +- .../dtsearchpath/dtsp/ManSearchPath.C | 4 +- cde/programs/dtsearchpath/dtsp/Options.C | 2 +- cde/programs/dtsearchpath/dtsp/SearchPath.C | 10 +- cde/programs/dtsearchpath/dtsp/SearchPath.h | 6 +- cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 + cde/programs/dtsession/Imakefile | 2 +- cde/programs/fontaliases/Imakefile | 2 + cde/programs/fontaliases/netbsd/C/Imakefile | 3 + cde/programs/fontaliases/netbsd/C/fonts.alias | 178 ++++++ cde/programs/fontaliases/netbsd/Imakefile | 8 + .../de_DE.ISO8859-1/msg/dtprintinfo.msg | 6 +- .../es_ES.ISO8859-1/msg/dtprintinfo.msg | 6 +- .../fr_FR.ISO8859-1/msg/dtprintinfo.msg | 6 +- .../it_IT.ISO8859-1/msg/dtprintinfo.msg | 6 +- cde/programs/localized/templates/header2.tmpl | 2 +- cde/programs/nsgmls/EUCJPCodingSystem.C | 2 +- cde/programs/nsgmls/Fixed2CodingSystem.C | 2 +- cde/programs/nsgmls/IdentityCodingSystem.C | 2 +- cde/programs/nsgmls/SJISCodingSystem.C | 2 +- cde/programs/nsgmls/UTF8CodingSystem.C | 2 +- cde/programs/nsgmls/UnicodeCodingSystem.C | 2 +- .../ttsnoop/stringChooser_stubs.C.src | 2 +- cde/programs/types/Imakefile | 2 - cde/programs/types/dtwm.fp.src | 64 +- 94 files changed, 2442 insertions(+), 301 deletions(-) create mode 100644 cde/admin/IntegTools/post_install/netbsd/Imakefile create mode 100755 cde/admin/IntegTools/post_install/netbsd/configMin.src create mode 100755 cde/admin/IntegTools/post_install/netbsd/configRun.src create mode 100755 cde/admin/IntegTools/post_install/netbsd/configShlibs.src create mode 100755 cde/admin/IntegTools/post_install/netbsd/configTT.src create mode 100644 cde/lib/DtHelp/NetBSD.lcx rename cde/programs/dtinfo/tools/misc/{treeres => treeres.src} (95%) create mode 100644 cde/programs/fontaliases/netbsd/C/Imakefile create mode 100644 cde/programs/fontaliases/netbsd/C/fonts.alias create mode 100644 cde/programs/fontaliases/netbsd/Imakefile diff --git a/cde/.gitignore b/cde/.gitignore index ae23caeb..3f5f61e3 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -63,6 +63,19 @@ admin/IntegTools/post_install/openbsd/configRun admin/IntegTools/post_install/openbsd/configShlibs admin/IntegTools/post_install/openbsd/configTT +admin/IntegTools/post_install/netbsd/CDE-MIN.list +admin/IntegTools/post_install/netbsd/CDE-MIN.lst +admin/IntegTools/post_install/netbsd/CDE-RUN.list +admin/IntegTools/post_install/netbsd/CDE-RUN.lst +admin/IntegTools/post_install/netbsd/CDE-SHLIBS.list +admin/IntegTools/post_install/netbsd/CDE-SHLIBS.lst +admin/IntegTools/post_install/netbsd/CDE-TT.list +admin/IntegTools/post_install/netbsd/CDE-TT.lst +admin/IntegTools/post_install/netbsd/configMin +admin/IntegTools/post_install/netbsd/configRun +admin/IntegTools/post_install/netbsd/configShlibs +admin/IntegTools/post_install/netbsd/configTT + admin/IntegTools/post_install/configDemos admin/IntegTools/post_install/configFonts admin/IntegTools/post_install/configHelp @@ -844,6 +857,7 @@ programs/dtinfo/mmdb/utility/xtime.C programs/dtinfo/tools/misc/dfiles programs/dtinfo/tools/misc/msgsets programs/dtinfo/tools/misc/pmaker +programs/dtinfo/tools/misc/treeres # program/dtksh programs/dtksh/dtksh @@ -1158,6 +1172,11 @@ programs/fontaliases/openbsd/C/dtinfo.pcf programs/fontaliases/openbsd/C/dtinfo.pcf.gz programs/fontaliases/openbsd/C/dtinfo.pcf.Z programs/fontaliases/openbsd/C/fonts.dir +programs/fontaliases/netbsd/C/dtinfo.bdf +programs/fontaliases/netbsd/C/dtinfo.pcf +programs/fontaliases/netbsd/C/dtinfo.pcf.gz +programs/fontaliases/netbsd/C/dtinfo.pcf.Z +programs/fontaliases/netbsd/C/fonts.dir # programs/ksh93 programs/dtksh/ksh93/man/man1/sh.1 diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src index a1204c8c..c8e79cef 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -216,6 +216,14 @@ CleanDaemons() sleep 2 fi elif [ "$PLATFORM" = "freebsd" ] + then + ps axo pid,comm | grep $i > /tmp/tmppsout + if [ -s /tmp/tmppsout ] + then + awk '{print "kill " $1}' /tmp/tmppsout | /bin/csh -f + sleep 2 + fi + elif [ "$PLATFORM" = "netbsd" ] then ps axo pid,comm | grep $i > /tmp/tmppsout if [ -s /tmp/tmppsout ] @@ -264,6 +272,9 @@ RestartInetd() elif [ "$PLATFORM" = "freebsd" ] then /etc/rc.d/inetd onestart + elif [ "$PLATFORM" = "netbsd" ] + then + /etc/rc.d/inetd start >/dev/null elif [ "$PLATFORM" = "linux" ] then /etc/init.d/openbsd-inetd start >/dev/null 2>&1 @@ -578,6 +589,10 @@ XCOMM then PLATFORM="openbsd" PLATFORM_SCRIPT_DIR="openbsd" + elif [ $BUILDSYSTEM = "NetBSD" ]; + then + PLATFORM="netbsd" + PLATFORM_SCRIPT_DIR="netbsd" else # Build system = HP PLATFORM=hp-ux PLATFORM_SCRIPT_DIR=hp diff --git a/cde/admin/IntegTools/dbTools/mkProd b/cde/admin/IntegTools/dbTools/mkProd index 0d5bee94..f83d34e7 100755 --- a/cde/admin/IntegTools/dbTools/mkProd +++ b/cde/admin/IntegTools/dbTools/mkProd @@ -8,11 +8,11 @@ export SYSTYPE=bsd4.3 # where it is not necessary to run nroff on the man page sources. -# Put "/etc" in the path +# Put "/etc", "/sbin" and "/usr/sbin" in the path # because this is where "chown" appears on bsd4.3 systems (i.e. apollo). # Put "/usr/apollo/bin" on the path to access "chacl" on apollo systems. -export PATH=":/etc:$PATH:/usr/apollo/bin:" +export PATH=":/etc:/sbin:/usr/sbin:$PATH:/usr/apollo/bin:" typeset STRIP="" diff --git a/cde/admin/IntegTools/post_install/Imakefile b/cde/admin/IntegTools/post_install/Imakefile index eab9a69b..e23ca60d 100644 --- a/cde/admin/IntegTools/post_install/Imakefile +++ b/cde/admin/IntegTools/post_install/Imakefile @@ -24,6 +24,10 @@ SUBDIRS = linux PLATFORM = openbsd SUBDIRS = openbsd #endif +#ifdef NetBSDArchitecture +PLATFORM = netbsd +SUBDIRS = netbsd +#endif #ifdef FreeBSDArchitecture PLATFORM = freebsd SUBDIRS = freebsd diff --git a/cde/admin/IntegTools/post_install/freebsd/configRun.src b/cde/admin/IntegTools/post_install/freebsd/configRun.src index 4b246fd8..ccf3d4cd 100755 --- a/cde/admin/IntegTools/post_install/freebsd/configRun.src +++ b/cde/admin/IntegTools/post_install/freebsd/configRun.src @@ -281,7 +281,7 @@ DEFAULT_PRINTER="DtPrint" HASH HASH ConfigurePrintersDir HASH - env LANG=C /usr/dt/bin/dtprintinfo -populate + HASH env LANG=C /usr/dt/bin/dtprintinfo -populate HASH HASH Configure Xsession.d diff --git a/cde/admin/IntegTools/post_install/netbsd/Imakefile b/cde/admin/IntegTools/post_install/netbsd/Imakefile new file mode 100644 index 00000000..0bd1732e --- /dev/null +++ b/cde/admin/IntegTools/post_install/netbsd/Imakefile @@ -0,0 +1,71 @@ +XCOMM $TOG: Imakefile /main/1 1998/03/11 16:08:16 mgreess $ +TOOL_DIR = ../../dbTools +DATABASE_DIR = ../../../../databases + +#ifdef HPArchitecture +PLATFORM = hp-ux +#endif +#ifdef LinuxArchitecture +PLATFORM = linux +#endif +#ifdef FreeBSDArchitecture +PLATFORM = freebsd +#endif +#ifdef OpenBSDArchitecture +PLATFORM = openbsd +#endif +#ifdef NetBSDArchitecture +PLATFORM = netbsd +#endif +#ifdef RsArchitecture +PLATFORM = aix +#endif +#ifdef SunArchitecture +PLATFORM = sun +.NO_PARALLEL: +#endif +#ifdef USLArchitecture +PLATFORM = usl +#endif +#ifdef UXPArchitecture +PLATFORM = uxp +#endif + +UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh +BUILD_UDB_LIST = $(SHELL) ../build_udb_list + +all:: + +configMin:: $(DATABASE_DIR)/CDE-MIN.udb + $(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \ + $(DATABASE_DIR)/CDE-MIN.udb > CDE-MIN.lst + $(BUILD_UDB_LIST) CDE-MIN ../../../.. + +configTT:: $(DATABASE_DIR)/CDE-TT.udb + $(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \ + $(DATABASE_DIR)/CDE-TT.udb > CDE-TT.lst + $(BUILD_UDB_LIST) CDE-TT ../../../.. + +configRun:: $(DATABASE_DIR)/CDE-RUN.udb + $(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \ + $(DATABASE_DIR)/CDE-RUN.udb > CDE-RUN.lst + $(BUILD_UDB_LIST) CDE-RUN ../../../.. + +configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb + $(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \ + $(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst + $(BUILD_UDB_LIST) CDE-SHLIBS ../../../.. + +LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \ + -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ + -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) + +AllTarget(configShlibs configTT configRun configMin) + +CppScriptTarget(configShlibs,configShlibs.src,$(LOCAL_CPP_DEFINES),) +CppScriptTarget(configTT,configTT.src,$(LOCAL_CPP_DEFINES),) +CppScriptTarget(configRun,configRun.src,$(LOCAL_CPP_DEFINES),) +CppScriptTarget(configMin,configMin.src,$(LOCAL_CPP_DEFINES),) + +clean:: + $(RM) *.lst *.list diff --git a/cde/admin/IntegTools/post_install/netbsd/configMin.src b/cde/admin/IntegTools/post_install/netbsd/configMin.src new file mode 100755 index 00000000..09d5caea --- /dev/null +++ b/cde/admin/IntegTools/post_install/netbsd/configMin.src @@ -0,0 +1,257 @@ +XCOMM! /bin/ksh +XCOMM ####### +XCOMM Product: CDE +XCOMM Fileset: CDE-MIN +XCOMM configure +XCOMM @(#) $TOG: configMin.src /main/1 1998/03/11 16:18:12 mgreess $ +XCOMM ####### +#define HASH # + +PRODUCT=CDE +FILESET=CDE-MIN +DO_CONFIGURATION="" +retval=0 + +FixEtcServices() +{ +FILE=/etc/services +TMPFILE=/tmp/services + +XCOMM +XCOMM check for existence of /etc/services +XCOMM + + if [ ! -f $FILE ] # highly unlikely + then + echo "" >$FILE + fi + +XCOMM +XCOMM see if it already exists +XCOMM + + awk '{if ($1 == "dtspc") + print $0 > "/tmp/dtspc-already-there" + }' $FILE >/dev/null + + if [ ! -f /tmp/dtspc-already-there ] + then + printf "dtspc\t\t6112/tcp\t\t# subprocess control\n" >>$FILE + else + rm /tmp/dtspc-already-there + fi + +XCOMM +XCOMM remove legacy entries like dtspcd +XCOMM + + awk '{if ($1 == "dtspcd" || $1 == "#dtspcd") + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +UnfixEtcServices() +{ +FILE=/etc/services +TMPFILE=/tmp/services + + awk '{if ($1 == "dtspc" && $2 == "6112/tcp") + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +FixEtcInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf + +XCOMM +XCOMM check for existence of /etc/inetd.conf +XCOMM + + if [ ! -f $FILE ] # highly unlikely + then + echo "" >$FILE + fi + +XCOMM +XCOMM see if it already exists +XCOMM + + awk '{if ($1 == "dtspc") + print $0 > "/tmp/dtspc-already-there" + }' $FILE >/dev/null + + DTSPCD=CDE_INSTALLATION_TOP/bin/dtspcd + + if [ ! -f /tmp/dtspc-already-there ] + then + printf "dtspc\t\tstream\ttcp nowait\troot\t$DTSPCD $DTSPCD\n" >>$FILE + else + rm /tmp/dtspc-already-there + fi + +XCOMM +XCOMM remove legacy entries like dtspcd +XCOMM + + awk '{if ($1 == "dtspcd" || $1 == "#dtspcd") + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +UnfixEtcInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf + + awk '{if ($1 == "dtspc") + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +FixEtcPamDotConf() +{ +FILE=/etc/pam.conf +ORIGFILE=/etc/pam.conf.preCDE + +XCOMM +XCOMM check for existence of /etc/pam.conf +XCOMM + + if [ -f $FILE ] + then + echo "" > $ORIGFILE + cp CDE_INSTALLATION_TOP/config/sys.pam.conf $FILE + chmod 644 $FILE + else + echo "Warning: $FILE already exists. Leaving it alone." 1>&2 + cp CDE_INSTALLATION_TOP/config/sys.pam.conf $ORIGFILE + fi + +} + +UnfixEtcPamDotConf() +{ +FILE=/etc/pam.conf +TMPFILE=/etc/pam.conf.CDE +ORIGFILE=/etc/pam.conf.preCDE + + if [ ! -f $FILE ] + then + echo "Warning: $FILE does not exist." 1>&2 + elif [ ! -f $ORIGFILE ] + then + echo "Warning: $ORIGFILE does not exist. Leaving $FILE alone." 1>&2 + else + mv $FILE $TMPFILE + cp $ORIGFILE $FILE + chmod 664 $FILE + fi +} + +RemoveMinFiles() +{ + while read SRC + do + if [ "$SRC" != "" ] + then + rm -f $SRC + dirname=${SRC%/STAR} + if [ -d $dirname ] + then + cd $dirname + while [ "$dirname" != "$CDE_TOP" ] + do + cd .. + rmdir ${dirname##STAR/} >/dev/null 2>/dev/null + dirname=${dirname%/STAR} + done + fi + fi + done <<-EOF +#include "CDE-MIN.list" + EOF +} + +VerifyInstalledFiles() +{ + echo "Status mode owner group filename" + echo "-----------------------------------------" +XCOMM exists correct correct correct /usr/dt/foo1 +XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 +XCOMM exists the link is correct /usr/dt/link + + while read SRC + do +#include "../verify.func" + done <<-EOF +#include "CDE-MIN.lst" + EOF +} + +#include "../option.func" + +XCOMM ############################################################### +XCOMM +XCOMM Main Body +XCOMM +XCOMM ############################################################### + + HandleOption $* + + if [ "$OPERATION" = "configure" ] + then + + FixEtcServices + + FixEtcInetdDotConf + + HASH + HASH create the CDE_LOGFILES_TOP/tmp directory for the dtspcd + HASH + + if [ ! -d CDE_LOGFILES_TOP/tmp ] + then + mkdir -p CDE_LOGFILES_TOP/tmp + fi + + elif [ "$OPERATION" = "deconfigure" ] + then + + UnfixEtcServices + + UnfixEtcInetdDotConf + + RemoveMinFiles + + VerifyInstalledFiles + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + return $retval diff --git a/cde/admin/IntegTools/post_install/netbsd/configRun.src b/cde/admin/IntegTools/post_install/netbsd/configRun.src new file mode 100755 index 00000000..dcf36919 --- /dev/null +++ b/cde/admin/IntegTools/post_install/netbsd/configRun.src @@ -0,0 +1,416 @@ +XCOMM! /bin/ksh +XCOMM ####### +XCOMM Product: CDE +XCOMM Fileset: CDE-RUN +XCOMM configure +XCOMM @(#) $TOG: configRun.src /main/1 1998/03/11 16:18:24 mgreess $ +XCOMM ####### + +#define HASH # +#define STAR * + +PRODUCT=CDE +FILESET=CDE-RUN +DO_CONFIGURATION="" +retval=0 + +FixInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf +CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd + +XCOMM +XCOMM desired inetd.conf entry: +XCOMM cmsd/2-4 dgram rpc/udp wait root CDE_INSTALLATION_TOP/bin/rpc.cmsd rpc.cmsd +XCOMM + +XCOMM first make an awk script and put it in a file. +XCOMM + +XCOMM comment out any non-cde rpc.cmsd lines +XCOMM + + awk -v cmsd=$CMSD \ + '{if ($1 == "cmsd/2-4" && $6 != cmsd) + print "#cde " $0; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE + +XCOMM remove any cde 2-4 cmsd +XCOMM + + awk -v cmsd=$CMSD \ + '{if ($1 == "cmsd/2-4" && $6 == cmsd) + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE + +XCOMM +XCOMM now run an awk script to see if there is an occurrence of 2-5 cmsd +XCOMM + + awk -v cmsd=$CMSD \ + '{if ($6 == cmsd && $1 == "cmsd/2-5") + print $0 > "/tmp/cmsd-already-there" + }' $FILE >/dev/null + +XCOMM +XCOMM if it is not there, add it +XCOMM + + if [ ! -f /tmp/cmsd-already-there ] + then + printf "cmsd/2-5\tdgram\trpc/udp wait\troot\t$CMSD rpc.cmsd\n" >>$FILE + else + rm /tmp/cmsd-already-there + fi + +} + +UnfixInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf +CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd + + HASH first remove the CDE rpc.cmsd entry + + awk -v cmsd=$CMSD \ + '{if (($1 == "cmsd/2-4" || $1 == "cmsd/2-5") && $6 == cmsd) + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE + + HASH now uncomment any previously existing cmsd entry + + awk '{if ($1 == "#cde") { + if ($2 == "cmsd/2-4") { + $1 = $2; + $2 = "" + } + } + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +FixEtcRpc() +{ +XCOMM +XCOMM now check to see if the proper entry is in /etc/rpc +XCOMM + + RPCFILE=/etc/rpc + TMPFILE=/tmp/etc-rpc + + if [ ! -f $RPCFILE ] + then + HASH if the file doesn't exist (highly unlikely), make one + HASH with the proper entry + HASH + + printf "cmsd\t\t100068\tdtcalendar\n" >$RPCFILE + + else + HASH + HASH check to see if the entry is already there + HASH + + awk '{if ($1 == "cmsd" && $2 == "100068") + print $0 > "/tmp/etc-rpc-already-there" + }' $RPCFILE >/dev/null + + if [ ! -f /tmp/etc-rpc-already-there ] + then + HASH + HASH if it isn't, check to see if either term already + HASH exists + HASH + + awk '{if ($1 == "cmsd" || $2 == "100068") + print $0 > "/tmp/etc-rpc-already-there" + }' $RPCFILE >/dev/null + + HASH + HASH if either one does they need to be commented out + HASH + + if [ ! -f /tmp/etc-rpc-already-there ] + then + printf "cmsd\t\t100068\tdtcalendar\n" >>$RPCFILE + else + awk '{if ($1 == "cmsd" || $2 == "100068") + print "#cde " $0; + else + print $0 + }' $RPCFILE >$TMPFILE + + printf "cmsd\t\t100068\tdtcalendar\n" >>$TMPFILE + mv $TMPFILE $RPCFILE + rm /tmp/etc-rpc-already-there + fi + else + rm /tmp/etc-rpc-already-there + fi + fi + +} + +UnfixEtcRpc() +{ +FILE="/etc/rpc" +TMPFILE="/tmp/etc-rpc" + + awk '{if ($1 == "cmsd" && $2 == "100068") + ; + else + print $0 + }' $FILE >$TMPFILE + + mv $TMPFILE $FILE + + awk '{if ($1 == "#cde" && ($2 == "cmsd" || $3 == "100068")) + ; + else + print $0 + }' $FILE >$TMPFILE + + mv $TMPFILE $FILE +} + +CreateAppConfigDirectory() +{ + HASH + HASH Create the APPCONFIG directory inside DT_CONFIG_TOP and create + HASH all of its subdirectories + HASH + + cd $DT_CONFIG_TOP + if [ ! -d $APPCONFIG ] + then + mkdir $APPCONFIG + fi + + cd $APPCONFIG + + for i in $APPCONFIG_DIRS + do + if [ ! -d $i ] + then + mkdir $i + fi + cd $i + HASH + HASH for each locale + HASH + for j in $DT_TOP/$APPCONFIG/$i/STAR + do + if [ ! -d `basename $j` ] + then + mkdir `basename $j` + fi + done + cd .. + done + +} + +doDttermTerminfo() +{ + if [ -f $DT_TOP/config/dtterm.ti ] + then + tic $DT_TOP/config/dtterm.ti + else + echo "Unable to find $DT_TOP/config/dtterm.ti" + fi +} + +RemoveRunFiles() +{ + while read SRC + do + if [ "$SRC" != "" ] + then + rm -f $SRC + dirname=${SRC%/STAR} + if [ -d $dirname ] + then + cd $dirname + while [ "$dirname" != "$CDE_TOP" ] + do + cd .. + rmdir ${dirname##STAR/} >/dev/null 2>/dev/null + dirname=${dirname%/STAR} + done + fi + fi + done <<-EOF +#include "CDE-RUN.list" + EOF +} + + +VerifyInstalledFiles() +{ + echo "Status mode owner group filename" + echo "-----------------------------------------" +XCOMM exists correct correct correct /usr/dt/foo1 +XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 +XCOMM exists the link is correct /usr/dt/link + + while read SRC + do +#include "../verify.func" + done <<-EOF +#include "CDE-RUN.lst" + EOF +} + + +PrintUsage() +{ + echo "Usage:" $0 "[OPERATION]" + echo "" + echo "Operations:" + echo " -e configure" + echo " -d deconfigure" + echo " -v verify" + echo " -s size" + echo " -h help" +} + +#include "../option.func" + +XCOMM ########################################################################## +XCOMM +XCOMM Main Body +XCOMM +XCOMM ########################################################################## + +PRODUCT=CDE +FILESET=CDE-RUN + +DT_TOP=CDE_INSTALLATION_TOP +DT_CONFIG_TOP=CDE_CONFIGURATION_TOP +DT_TEMP_TOP=CDE_LOGFILES_TOP +ROOT=/ + +retval=0 + +APPCONFIG=appconfig +APPCONFIG_DIRS="appmanager help icons types" +PRINTERS="" +DEFAULT_PRINTER="DtPrint" + + HandleOption $* + + if [ "$OPERATION" = "usage" ] + then + PrintUsage + exit 0 + fi + + if [ "$OPERATION" = "configure" ] + then + + HASH + HASH create the CDE_LOGFILES_TOP directory + HASH + + if [ ! -d $DT_TEMP_TOP/$APPCONFIG/appmanager ] + then + mkdir -p $DT_TEMP_TOP/$APPCONFIG/appmanager + fi + + cd $DT_TEMP_TOP + mv $APPCONFIG/appmanager .hidden-appmanager + chmod -R 755 * + chmod 755 .hidden-appmanager + /usr/sbin/chown -R bin * + /usr/bin/chgrp -R bin * + mv .hidden-appmanager $APPCONFIG/appmanager + chmod 755 . + /usr/sbin/chown bin . + /usr/bin/chgrp bin . + + HASH + HASH create the CDE_CONFIGURATION_TOP and its config directory + HASH + if [ ! -d $DT_CONFIG_TOP ] + then + mkdir -p $DT_CONFIG_TOP + fi + if [ ! -d $DT_CONFIG_TOP/config ] + then + mkdir -p $DT_CONFIG_TOP/config + fi + + CreateAppConfigDirectory + + HASH + HASH ConfigurePrintersDir + HASH + HASH env LANG=C /usr/dt/bin/dtprintinfo -populate + + HASH + HASH Configure Xsession.d + HASH + + cd $DT_CONFIG_TOP/config + if [ ! -d Xsession.d ] + then + mkdir Xsession.d + fi + + cd $DT_CONFIG_TOP + chmod -R 755 * + + FixInetdDotConf + + FixEtcRpc + + elif [ "$OPERATION" = "deconfigure" ] + then + + UnfixEtcRpc + + UnfixInetdDotConf + + RemoveRunFiles + + VerifyInstalledFiles + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + if [ "$OPERATION" != "verify" ] + then + + HASH issue a SIGHUP to the inetd process + + /etc/rc.d/inetd reload >/dev/null + fi + + HASH dtmail requires setgid + chmod 2555 $DT_TOP/bin/dtmail + + return $retval diff --git a/cde/admin/IntegTools/post_install/netbsd/configShlibs.src b/cde/admin/IntegTools/post_install/netbsd/configShlibs.src new file mode 100755 index 00000000..cf7ab587 --- /dev/null +++ b/cde/admin/IntegTools/post_install/netbsd/configShlibs.src @@ -0,0 +1,105 @@ +XCOMM!/bin/ksh +XCOMM $TOG: configShlibs.src /main/1 1998/03/11 16:18:33 mgreess $ + +#define STAR * + +XCOMM ############################################ +RemoveShlibFiles() +{ + while read SRC + do + if [ "$SRC" != "" ] + then + rm -f $SRC + dirname=${SRC%/STAR} + if [ -d $dirname ] + then + cd $dirname + while [ "$dirname" != "$CDE_TOP" ] + do + cd .. + rmdir ${dirname##STAR/} >/dev/null 2>/dev/null + dirname=${dirname%/STAR} + done + fi + fi + done <<-EOF +#include "CDE-SHLIBS.list" + EOF +} + +VerifyInstalledFiles() +{ + echo "Status mode owner group filename" + echo "-----------------------------------------" +XCOMM exists correct correct correct /usr/dt/foo1 +XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 +XCOMM exists the link is correct /usr/dt/link + + while read SRC + do +#include "../verify.func" + done <<-EOF +#include "CDE-SHLIBS.lst" + EOF +} + +#include "../option.func" + +MakeTheLink() +{ +XCOMM +XCOMM Usage: configTT +XCOMM +XCOMM creates links in the install tree libtt.so -> libtt.so.1 +XCOMM + + cd CDE_INSTALLATION_TOP/lib + + for lib in `/bin/ls *.so.*` + do + link=`echo $lib | cut -d. -f1,2` + + rm -f $link + ln -s $lib $link + + done + +} + +XCOMM ######################################################################### +XCOMM +XCOMM Main Body +XCOMM +XCOMM ######################################################################### + +PRODUCT=CDE +FILESET=CDE-SHLIBS +retval=0 +CDE_TOP=CDE_INSTALLATION_TOP +CDE_CONF_TOP=CDE_CONFIGURATION_TOP + + HandleOption $* + + if [ "$OPERATION" = "deconfigure" ] + then + + echo "de-Configuring for CDE-SHLIBS..." + + RemoveShlibFiles + + VerifyInstalledFiles + + elif [ "$OPERATION" = "configure" ] + then + + MakeTheLink + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + return $retval diff --git a/cde/admin/IntegTools/post_install/netbsd/configTT.src b/cde/admin/IntegTools/post_install/netbsd/configTT.src new file mode 100755 index 00000000..42745cfe --- /dev/null +++ b/cde/admin/IntegTools/post_install/netbsd/configTT.src @@ -0,0 +1,214 @@ +XCOMM! /bin/ksh +XCOMM ####### +XCOMM Product: CDE +XCOMM Fileset: CDE-TT +XCOMM configure +XCOMM @(#) $TOG: configTT.src /main/1 1998/03/11 16:18:40 mgreess $ +XCOMM ####### +XCOMM +XCOMM (c) Copyright Hewlett-Packard Company, 1993 +XCOMM +XCOMM ####### +#define HASH # + +PRODUCT=CDE +FILESET=CDE-TT +DO_CONFIGURATION="" +retval=0 + +FixInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf +TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver + +XCOMM +XCOMM see if it already exists +XCOMM + + awk -v ttdb=$TTDBSERVERD \ + '{if ($1 == "ttdbserver/1" && $6 != ttdb) + print "#cde " $0; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE + + awk '{if ($1 == "ttdbserver/1") + print $0 > "/tmp/tt-already-there" + }' $FILE >/dev/null + + if [ ! -f /tmp/tt-already-there ] + then + printf "ttdbserver/1\tstream\trpc/tcp wait\troot\t$TTDBSERVERD $TTDBSERVERD\n" >>$FILE + else + rm /tmp/tt-already-there + fi +} + +UnfixInetdDotConf() +{ +FILE=/etc/inetd.conf +TMPFILE=/tmp/inetd.conf +TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver + + awk -v ttdb=$TTDBSERVERD \ + '{if ($1 == "ttdbserver/1" && $6 == ttdb) + ; + else + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE + + awk '{if ($1 == "#cde" && ($2 == "ttdbserver/1" || $2 == "ttdbserver")) { + $1 = $2; + $2 = "" + } + print $0 + }' $FILE >$TMPFILE + + cp $TMPFILE $FILE + rm $TMPFILE +} + +FixEtcRpc() +{ +FILE=/etc/rpc +TMPFILE=/tmp/etc-rpc + + if [ ! -f $FILE ] + then + printf "ttdbserver\t100083\ttooltalk\n" >$FILE + else + awk '{if ($1 == "ttdbserver" && $2 == "100083") + print $0 > "/tmp/etc-rpc-already-there" + }' $FILE >/dev/null + + if [ ! -f /tmp/etc-rpc-already-there ] + then + awk '{if ($1 == "ttdbserver" || $2 == "100083") + print $0 > "/tmp/etc-rpc-already-there" + }' $FILE >/dev/null + + if [ ! -f /tmp/etc-rpc-already-there ] + then + printf "ttdbserver\t100083\ttooltalk\n" >>$FILE + else + awk '{if ($1 == "ttdbserver" || $2 == "100083") + print "#cde " $0; else print $0 + }' $FILE >$TMPFILE + + printf "ttdbserver\t100083\ttooltalk\n" >>$TMPFILE + + mv $TMPFILE $FILE + rm /tmp/etc-rpc-already-there + fi + else + rm /tmp/etc-rpc-already-there + fi + fi +} + +UnfixEtcRpc() +{ +FILE="/etc/rpc" +TMPFILE="/tmp/etc-rpc" + + awk '{if ($1 == "ttdbserver" && $2 == "100083") + ; + else + print $0 + }' $FILE >$TMPFILE + + mv $TMPFILE $FILE + + awk '{if ($1 == "#cde") { + $1 = $2; + $2 = "" + } + print $0 + }' $FILE >$TMPFILE + + mv $TMPFILE $FILE +} + +RemoveTTFiles() +{ + while read SRC + do + if [ "$SRC" != "" ] + then + rm -f $SRC + dirname=${SRC%/STAR} + if [ -d $dirname ] + then + cd $dirname + while [ "$dirname" != "$CDE_TOP" ] + do + cd .. + rmdir ${dirname##STAR/} >/dev/null 2>/dev/null + dirname=${dirname%/STAR} + done + fi + fi + done <<-EOF +#include "CDE-TT.list" + EOF +} + +VerifyInstalledFiles() +{ + echo "Status mode owner group filename" + echo "-----------------------------------------" +XCOMM exists correct correct correct /usr/dt/foo1 +XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 +XCOMM exists the link is correct /usr/dt/link + + while read SRC + do +#include "../verify.func" + done <<-EOF +#include "CDE-TT.lst" + EOF +} + +#include "../option.func" + +XCOMM ###################################################################### +XCOMM +XCOMM Main Body +XCOMM +XCOMM ###################################################################### + + HandleOption $* + + if [ "$OPERATION" = "configure" ] + then + + FixInetdDotConf + + FixEtcRpc + + elif [ "$OPERATION" = "deconfigure" ] + then + + UnfixEtcRpc + + UnfixInetdDotConf + + RemoveTTFiles + + VerifyInstalledFiles + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + return $retval diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf index 0631897d..ad53872e 100644 --- a/cde/config/cf/Imake.cf +++ b/cde/config/cf/Imake.cf @@ -178,6 +178,11 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # define i386Architecture # undef i386 # endif +# ifdef __amd64__ +# define AMD64BsdArchitecture +# define AMD64Architecture +# undef amd64 +# endif # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc diff --git a/cde/config/cf/Imake.rules b/cde/config/cf/Imake.rules index 94398e4e..6b21cd70 100644 --- a/cde/config/cf/Imake.rules +++ b/cde/config/cf/Imake.rules @@ -1482,7 +1482,7 @@ BuildMakefileTarget(Imakefile,NullParameter) else \ @@\ echo "mkdir dir"; mkdir dir; \ @@\ for i in $(SUBDIRS); do \ @@\ - j=`echo "$$i" | sed -e 's;[^/]\{1,\};..;g'`; \ @@\ + j=`echo "$$i" | $(SED) -e 's;[^/]\{1,\};..;g'`; \ @@\ $(MKDIRHIER) "dir/`dirname $$i`"; \ @@\ echo $(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\ $(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\ @@ -2084,7 +2084,7 @@ clean:: @@\ #ifndef MakeSubincludesForBuild #define MakeSubincludesForBuild(step,dir,srclist) @@\ step:: dir srclist @@\ - @-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\ + @-(list=`echo srclist | $(SED) -e 's/[^ ]*\///g'`; \ @@\ set -x; cd dir; RemoveFiles($$list)) @@\ @for i in srclist; do \ @@\ (set -x; cd dir; $(LN) ../$$i .); \ @@\ @@ -2095,7 +2095,7 @@ dir:: @@\ @@\ clean:: @@\ @-(if [ -d dir ]; then \ @@\ - list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\ + list=`echo srclist | $(SED) -e 's/[^ ]*\///g'`; \ @@\ set -x; cd dir; RemoveFile($$list); else exit 0; fi) #endif @@ -2311,7 +2311,7 @@ target:: @@\ *) curdir=$(CURRENT_DIR)/ ;; \ @@\ esac; \ @@\ echo "making Makefiles in $$curdir$$i..."; \ @@\ - itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ + itmp=`echo $$i | $(SED) -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ curtmp="$(CURRENT_DIR)" \ @@\ toptmp=""; \ @@\ case "$$itmp" in \ @@\ @@ -2320,7 +2320,7 @@ target:: @@\ do \ @@\ toptmp="/`basename $$curtmp`$$toptmp"; \ @@\ curtmp="`dirname $$curtmp`"; \ @@\ - itmp="`echo $$itmp | sed 's;\.\./;;'`"; \ @@\ + itmp="`echo $$itmp | $(SED) 's;\.\./;;'`"; \ @@\ done \ @@\ ;; \ @@\ esac; \ @@\ @@ -2376,7 +2376,7 @@ MakeMakeSubdirs(dirs,Makefiles) * Also delete line numbers from the cpp output (-P is not portable, I guess). */ #ifndef CppSedMagic -#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' +#define CppSedMagic $(SED) -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' #endif /* CppSedMagic */ #ifndef CppFileTarget @@ -2412,7 +2412,7 @@ dst:: src deplist @@\ RemoveFile($@) @@\ ClearmakeOSName \ echo \: >$@ @@\ - sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\ + $(SED) '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\ chmod a+x $@ @@\ @@\ clean:: @@\ @@ -2437,7 +2437,33 @@ CppFileTarget(dst,src,defs,deplist) @@\ includes:: dst @@\ @@\ depend:: dst -#endif /* CppFileTarget */ +#endif /* CppSourceFile */ + + +/* + * SedFileTarget - generate rules to create a file by running the + * input through sed. + */ +#ifndef SedFileTarget +#define SedFileTarget(dst,src,cmds) @@\ +dst:: src @@\ + RemoveFile($@) @@\ + $(SED) cmds src >$@ @@\ + chmod a+x $@ @@\ + @@\ +clean:: @@\ + RemoveFiles(dst) +#endif /* SedFileTarget */ + +#ifndef SedSourceFile +#define SedSourceFile(dst,src,cmds) @@\ +SedFileTarget(dst,src,cmds) @@\ + @@\ +includes:: dst @@\ + @@\ +depend:: dst +#endif /* SedSourceFile */ + /* * MakeDirectories - generate rules to create a hierarchy of directories. diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl index 75fa2919..bf0ca77d 100644 --- a/cde/config/cf/Imake.tmpl +++ b/cde/config/cf/Imake.tmpl @@ -650,6 +650,12 @@ XCOMM the platform-specific parameters - edit site.def to change #ifndef MvCmd #define MvCmd mv #endif +#ifndef SedCmd +#define SedCmd sed +#endif +#ifndef PerlCmd +#define PerlCmd /usr/bin/perl +#endif #ifndef RanlibCmd #define RanlibCmd ranlib #endif @@ -968,6 +974,8 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes MAKE = MakeCmd MV = MvCmd CP = CpCmd + SED = SedCmd + PERL = PerlCmd #if DoRanlibCmd RANLIB = RanlibCmd RANLIBINSTFLAGS = RanlibInstFlags diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl index 66d41d2b..caa556d7 100644 --- a/cde/config/cf/Motif.tmpl +++ b/cde/config/cf/Motif.tmpl @@ -591,7 +591,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln #if defined(LinuxArchitecture) MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi) #elif defined(BSDArchitecture) - MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi + MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi #else MOTIF_DOC = -D_MOTIFDOC_ #endif diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf index bfec0df2..90f6375f 100644 --- a/cde/config/cf/NetBSD.cf +++ b/cde/config/cf/NetBSD.cf @@ -4,50 +4,36 @@ XCOMM platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $ XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.44 1996/10/23 13:07:55 dawes Exp $ -#ifndef OpenBSDArchitecture - #ifndef OSName -#define OSName NetBSD 1.2 +#define OSName DefaultOSName #endif #ifndef OSMajorVersion -#define OSMajorVersion 1 +#define OSMajorVersion DefaultOSMajorVersion #endif #ifndef OSMinorVersion -#define OSMinorVersion 2 +#define OSMinorVersion DefaultOSMinorVersion #endif /* 1 = A, 2 = B, 3 = C */ #ifndef OSTeenyVersion -#define OSTeenyVersion 0 +#define OSTeenyVersion DefaultOSTeenyVersion #endif -#else - -#ifndef OSName -#define OSName OpenBSD 2.0 -#endif -#ifndef OSMajorVersion -#define OSMajorVersion 2 -#endif -#ifndef OSMinorVersion -#define OSMinorVersion 0 -#endif -/* 1 = A, 2 = B, 3 = C */ -#ifndef OSTeenyVersion -#define OSTeenyVersion 0 -#endif - -#endif #ifndef OSVendor #define OSVendor /**/ #endif XCOMM operating system: OSName +#define LibDir /usr/X11R7/lib/X11 +#define UsrLibDir /usr/X11R7/lib +#define ManDirectoryRoot /usr/X11R7/man +#define FontDir /usr/X11R7/lib/X11/fonts +#define FontEncDir /usr/X11R7/lib/X11/fonts/encodings + /* * C library features */ -#if defined(OpenBSDArchitecture) || \ - defined(NetBSDArchitecture) && (OsMajorVersion == 1 && OsMinorVersion >= 2) +#if defined(NetBSDArchitecture) && (OsMajorVersion == 1 && OsMinorVersion >= 2) # define HasPoll YES #endif #define HasNdbm YES @@ -75,7 +61,7 @@ XCOMM operating system: OSName /* * There's a bug in NetBSD 1.0, 1.1 and 1.2 dlsym() */ -#if !defined(OpenBSDArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 2 +#if OSMajorVersion == 1 && OSMinorVersion <= 2 # define HasDlsymBug YES #endif @@ -92,11 +78,6 @@ XCOMM operating system: OSName #define UseGas YES #define GnuCpp YES -/* OpenBSD has gcc 2.7.2.1 which fixes the strength-reduce bug */ -#ifdef OpenBSDArchitecture -#define DefaultGcc2i386Opt -O2 -#endif - #define NeedConstPrototypes YES #define NeedFunctionPrototypes YES #define NeedNestedPrototypes YES @@ -105,29 +86,29 @@ XCOMM operating system: OSName #define MkdirHierCmd mkdir -p -#define CppCmd /usr/libexec/cpp +#define PerlCmd /usr/pkg/bin/perl + +#define CppCmd /usr/bin/cpp #define StandardCppDefines -traditional #define PreProcessCmd CppCmd -#ifndef OpenBSDArchitecture #define PreIncDir /usr/include -#else -#define PreIncDir /usr/lib/gcc-lib/i386-unknown-openbsd1.2/2.7.2.1/include -#endif #undef CcCmd #define CcCmd gcc #if UseInstalled #define DefaultCCOptions /**/ #else -#define DefaultCCOptions -ansi -Dasm=__asm +#define DefaultCCOptions -pipe #endif +#define CplusplusLibC -lm -lstdc++ + #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS #ifdef i386Architecture -# define OptimizedCDebugFlags -m486 DefaultGcc2i386Opt +# define OptimizedCDebugFlags -O2 # if OSMajorVersion < 1 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF # else @@ -166,11 +147,7 @@ XCOMM operating system: OSName #define ExtraLibraries /**/ #endif #ifndef UseGnuMalloc -#ifndef OpenBSDArchitecture -# define UseGnuMalloc YES -#else -# define UseGnuMalloc NO -#endif +# define UseGnuMalloc YES #endif #ifndef GnuMallocLibrary #define GnuMallocLibrary -lgnumalloc @@ -188,6 +165,7 @@ XCOMM operating system: OSName #define CompressAllFonts YES #define DefaultUserPath .:/bin:/usr/bin:/usr/local/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) +#define BuildLibPathVar LD_LIBRARY_PATH #ifdef InstallCmd # undef InstallCmd @@ -228,60 +206,6 @@ dirs: .EXEC @@\ @@\ .EXEC: -XCOMM Man pages need to be formatted when installed, so override the default -XCOMM imake rules. - -#define ManSuffix 1 -#define FileManSuffix 5 -#define ManSourcePath $(MANPATH)/cat - -#define InstallManPageLong(file,destdir,dest) @@\ -all:: file.0 @@\ - @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ - then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ - cp /tmp/$$$$.man file.0; \ @@\ - $(RM) /tmp/$$$$.man; \ @@\ - fi @@\ - @@\ -install.man:: @@\ - MakeDir($(DESTDIR)destdir) @@\ - -@if [ -f file.0 ]; \ @@\ - then \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ - fi - -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) - -#define InstallMultipleManSuffix(list,dest,suff) @@\ -install.man:: @@\ - MakeDir($(DESTDIR)dest) @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (set -x; \ @@\ - cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \ @@\ - $(RM) /tmp/$$$$.suff); \ @@\ - done - -#define InstallMultipleMan(list,dest) @@\ - InstallMultipleManSuffix(list,dest,man) - -#define InstallManPageAliases(file,destdir,aliases) @@\ -install.man:: @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in aliases; do \ @@\ - (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.0;\ @@\ - (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\ - ); \ @@\ - done - -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) #include @@ -326,3 +250,61 @@ sed 's/\.[0-9]*$$//'` #define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB) #endif + + +/* For DtHelp TIFF processing routines. */ +#ifdef AMD64Architecture +#define LSBBitOrder YES +#endif + +#ifdef ARMArchitecture +#define LSBBitOrder YES +#endif + +#ifdef i386Architecture +#define LSBBitOrder YES +#endif + + +/* + * Generic settings for all architectures + * which can be overridden by architecture specific sections above + */ + +#ifdef HasGcc2 +CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \ + 2>&1 | sed -n 's/ \(.*[cg]++.*\)/-I\1/p' +#define CplusplusDependIncludes $(CXXDEPENDINCLUDE) +#endif + +#ifndef StandardIncludes +# define StandardIncludes -I/usr/pkg/include -I/usr/local/include +#endif + +#ifndef MTop +#define MTop $(TOP)/imports/motif +#endif + +#ifndef TopMotifInclude +# define TopMotifInclude /usr/pkg/include +#endif + +#ifndef ExtraLoadFlags +# define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH):$(CDE_INSTALLATION_TOP)/lib +#endif + +#ifndef SharedTtReqs +# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH) +#endif + +#ifndef SharedDtSvcReqs +# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH) +#endif + +#ifndef SharedCsaReqs +# define SharedCsaReqs -lXt $(LDPOSTLIBS) -Wl,-rpath,$(USRLIBDIRPATH) +#endif + +#ifndef KornShell +#define KornShell /usr/pkg/bin/ksh93 +#endif diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def index ec3b955d..ebd52e58 100644 --- a/cde/config/cf/site.def +++ b/cde/config/cf/site.def @@ -73,6 +73,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $ # define X11ProjectRoot /usr/local # elif defined(OpenBSDArchitecture) # define X11ProjectRoot /usr/X11R6 +# elif defined(NetBSDArchitecture) +# define X11ProjectRoot /usr/X11R7 # else # define X11ProjectRoot /X11 # endif @@ -83,6 +85,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $ # define MotifProjectRoot /usr/local # elif defined(OpenBSDArchitecture) # define MotifProjectRoot /usr/local +# elif defined(NetBSDArchitecture) +# define MotifProjectRoot /usr/pkg # endif #endif diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index 8cbaa1ed..3267e21e 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -258,7 +258,8 @@ in this Software without prior written authorization from The Open Group. #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif -#if defined(__bsdi__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) +#if defined(__bsdi__) || defined(__NetBSD__) \ + || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) #define DEFAULT_CPP "/usr/bin/cpp" #endif #ifdef __uxp__ @@ -270,7 +271,7 @@ in this Software without prior written authorization from The Open Group. #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \ +#if defined(__386BSD__) || defined(__OpenBSD__) \ || (defined(__FreeBSD__) && defined(CPP_IN_LIBEXEC)) #define DEFAULT_CPP "/usr/libexec/cpp" #endif @@ -642,8 +643,8 @@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MAJOR_REV "v V%[0-9]" # define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]" # define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(__FreeBSD__) -/* NetBSD, OpenBSD, 386BSD, and BSD/OS too? */ +#elif defined(__FreeBSD__) || defined(__NetBSD__) +/* 386BSD, and BSD/OS too? */ /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb index 495973c9..f9f127aa 100644 --- a/cde/databases/CDE-FONTS.udb +++ b/cde/databases/CDE-FONTS.udb @@ -1107,3 +1107,21 @@ programs/fontaliases/freebsd/C/dtinfo.pcf { freebsd install_target = /usr/dt/config/xfonts/C/dtinfo.pcf } + +# +# for NetBSD +# +programs/fontaliases/netbsd/C/fonts.alias +{ netbsd + install_target = /usr/dt/config/xfonts/C/fonts.alias +} +# +programs/fontaliases/netbsd/C/fonts.dir +{ netbsd + install_target = /usr/dt/config/xfonts/C/fonts.dir +} +# +programs/fontaliases/netbsd/C/dtinfo.pcf.Z +{ netbsd + install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z +} diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src index f8215fd2..adb4e718 100644 --- a/cde/databases/CDE-SHLIBS.src +++ b/cde/databases/CDE-SHLIBS.src @@ -1416,3 +1416,191 @@ XCOMM install_target = /usr/dt/lib/libDtMmdb.so type = sym_link } + +XCOMM +XCOMM +XCOMM >>----------------------------- +XCOMM netbsd libraries +XCOMM <<----------------------------- +XCOMM +XCOMM +lib/DtHelp/libDtHelp.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtHelp.so.2.1 + mode = 0755 +} +XCOMM +./libDtHelp.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtHelp.so.2 + type = sym_link +} +XCOMM +./libDtHelp.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtHelp.so + type = sym_link +} +XCOMM +lib/DtPrint/libDtPrint.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtPrint.so.2.1 + mode = 0755 +} +XCOMM +./libDtPrint.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtPrint.so.2 + type = sym_link +} +XCOMM +./libDtPrint.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtPrint.so + type = sym_link +} +XCOMM +lib/DtMrm/libDtMrm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMrm.so.2.1 + mode = 0755 +} +XCOMM +./libDtMrm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMrm.so.2 + type = sym_link +} +XCOMM +./libDtMrm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMrm.so + type = sym_link +} +XCOMM +lib/DtSvc/libDtSvc.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSvc.so.2.1 + mode = 0755 +} +XCOMM +./libDtSvc.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSvc.so.2 + type = sym_link +} +XCOMM +./libDtSvc.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSvc.so + type = sym_link +} +XCOMM +lib/DtWidget/libDtWidget.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtWidget.so.2.1 + mode = 0755 +} +XCOMM +./libDtWidget.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtWidget.so.2 + type = sym_link +} +XCOMM +./libDtWidget.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtWidget.so + type = sym_link +} +XCOMM +lib/DtTerm/libDtTerm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtTerm.so.2.1 + mode = 0755 +} +XCOMM +./libDtTerm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtTerm.so.2 + type = sym_link +} +XCOMM +./libDtTerm.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtTerm.so + type = sym_link +} +XCOMM +lib/tt/lib/libtt.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libtt.so.2.1 + mode = 0755 +} +XCOMM +./libtt.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libtt.so.2 + type = sym_link +} +XCOMM +./libtt.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libtt.so + type = sym_link +} +XCOMM +lib/csa/libcsa.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libcsa.so.2.1 + mode = 0755 +} +XCOMM +./libcsa.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libcsa.so.2 + type = sym_link +} +XCOMM +./libcsa.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libcsa.so + type = sym_link +} +XCOMM +lib/DtSearch/libDtSearch.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSearch.so.2.1 + mode = 0755 +} +XCOMM +./libDtSearch.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSearch.so.2 + type = sym_link +} +XCOMM +./libDtSearch.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtSearch.so + type = sym_link +} +XCOMM +lib/DtMmdb/libDtMmdb.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMmdb.so.2.1 + mode = 0755 +} +XCOMM +./libDtMmdb.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMmdb.so.2 + type = sym_link +} +XCOMM +./libDtMmdb.so.2.1 +{ netbsd + install_target = /usr/dt/lib/libDtMmdb.so + type = sym_link +} +XCOMM diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile index 8307b0fc..cc4f0c5b 100644 --- a/cde/databases/Imakefile +++ b/cde/databases/Imakefile @@ -33,6 +33,9 @@ UDB_RELEASE_OPT = -ReleaseStream openbsd #ifdef FreeBSDArchitecture UDB_RELEASE_OPT = -ReleaseStream freebsd #endif +#ifdef NetBSDArchitecture +UDB_RELEASE_OPT = -ReleaseStream netbsd +#endif /* * Insure that symbols used in the .udb files are undefined for @@ -42,7 +45,7 @@ UDB_RELEASE_OPT = -ReleaseStream freebsd /* AIX cpp rejects "hp-ux" as an invalid sub-option. */ UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix #else -UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux +UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd #endif diff --git a/cde/lib/DtHelp/NetBSD.lcx b/cde/lib/DtHelp/NetBSD.lcx new file mode 100644 index 00000000..3f0bcb12 --- /dev/null +++ b/cde/lib/DtHelp/NetBSD.lcx @@ -0,0 +1,571 @@ +!!!!!!!!!!!!!! NetBSD Locale-Related Translations !!!!!!!!!!!!!! +! File: NetBSD.lcx +! Default location: /usr/dt/config/svc/NetBSD.lcx +! Purpose: +! Define the NetBSD-specific set of locale-related translations. +! Description: +! This file contains the set of all locale-related translations +! that can occur during _DtLcxXlateOpToStd() and _DtLcxStdToOp() +! calls on NetBSD platforms. Note that platform-specific tables may +! include more than one translation to and from CDE standard +! strings if they can be distinguished by version, operation, or +! pattern matching. +! +! It is important that additional CDE standard strings only +! be created by the CDE owner of the _DtLcx translation service +! and NOT be created by an individual vendor or user. This be because +! the purpose of adopting a set of CDE standard strings is to +! support interoperability across platforms. If individual vendors +! add their own "standard" strings and these strings are not +! known on other platforms, then the goal of interoperability +! will be defeated. +! +! If you feel that a new CDE standard string is needed, +! contact your CDE representative/vendor with a specific +! proposal and justification and have them forward it to +! the owner of the CDE _DtLcx service. +! +! Note that it is allowed for vendors and users to add new +! operations for which translations are specified and which +! utilize the standard strings. If the operations are of +! general utility, please bring them to the attention of +! your CDE representative/vendor for forwarding to the +! _DtLcx owner. +! Invoked by: +! This table is used by the _DtLcx translation service +! Defects: +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!!!!!!!!!!!!!!!! translation specification syntax !!!!!!!!!!!!!!!!!!! +! Introductory fields: +! ==================== +! The _DtLcx translation specifications have a fixed number of +! introductory fields followed by a several standard value +! fields and the operation-specific value. +! The introductory fields are: +! ... +! +! Platform generally is the same string as uname(1) -s. +! Version range utilizes normalized version numbers that +! are acquired using the 'version' translations. +! Operations are one or more comma-separated strings that +! uniquely identify the operation associated with the +! operation-specific value. This string is specified +! as part of the request for a translation. +! +! Kinds of translations allow the mechanism to support several modes +! of operation, each useful for different purposes. When +! reading or writing a specification, pay particular attention +! to the kind of specification, as this guides the usage of it. +! +! Specification kinds: +! .=. means a valid bi-directional translation requiring the op-value +! in the translation specification to exactly match the op-value of +! the call to _DtLcxXlateOpToStd(), e.g. foo matches only foo +! .~. means a valid bi-directional translation requiring the op-value +! in the translation specification to match the beginning of the +! op-value of the call to _DtLcxXlateOpToStd(), e.g. foo matches +! foo@@bar. This is often useful, e.g. for operation-specific +! locale strings that may also contain modifier suffixes. +! .>. means only from standard to op-specific (generally a +! compatibility translation, meaning on op-specific value +! that will work for the standard, although that is not +! the straight mapping) +! .<. means only from op-specific to standard (generally a +! regex in the op-value which is used to map a class of +! op values to a standard value) +! .0. means that translation is not supported and if a translation +! request matches the specification, the request will fail. +! +! Standard values: +! ================ +! _DtLcx defines the order of the standard values in the +! translations it utilizes. All translation specifications +! must adhere to this order. +! .. +! In CDE 1.0, no modifiers are standard and that +! portion of the table is unspecified. This means +! that no CDE standard modifiers are available across +! platforms. Operations that use only the +! should specify the wildcard character ("?") for the +! value. +! +! Operation-specific value: +! ========================= +! The operation-specific value is a string that is used +! according to the kind of translation. The syntax is +! : +! or : "", if it contains white space +! +! Filling in the table of translations: +! ===================================== +! The person preparing the translation table should know +! the minimum version of the target platform that is +! be supported. For example, assume that we must +! complete the table for all versions 9.00 and higher. +! +! The objective is then to provide two sets of translations: +! a full set of translations from CDE standard locales to +! valid platform locales, and a full set of translations +! from valid platform locales to some or all CDE standard +! locales. +! +! Translations from CDE standard locales to valid platform +! locales must use the .~. .=. or .>. mappings. When there +! is a 1:1 mapping between a CDE locale and a platform locale, +! use the .~. or .=. mapping. See the comment below to +! decide which to use. When there is no 1:1 mapping between +! CDE locale and platform locale, use the .>. mapping. This +! provides a valid translation from the CDE locale to the +! best-suitable platform locale, but never translates from +! that platform locale to the CDE locale. +! +! Translations from every platform locale to the appropriate +! CDE locale must use the .~. .=. or .<. mappings. +! When there is a 1:1 mapping between a platform locale and +! a CDE standard locale, use the .~. or .=. mapping. See the +! comment below to decide which to use. If there is a 1:1 +! mapping, but the platform locale pattern uses a regular +! expression, or if more than one platform locale can +! be translated to one CDE standard locale, the .<. mapping must +! be used. +! +! If no appropriate CDE standard locale can be found, you have +! identified the need for a new CDE standard locale. Refer to +! the instructions at the head of this file for how to go about +! registering a new CDE standard locale. You should not create +! a new "standard" locale (the left hand side of the translation +! specification) without registering it with CDE, because this +! will hinder the free exchange of information across locales +! and platforms. +! +! The .=. and .~. mappings are similar. The difference is +! that the .=. mapping requires an exact string match between +! the platform locale and the string provided to the +! translation routine. Generally speaking, this mapping +! is risky unless exact matchings can be guaranteed in +! all DtLcx clients for the particular operation in question. +! The .~. mapping is to be preferred, but the .=. translation +! is useful in limited situations, where similar strings may +! occur. +! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! define this resource to dump debug/test info +!*debugDtXlate: True + +!!!!!!!!!!!!!!!! NetBSD Version Identificaton !!!!!!!!!!!!!!!!! +! These translations are used by the _DtXlateGetXlateEnv() +! call to determine the version number to use. +! +! To understand the translation, realize that the +! operation-specific regexp(5) pattern on the right +! hand side is matched against the strings returned +! by uname(2). The best match determines the "normalized" +! version number of the platform, which should range from +! 001 and up. By convention, major release numbers +! map to centuries and minor release numbers to within +! the century. +! +! To determine the string that the regular expression on the +! right hand side is matching against, use uname(1) and run +! 'uname -r' and 'uname -v' and note the strings. During execution, +! the strings returned by this command are retrieved and +! concatenated "rv"--in that order, no extra spaces. +! This is the string that the pattern must match. +! +! Sometimes this string may not be intuitive. For example, +! note that NetBSD 3.2 returns 2 for 'uname -r' and 3 for 'uname -v'. +! So the pattern string must be 23, not 32. Do not go by +! the order of 'uname -rv' or 'uname -vr', as that is not used. +!! + +NetBSD.?.version.<.100: ".*" !! any CDE value + + +!!!!!!!!!!!!!!!! NetBSD-specific setlocale translations !!!!!!!!!!!!!!!!!!! +! These translations are for the string returned by the +! getlocale() or setlocale(LC_xxx,NULL) operations, but not +! setlocale(LC_ALL,NULL) operation. +! +! It provides translations from NetBSD operation-specific +! to CDE standard strings and back again. +! +! Some language,territory combinations have the following comments: +! (1) These ISO territory names may be subject to change +! However, their CDE names will continue to be supported +! (2) No ISO "territory" name exists for the Arabic-speaking regions of the +! world as a whole. Vendors have sometimes supplied their own. +! Those names, when conformant to the ISO model, will be adopted for CDE. +! +!Platform Operation Lang_Terr Op-Value Language,Territory Who has +!--- --------- ----- -------- ------------------ ------- +! Version Kind Codeset +! ---- - --------- + + +! setlocales Compliance +NetBSD.100+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM +NetBSD.100+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM +NetBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL +NetBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL + +! W European/Americas, Latin 1 codeset +NetBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") +NetBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL +NetBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL +NetBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") +NetBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL +NetBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL +NetBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL +NetBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +NetBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , +NetBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , +NetBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL +NetBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL +NetBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL +NetBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +NetBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , +NetBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +NetBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , +NetBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL +NetBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +NetBSD.100+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun +NetBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +NetBSD.100+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun +NetBSD.100+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun +NetBSD.100+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun +NetBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL +NetBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +NetBSD.100+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun +NetBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +NetBSD.100+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun +NetBSD.100+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun +NetBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +! NetBSD.100+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, +NetBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +! NetBSD.100+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, +NetBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL +NetBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL +NetBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL +NetBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") +NetBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") +NetBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL +NetBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +! NetBSD.100+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, +! NetBSD.100+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, +! NetBSD.100+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, +NetBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL +NetBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") +NetBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") +NetBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL +NetBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +NetBSD.100+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, +NetBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") + + +! E European +NetBSD.100+.setlocale.~.cs_CS.ISO-8859-2: cs_CZ !.ISO8859-2 ! Czech(1) ,IBM, HP +NetBSD.100+.setlocale.~.hr_HR.ISO-8859-2: hr_HR !.ISO8859-2 ! Croatian, Croatia ,IBM +NetBSD.100+.setlocale.~.hu_HU.ISO-8859-2: hu_HU !.ISO8859-2 ! Hungarian, Hungry XoJIG,IBM, HP +NetBSD.100+.setlocale.~.pl_PL.ISO-8859-2: pl_PL !.ISO8859-2 ! Polish, Poland XoJIG,IBM, HP +NetBSD.100+.setlocale.~.ro_RO.ISO-8859-2: ro_RO !.ISO8859-2 ! Rumanian, Romania XoJIG,IBM, HP +NetBSD.100+.setlocale.~.sh_YU.ISO-8859-2: sh_SP !.ISO8859-2 ! Serbocroatian, Yugoslavia(1) ,IBM, HP +NetBSD.100+.setlocale.>.sl_CS.ISO-8859-2: sl_SI !.ISO8859-2 ! Slovenian , , HP +NetBSD.100+.setlocale.~.si_SI.ISO-8859-2: sl_SI !.ISO8859-2 ! Slovenian ,IBM, +NetBSD.100+.setlocale.~.sk_SK.ISO-8859-2: sk_SK !.ISO8859-2 ! Slovak ,IBM + +! Cyrillic +NetBSD.100+.setlocale.~.bg_BG.ISO-8859-5: bg_BG !.ISO8859-5 ! Bulgarian, Bulgaria ,IBM, HP +NetBSD.100+.setlocale.~.mk_MK.ISO-8859-5: mk_MK !.ISO8859-5 ! Macedonian ,IBM +NetBSD.100+.setlocale.~.ru_RU.ISO-8859-5: ru_RU !.ISO8859-5 ! Russian(1) ,IBM, +NetBSD.100+.setlocale.>.ru_SU.ISO-8859-5: ru_RU !.ISO8859-5 ! Russian(1) , , HP +NetBSD.100+.setlocale.~.sp_YU.ISO-8859-5: sr_SP !.ISO8859-5 ! Serbian,Yugoslavia(1) ,IBM + +! Arabic +NetBSD.100+.setlocale.>.ar_DZ.ISO-8859-6: ar_AA !.ISO8859-6 ! Arabic(2) , , HP +NetBSD.100+.setlocale.~.ar_SA.ISO-8859-6: ar_AA !.ISO8859-6 ! Arabic(2) ,IBM, HP +NetBSD.100+.setlocale.~.ar_SA.IBM-1046: Ar_AA !.IBM-1046 ! Arabic(2) ,IBM + +! Hebrew +NetBSD.100+.setlocale.~.iw_IL.ISO-8859-8: iw_IL !.ISO8859-8 ! Hebrew, Israel ,IBM, HP +NetBSD.100+.setlocale.~.iw_IL.IBM-856: Iw_IL !.IBM-856 ! Hebrew, Israel ,IBM + +! Greek +NetBSD.100+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece ,IBM, HP + +! Turkish +NetBSD.100+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP + +! East Asia +NetBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +NetBSD.100+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM +NetBSD.100+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, +NetBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL +NetBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +NetBSD.100+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP +NetBSD.100+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, +NetBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +NetBSD.100+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , +! NetBSD.100+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , +! NetBSD.100+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , + + +! Thai +NetBSD.100+.setlocale.~.th_TH.TIS-620: th_TH !.TIS-620 ! Thai, Thailand ,IBM, HP + + +! W European/Americas, IBM-850 codeset +NetBSD.100+.setlocale.~.da_DK.IBM-850: Da_DK ! Danish, Denmark ,IBM, +NetBSD.100+.setlocale.>.de_AT.IBM-850: De_DE ! German,Austria , , +NetBSD.100+.setlocale.~.de_CH.IBM-850: De_CH ! German,Switzerland ,IBM, +NetBSD.100+.setlocale.~.de_DE.IBM-850: De_DE ! German, Germany ,IBM, +NetBSD.100+.setlocale.>.en_AU.IBM-850: En_GB ! English,Australia , , +NetBSD.100+.setlocale.>.en_CA.IBM-850: En_US ! English,Canada , , +NetBSD.100+.setlocale.>.en_DK.IBM-850: En_GB ! English, Denmark , , +NetBSD.100+.setlocale.~.en_GB.IBM-850: En_GB ! English, U.K. ,IBM, +NetBSD.100+.setlocale.~.en_JP.IBM-850: En_JP ! English, Japan ,IBM, +NetBSD.100+.setlocale.>.en_IE.IBM-850: En_GB ! English, Ireland , , +NetBSD.100+.setlocale.>.en_MY.IBM-850: En_US ! English,Malaysia , , +NetBSD.100+.setlocale.>.en_NZ.IBM-850: En_GB ! English,New Zealand , , +NetBSD.100+.setlocale.>.en_KR.IBM-850: En_GB ! English,Korea , , +NetBSD.100+.setlocale.>.en_TW.IBM-850: En_GB ! English,Taiwan , , +NetBSD.100+.setlocale.~.en_US.IBM-850: En_US ! English, USA ,IBM, +NetBSD.100+.setlocale.>.es_AR.IBM-850: Es_ES ! Spanish, Argentina , , +NetBSD.100+.setlocale.>.es_BO.IBM-850: Es_ES ! Spanish, Bolivia , , +NetBSD.100+.setlocale.>.es_CL.IBM-850: Es_ES ! Spanish, Chile , , +NetBSD.100+.setlocale.>.es_CO.IBM-850: Es_ES ! Spanish, Columbia , , +NetBSD.100+.setlocale.>.es_CR.IBM-850: Es_ES ! Spanish, Costa Rica , , +NetBSD.100+.setlocale.>.es_EC.IBM-850: Es_ES ! Spanish, Ecuador , , +NetBSD.100+.setlocale.~.es_ES.IBM-850: Es_ES ! Spanish, Spain ,IBM, +NetBSD.100+.setlocale.~.ca_ES.IBM-850: Ca_ES ! Catalan, Spain ,IBM, +NetBSD.100+.setlocale.>.es_GT.IBM-850: Es_ES ! Spanish, Guatemala , , +NetBSD.100+.setlocale.>.es_MX.IBM-850: Es_ES ! Spanish, Mexico , , +NetBSD.100+.setlocale.>.es_PE.IBM-850: Es_ES ! Spanish, Peru , , +NetBSD.100+.setlocale.>.es_UY.IBM-850: Es_ES ! Spanish, Uruguay , , +NetBSD.100+.setlocale.>.es_VE.IBM-850: Es_ES ! Spanish, Venezuela , , +! NetBSD.100+.setlocale.>.et_EE.IBM-850: ! Estonian, Estonia , +NetBSD.100+.setlocale.~.fi_FI.IBM-850: Fi_FI ! Finnish, Finland ,IBM, +! NetBSD.100+.setlocale.>.fo_FO.IBM-850: ! Faroese, Faeroe Island , +NetBSD.100+.setlocale.~.fr_BE.IBM-850: Fr_BE ! French,Belgium , , +NetBSD.100+.setlocale.~.fr_CA.IBM-850: Fr_CA ! French, Canada ,IBM, +NetBSD.100+.setlocale.~.fr_CH.IBM-850: Fr_CH ! French, Switzerland ,IBM, +NetBSD.100+.setlocale.~.fr_FR.IBM-850: Fr_FR ! French, France ,IBM, +NetBSD.100+.setlocale.~.is_IS.IBM-850: Is_IS ! Icelandic, Iceland ,IBM, +NetBSD.100+.setlocale.>.it_CH.IBM-850: It_IT ! Italian,Switzerland , , +NetBSD.100+.setlocale.~.it_IT.IBM-850: It_IT ! Italian, Italy ,IBM, +! NetBSD.100+.setlocale.>.kl_GL.IBM-850: ! Greenlandic, Greenland , +! NetBSD.100+.setlocale.>.lt_LT.IBM-850: ! Lithuanian, Lithuania , +! NetBSD.100+.setlocale.>.lv_LV.IBM-850: ! Latvian, Latvia , +NetBSD.100+.setlocale.~.nl_BE.IBM-850: Nl_BE ! Dutch, Belgium ,IBM, +NetBSD.100+.setlocale.~.nl_NL.IBM-850: Nl_NL ! Dutch, The Netherlands ,IBM, +NetBSD.100+.setlocale.~.no_NO.IBM-850: No_NO ! Norwegian, Norway ,IBM, +NetBSD.100+.setlocale.>.pt_BR.IBM-850: Pt_PT ! Portuguese,Brazil , , +NetBSD.100+.setlocale.~.pt_PT.IBM-850: Pt_PT ! Portuguese, Portugal ,IBM, +NetBSD.100+.setlocale.>.sv_FI.IBM-850: Sv_SE ! Swedish, Finland , +vvNetBSD.100+.setlocale.~.sv_SE.IBM-850: Sv_SE ! Swedish, Sweden ,IBM, + + +! codesets supported for iconv(1,3) & nl_langinfo and above +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-1: ISO8859-1 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-2: ISO8859-2 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-5: ISO8859-5 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-6: ISO8859-6 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-7: ISO8859-7 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-8: ISO8859-8 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-9: ISO8859-9 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-KR: IBM-eucKR +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-JP: IBM-eucJP +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-TW: IBM-eucTW +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-CN: IBM-eucCN +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).>.?.HP-15CN: IBM-eucCN +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-437: IBM-437 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-850: IBM-850 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-856: IBM-856 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-932: IBM-932 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).>.?.HP-SJIS: IBM-932 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-1046: IBM-1046 +NetBSD.100+.iconv1,iconv3,nl_langinfo(CODESET).=.?.UTF-8: UTF-8 +NetBSD.100+.iconv1,iconv3.>.?.ISO-2022-JP: fold7 +NetBSD.100+.iconv1,iconv3.>.?.ISO-2022-KR: fold7 +NetBSD.100+.iconv1,iconv3.>.?.ISO-2022-TW: fold7 +NetBSD.100+.iconv1,iconv3.>.?.ISO-2022-CN: fold7 +NetBSD.100+.iconv1,iconv3.>.?.HP-BIG5: big5 +NetBSD.100+.iconv1,iconv3.>.?.TIS-620: TIS-620 + +! codesets not supported by NetBSD iconv(1,3) +! NetBSD.?.iconv1,iconv3.~.?.UCS-2: +! NetBSD.?.iconv1,iconv3.~.?.HP-ARABIC8: +! NetBSD.?.iconv1,iconv3.~.?.HP-GREEK8: +! NetBSD.?.iconv1,iconv3.~.?.HP-HEBREW8 +! NetBSD.?.iconv1,iconv3.~.?.HP-ROMAN8: +! NetBSD.?.iconv1,iconv3.~.?.HP-TURKISH8: +! NetBSD.?.iconv1,iconv3.~.?.HP-KANA8: +! NetBSD.?.iconv1,iconv3.~.?.HP-CCDC: + +! multibyte codesets +! This translation provides an alternative to a call to +! using setlocale() and MB_CUR_MAX to determine this. +NetBSD.100+.multibyte.=.?.EUC-KR: 2 +NetBSD.100+.multibyte.=.?.HP-SJIS: 2 +NetBSD.100+.multibyte.=.?.IBM-932: 2 +NetBSD.100+.multibyte.=.?.EUC-JP: 3 +! NetBSD.?.multibyte.~.?.HP-CCDC: 2 +NetBSD.100+.multibyte.>.?.HP-BIG5: 2 +NetBSD.100+.multibyte.=.?.EUC-TW: 4 +NetBSD.100+.multibyte.=.?.TIS-620: 2 +NetBSD.100+.multibyte.=.?.EUC-CN: 2 +NetBSD.100+.multibyte.=.?.HP-15CN: 2 +NetBSD.100+.multibyte.=.?.EUC-KR: 2 +NetBSD.100+.multibyte.=.?.UTF-8: 3 + + +! Translations from predefined CCDF-locales to CDE Standard Locales +NetBSD.100+.ccdf.=.?.ISO-8859-1: ISO8859-1 +NetBSD.100+.ccdf.=.?.ISO-8859-2: ISO8859-2 +NetBSD.100+.ccdf.=.?.ISO-8859-5: ISO8859-5 +NetBSD.100+.ccdf.=.?.ISO-8859-6: ISO8859-6 +NetBSD.100+.ccdf.=.?.ISO-8859-7: ISO8859-7 +NetBSD.100+.ccdf.=.?.ISO-8859-8: ISO8859-8 +NetBSD.100+.ccdf.=.?.ISO-8859-9: ISO8859-9 +NetBSD.100+.ccdf.=.?.EUC-JP: IBM-eucJP +NetBSD.100+.ccdf.=.?.EUC-KR: IBM-eucKR +NetBSD.100+.ccdf.=.?.EUC-TW: IBM-eucTW +NetBSD.100+.ccdf.=.?.EUC-CN: IBM-eucCN +NetBSD.100+.ccdf.>.?.IBM-932: IBM-932 +NetBSD.100+.ccdf.>.?.HP-SJIS: IBM-932 +NetBSD.100+.ccdf.=.?.IBM-1046: IBM-1046 +NetBSD.100+.ccdf.=.?.IBM-850: IBM-850 +NetBSD.100+.ccdf.=.?.IBM-856: IBM-856 +NetBSD.100+.ccdf.=.?.HP-BIG5: big5 +NetBSD.100+.ccdf.=.?.TIS-620: TIS-620 +NetBSD.100+.ccdf.=.?.UTF-8: UTF-8 +NetBSD.100+.ccdf.=.?.DT-SYMBOL-1: symbol !!! standard Dt symbol font + +! These CDE standard locales may have CCDF-locales, but they are defined by localizers +NetBSD.100+.ccdf.>.?.HP-ROMAN8: ISO8859-1 +NetBSD.100+.ccdf.>.?.HP-ARABIC8: ISO8859-6 +NetBSD.100+.ccdf.>.?.HP-GREEK8: ISO8859-8 +NetBSD.100+.ccdf.>.?.HP-HEBREW8: ISO8859-7 +NetBSD.100+.ccdf.>.?.HP-TURKISH8: ISO8859-9 +NetBSD.100+.ccdf.>.?.HP-KANA8: IBM-932 +NetBSD.100+.ccdf.>.?.HP-CCDC: IBM-eucCN + + + +! Codesets that require multibyte parsing to avoid confusion with shell special chars +NetBSD.?.dtkshSpecialParse.=.ja_JP.HP-JIS: True +NetBSD.?.dtkshSpecialParse.=.ja_JP.HP-SJIS: True +NetBSD.?.dtkshSpecialParse.=.ja_JP.IBM-932: True +NetBSD.?.dtkshSpecialParse.=.zh_TW.HP-BIG5: True +NetBSD.?.dtkshSpecialParse.=.zh_TW.HP-CCDC: True + + +!! When content is exchanged with other platforms, the interchange codeset +!! may be different that the codeset used locally. In CDE1, these translations +!! are used by dtmail, but other clients may use the same translations +!! in the future. For example, to improve interoperability of 8-bit mail, +!! the mail messages of users working in codesets such as HP-ROMAN8 or IBM-850 +!! are translated to the interchangeCodeset (in this case, ISO-8859-1) before +!! they are sent. Similarly, the mail of Japanese users is translated to JIS +!! before it is sent. +!! +!! -------------------------------------------------------------------- +!! NetBSD does provide the fold7 conversion which is an ISO 2022 encoding +!! of every code set supported by a locale... so ... the name +!! ISO-2022-xx ( where xx is JP, CN, KR, TW) +!! can be used for any of the following interchangeCodeset... but it has +!! been left as is in case 8-bit mail is supported... +!! -------------------------------------------------------------------- +!! +NetBSD.?.interchangeCodeset.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1 +!NetBSD.?.interchangeCodeset.>.?.HP-ROMAN8: ISO-8859-1 ! HP Roman8 +NetBSD.?.interchangeCodeset.>.?.IBM-850: ISO-8859-1 ! PC (Multi-lingual) +NetBSD.?.interchangeCodeset.>.?.IBM-437: ISO-8859-1 ! PC (US) +NetBSD.?.interchangeCodeset.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2 +NetBSD.?.interchangeCodeset.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic +NetBSD.?.interchangeCodeset.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic +!NetBSD.?.interchangeCodeset.>.?.HP-ARABIC8: ISO-8859-6 ! HP Arabic8 +NetBSD.?.interchangeCodeset.>.?.IBM-1046: ISO-8859-6 ! PC Arabic Code Set +NetBSD.?.interchangeCodeset.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew +!NetBSD.?.interchangeCodeset.>.?.HP-HEBREW8: ISO-8859-8 ! HP Hebrew8 +NetBSD.?.interchangeCodeset.>.?.IBM-856: ISO-8859-8 ! PC Hebrew +NetBSD.?.interchangeCodeset.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek +!NetBSD.?.interchangeCodeset.>.?.HP-GREEK8: ISO-8859-7 ! HP Greek8 +NetBSD.?.interchangeCodeset.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5 +!NetBSD.?.interchangeCodeset.>.?.HP-TURKISH8: ISO-8859-9 ! HP Turkish8 +NetBSD.?.interchangeCodeset.~.?.EUC-JP: ISO-2022-JP ! Japanese EUC +!NetBSD.?.interchangeCodeset.>.?.HP-SJIS: ISO-2022-JP ! HP Japanese Shift JIS +NetBSD.?.interchangeCodeset.>.?.IBM-932: ISO-2022-JP ! PC Japanese Shift JIS +!NetBSD.?.interchangeCodeset.>.?.HP-KANA8: ISO-2022-JP ! HP Japanese Katakana8 +! uncomment when ISO-2022-KR is supported by iconv +NetBSD.?.interchangeCodeset.~.?.EUC-KR: ISO-2022-KR ! Korean EUC +! uncomment when ISO-2022-CN is supported by iconv +NetBSD.?.interchangeCodeset.~.?.EUC-CN: ISO-2022-CN ! China Chinese EUC +NetBSD.?.interchangeCodeset.>.?.HP-15CN: ISO-2022-CN ! HP Chinese EUC +! uncomment when ISO-2022-TW is supported by iconv +NetBSD.?.interchangeCodeset.~.?.EUC-TW: ISO-2022-TW ! Taiwan Chinese EUC +NetBSD.?.interchangeCodeset.>.?.HP-BIG5: ISO-2022-TW ! HP Big5 Chinese +NetBSD.?.interchangeCodeset.>.?.HP-CCDC: ISO-2022-TW ! HP CCDC Chinese +NetBSD.?.interchangeCodeset.~.?.TIS-620: TIS-620 ! Thai +NetBSD.?.interchangeCodeset.>.?.UCS-2: ISO-2022-JP ! Unicode +NetBSD.?.interchangeCodeset.~.?.UTF-8: ISO-2022-JP ! multibyte Unicode +!! Codeset identifiers for use with MIME messages. The .~. translations +!! are used by dtmail and adhere to the MIME standard, RFC 1521. +!! Note that the MIME standard states that codeset identifiers are +!! case-insensitive. The operation-specific values on the right-hand-side +!! of the translations below, however, ARE case sensitive. Before +!! doing a OpToStd translation, first convert the MIME codeset identifier +!! to uppercase. Alternatively, one could provide lower-case versions +!! of the translations (right-hand-side only should be in lower-case). +NetBSD.?.mime.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1 +NetBSD.?.mime.~.?.HP-ROMAN8: X-HP-ROMAN8 ! HP Roman8 +NetBSD.?.mime.~.?.IBM-437: X-IBM-437 ! PC (US) +NetBSD.?.mime.~.?.IBM-850: X-IBM-850 ! PC (Multi-lingual) +NetBSD.?.mime.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2 +NetBSD.?.mime.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic +NetBSD.?.mime.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic +NetBSD.?.mime.~.?.HP-ARABIC8: X-HP-ARABIC8 ! HP Arabic8 +NetBSD.?.mime.~.?.IBM-1046: X-IBM-1046 ! PC Arabic Code Set +NetBSD.?.mime.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew +NetBSD.?.mime.~.?.HP-HEBREW8: X-HP-HEBREW8 ! HP Hebrew8 +NetBSD.?.mime.~.?.IBM-856: X-IBM-856 ! PC Hebrew +NetBSD.?.mime.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek +NetBSD.?.mime.~.?.HP-GREEK8: X-HP-GREEK8 ! HP Greek8 +NetBSD.?.mime.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5 +NetBSD.?.mime.~.?.HP-TURKISH8: X-HP-TURKISH8 ! HP Turkish8 +NetBSD.?.mime.~.?.EUC-JP: X-EUC-JP ! Japanese EUC +NetBSD.?.mime.~.?.ISO-2022-JP: ISO-2022-JP ! Japanese JIS with 7-bit encoding per ISO-2022-JP +NetBSD.?.mime.~.?.HP-SJIS: X-HP-SJIS ! HP Japanese Shift JIS +NetBSD.?.mime.~.?.IBM-932: X-IBM-932 ! PC Japanese Shift JIS +NetBSD.?.mime.~.?.HP-KANA8: X-HP-KANA8 ! HP Japanese Katakana8 +NetBSD.?.mime.~.?.EUC-KR: X-EUC-KR ! Korean EUC +NetBSD.?.mime.~.?.ISO-2022-KR: ISO-2022-KR ! Korean with 7-bit encoding per ISO-2022-KR +NetBSD.?.mime.~.?.EUC-CN: X-EUC-CN ! China Chinese EUC +NetBSD.?.mime.~.?.ISO-2022-CN: ISO-2022-CN ! China Chinese with 7-bit encoding per ISO-2022-CN +NetBSD.?.mime.~.?.HP-15CN: X-HP-15CN ! HP China Chinese EUC +NetBSD.?.mime.~.?.EUC-TW: X-EUC-TW ! Taiwan Chinese EUC +NetBSD.?.mime.~.?.ISO-2022-TW: ISO-2022-TW ! Taiwan Chinese with 7-bit encoding per ISO-2022-TW +NetBSD.?.mime.~.?.HP-BIG5: X-HP-BIG5 ! HP Big5 Taiwan Chinese +NetBSD.?.mime.~.?.HP-CCDC: X-HP-CCDC ! HP CCDC Taiwan Chinese +NetBSD.?.mime.~.?.TIS-620: X-TIS-620 ! Thai +NetBSD.?.mime.~.?.UCS-2: X-UCS-2 ! Unicode; group 0, plane 0 of ISO-10646 +NetBSD.?.mime.~.?.UCS-4: X-UCS-4 ! ISO-10646 +NetBSD.?.mime.~.?.UTF-7: X-UTF-7 ! multibyte encoding of Unicode +NetBSD.?.mime.~.?.UTF-8: X-UTF-8 ! multibyte encoding of Unicode +NetBSD.?.mime.~.?.UTF-16: X-UTF-16 ! multibyte encoding of Unicode + +!! If other mailers are using other codeset identifiers in their MIME +!! messages, dtmail will not be able to process them correctly. +!! To correct this, additional .<. translations for these identifiers +!! can be added to a .lcx file in the /etc/dt/config/svc +!! or $HOME/.dt/config/svc directories. Such translations should read: +!! .100+.mime.<.?.: +!! +!! ***NEVER*** use a .~. translation, such as we use above, as this could +!! cause dtmail to send unexpected identifier strings by overriding the +!! above definition. Further, never use .=. or .>. translations. +!! +!! These two identifiers are in common usage, as they derive from RFC1521. +NetBSD.?.mime.<.?.ISO-8859-1: us-ascii ! ISO Latin 1 +NetBSD.?.mime.<.?.ISO-8859-1: US-ASCII ! ISO Latin 1 diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile index 43ad0706..5f312bc8 100644 --- a/cde/lib/DtWidget/Imakefile +++ b/cde/lib/DtWidget/Imakefile @@ -15,8 +15,10 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $ DEFINES = DtWidgetDefines #if defined(LinuxArchitecture) INCLUDES = -I. -I/usr/include/freetype2 -#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) +#elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) INCLUDES = -I. -I$(XPROJECTROOT)/include/freetype2 +#elif defined(NetBSDArchitecture) +INCLUDES = -I. -I$(XPROJECTROOT)/include -I$(XPROJECTROOT)/include/freetype2 #else INCLUDES = -I. #endif diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile index 987d38fa..3cd45371 100644 --- a/cde/programs/dtaction/Imakefile +++ b/cde/programs/dtaction/Imakefile @@ -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 diff --git a/cde/programs/dtappbuilder/src/libAButil/util.c b/cde/programs/dtappbuilder/src/libAButil/util.c index 138651d7..572873b2 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util.c +++ b/cde/programs/dtappbuilder/src/libAButil/util.c @@ -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 diff --git a/cde/programs/dtcm/dtcm/cm_i18n.c b/cde/programs/dtcm/dtcm/cm_i18n.c index a64128e0..0bb6f4f0 100644 --- a/cde/programs/dtcm/dtcm/cm_i18n.c +++ b/cde/programs/dtcm/dtcm/cm_i18n.c @@ -68,13 +68,6 @@ should be fixed in the future. #include #include /* for MAXPATHLEN */ #include -#include "util.h" -#include "timeops.h" -#include "cm_i18n.h" -#include "deskset.h" -/* -#include "gettext.h" -*/ #include /* Iconv not defined for linux. Use the EUSCompat stubs instead. */ @@ -83,6 +76,14 @@ should be fixed in the future. #endif #include +#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; diff --git a/cde/programs/dtcm/server/v4ops.c b/cde/programs/dtcm/server/v4ops.c index d4eceba9..62529b44 100644 --- a/cde/programs/dtcm/server/v4ops.c +++ b/cde/programs/dtcm/server/v4ops.c @@ -37,7 +37,11 @@ #include #include #if defined(CSRG_BASED) +#if defined(__NetBSD__) +#include +#else #include +#endif #define MAXINT INT_MAX #else #include diff --git a/cde/programs/dtcreate/cmncbs.c b/cde/programs/dtcreate/cmncbs.c index 5e0c3f88..7fb8a828 100644 --- a/cde/programs/dtcreate/cmncbs.c +++ b/cde/programs/dtcreate/cmncbs.c @@ -29,6 +29,7 @@ /* */ /*****************************************************************************/ #include +#include #include #include diff --git a/cde/programs/dtdocbook/tcl/Imakefile b/cde/programs/dtdocbook/tcl/Imakefile index 0d34371d..45aadcf3 100644 --- a/cde/programs/dtdocbook/tcl/Imakefile +++ b/cde/programs/dtdocbook/tcl/Imakefile @@ -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 + +#if defined(LinuxArchitecture) +prefix = /usr/lib +#elif defined(OpenBSDArchitecture) +prefix = /usr/local/lib/tcl +#elif defined(NetBSDArchitecture) +prefix = /usr/pkg/lib #else -VERSION = 7.5 +prefix = /usr/local/lib #endif -prefix = /usr/local - 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. diff --git a/cde/programs/dtdocbook/tcl/tclExpr.c b/cde/programs/dtdocbook/tcl/tclExpr.c index ebd3d68c..8e58f662 100644 --- a/cde/programs/dtdocbook/tcl/tclExpr.c +++ b/cde/programs/dtdocbook/tcl/tclExpr.c @@ -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); diff --git a/cde/programs/dtfile/Trash.c b/cde/programs/dtfile/Trash.c index 1ad4fdca..09df7b73 100644 --- a/cde/programs/dtfile/Trash.c +++ b/cde/programs/dtfile/Trash.c @@ -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 diff --git a/cde/programs/dtfile/dtcopy/sharedFuncs.c b/cde/programs/dtfile/dtcopy/sharedFuncs.c index 6c74befa..0d9b3d98 100644 --- a/cde/programs/dtfile/dtcopy/sharedFuncs.c +++ b/cde/programs/dtfile/dtcopy/sharedFuncs.c @@ -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 diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C b/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C index cae4b1f9..79711ea6 100644 --- a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C +++ b/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C @@ -23,6 +23,7 @@ // $TOG: autoNumber.C /main/6 1998/04/17 11:47:13 mgreess $ #include +#include #if defined(CSRG_BASED) #define MAXINT INT_MAX #else diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C index 378fd3a0..412d0a90 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C @@ -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()) ; diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookTabMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/BookTabMotif.C index a9a79f31..792cd486 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookTabMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookTabMotif.C @@ -101,7 +101,7 @@ BookTab::set_tab (UAS_Pointer &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 &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 &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) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C index 0d8e4219..253391f6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C @@ -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 &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 &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 ++) { diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C index 3bea3352..e22729ca 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C @@ -1199,12 +1199,12 @@ OutlineListView::activate (WCallback *wcb) { UAS_List 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 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 kids = ((TOC_Element *)oe)->toc()->children(); - if (! (kids[0] == (const int)NULL)) + if (! (kids[0] == (const int)0)) { kids[0]->retrieve(); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C index 220631bb..3d64ba1c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C @@ -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); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C index ede222c0..d7997b55 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C @@ -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 diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh b/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh index 1d198b7b..86350405 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh @@ -24,7 +24,7 @@ * Campbell, CA 95008 * */ -#if defined(SVR4) || defined(hpux) || defined(linux) +#if defined(SVR4) || defined(hpux) || defined(linux) || defined(__NetBSD__) #include #else #include diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C index c1041da8..faab322a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C @@ -237,7 +237,7 @@ LibraryMgr::display (UAS_Pointer &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); diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C index db5c2d5a..477b8739 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C @@ -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); diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C index 373eb1ed..7cc27d7d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C @@ -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); } diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C b/cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C index f6a3bd71..f710facd 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C @@ -132,7 +132,7 @@ UAS_Pointer & 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="; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Common.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Common.C index feab3d5d..5bc746d1 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Common.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Common.C @@ -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(); } diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C index b019a96c..e4c04390 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C @@ -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::bcases() { - if (f_bcases == (const int)NULL) + if (f_bcases == (const int)0) f_bcases = new UAS_List(); return *(UAS_List*)f_bcases; } diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C index da2ab01a..137cc1f5 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C @@ -373,11 +373,11 @@ DtSR_SearchEngine::init(UAS_PtrList *bcases) continue; UAS_Pointer obj; - if ((obj = UAS_Factory::create(bookcase_url)) == (int)NULL) + if ((obj = UAS_Factory::create(bookcase_url)) == (int)0) continue; UAS_Pointer 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 &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 > 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 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& 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; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C index 3218f68c..cc712669 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C @@ -102,7 +102,7 @@ DtSR_SearchResults::create_results(int index, int nres) void DtSR_SearchResults::merge(UAS_Pointer & 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; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C index 088324e2..7e60465f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C @@ -196,7 +196,7 @@ DtSR_SearchResultsEntry::section_in_abstract(char* abstract, const char* id) UAS_Pointer 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 diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen index f85c6855..0cb6ac27 100755 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen @@ -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]" ;; diff --git a/cde/programs/dtinfo/tools/misc/Imakefile b/cde/programs/dtinfo/tools/misc/Imakefile index af994ae4..09e806ad 100644 --- a/cde/programs/dtinfo/tools/misc/Imakefile +++ b/cde/programs/dtinfo/tools/misc/Imakefile @@ -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) diff --git a/cde/programs/dtinfo/tools/misc/treeres b/cde/programs/dtinfo/tools/misc/treeres.src similarity index 95% rename from cde/programs/dtinfo/tools/misc/treeres rename to cde/programs/dtinfo/tools/misc/treeres.src index d077302e..84a66524 100755 --- a/cde/programs/dtinfo/tools/misc/treeres +++ b/cde/programs/dtinfo/tools/misc/treeres.src @@ -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 = ""; if ($#ARGV >= 0) - { + { open(IN,$ARGV[0]) || die "Can't open file $ARGV[0].\n"; $file = $ARGV[0]; } @@ -65,7 +65,7 @@ while () $continuation = /[^\\](\\\\)*\\$/; # Multiple blank lines are compressed to one - if (/^([ \t]*)(!x.*)?$/) { + if (/^([ \t]*)(!x.*)?$/) { if ($blankcount++ == 0) { print; } next; } @@ -92,7 +92,7 @@ while () # 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; diff --git a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh index 68ef94ba..c9892f74 100644 --- a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh +++ b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh @@ -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 diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile index 82b44df5..84d11d92 100644 --- a/cde/programs/dtlogin/Imakefile +++ b/cde/programs/dtlogin/Imakefile @@ -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 diff --git a/cde/programs/dtlogin/config/0060.dtsysenv.src b/cde/programs/dtlogin/config/0060.dtsysenv.src index f69919e0..ebca9e41 100644 --- a/cde/programs/dtlogin/config/0060.dtsysenv.src +++ b/cde/programs/dtlogin/config/0060.dtsysenv.src @@ -27,7 +27,7 @@ XCOMM #################################################################### #define HASH # -#if !defined(__FreeBSD__) +#if !defined(CSRG_BASED) HASH HASH Source TIMEZONE HASH diff --git a/cde/programs/dtlogin/config/Xfailsafe.src b/cde/programs/dtlogin/config/Xfailsafe.src index 45f46957..7f7772c6 100644 --- a/cde/programs/dtlogin/config/Xfailsafe.src +++ b/cde/programs/dtlogin/config/Xfailsafe.src @@ -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 & diff --git a/cde/programs/dtlogin/config/Xservers.src b/cde/programs/dtlogin/config/Xservers.src index 7aa7aea0..31b0f4a0 100644 --- a/cde/programs/dtlogin/config/Xservers.src +++ b/cde/programs/dtlogin/config/Xservers.src @@ -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 diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index 423c2d70..58e1f8f9 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -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 /* diff --git a/cde/programs/dtlogin/config/Xsetup.src b/cde/programs/dtlogin/config/Xsetup.src index 9b7dd474..107cd017 100644 --- a/cde/programs/dtlogin/config/Xsetup.src +++ b/cde/programs/dtlogin/config/Xsetup.src @@ -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 diff --git a/cde/programs/dtlogin/config/Xstartup.src b/cde/programs/dtlogin/config/Xstartup.src index 15af0bad..d7d3264d 100644 --- a/cde/programs/dtlogin/config/Xstartup.src +++ b/cde/programs/dtlogin/config/Xstartup.src @@ -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 diff --git a/cde/programs/dtlogin/config/_common.ksh.src b/cde/programs/dtlogin/config/_common.ksh.src index 37cc227d..a5966f49 100644 --- a/cde/programs/dtlogin/config/_common.ksh.src +++ b/cde/programs/dtlogin/config/_common.ksh.src @@ -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 diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index 18f5bd53..f898d3bc 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -51,6 +51,7 @@ * display manager */ +# include # include # include #if defined(__FreeBSD__) && OSMAJORVERSION > 8 @@ -61,7 +62,7 @@ # include # include # include -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) # include #else # include diff --git a/cde/programs/dtlogin/reset.c b/cde/programs/dtlogin/reset.c index 17a784b5..769c1969 100644 --- a/cde/programs/dtlogin/reset.c +++ b/cde/programs/dtlogin/reset.c @@ -53,6 +53,7 @@ */ # include +# include # include # include "dm.h" # include "vgmsg.h" diff --git a/cde/programs/dtlogin/server.c b/cde/programs/dtlogin/server.c index 1f3a9899..a699e649 100644 --- a/cde/programs/dtlogin/server.c +++ b/cde/programs/dtlogin/server.c @@ -46,6 +46,7 @@ * Author: Keith Packard, MIT X Consortium */ +# include # include # include # include diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C index 5ad49d05..9086df3d 100644 --- a/cde/programs/dtmail/libDtMail/Common/Session.C +++ b/cde/programs/dtmail/libDtMail/Common/Session.C @@ -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; diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C index 06511499..0f0630fb 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C @@ -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; diff --git a/cde/programs/dtprintinfo/dtprintinfo.msg.src b/cde/programs/dtprintinfo/dtprintinfo.msg.src index a1992618..b0c4d2a5 100644 --- a/cde/programs/dtprintinfo/dtprintinfo.msg.src +++ b/cde/programs/dtprintinfo/dtprintinfo.msg.src @@ -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 ----- diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c index e6fd10b2..87f6ac37 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c +++ b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c @@ -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 diff --git a/cde/programs/dtprintinfo/sym2num b/cde/programs/dtprintinfo/sym2num index ba22f7e8..0f554d86 100755 --- a/cde/programs/dtprintinfo/sym2num +++ b/cde/programs/dtprintinfo/sym2num @@ -10,13 +10,11 @@ # by gencat. # -typeset -u CAP_SYMBOL_NAME - (( $# != 2 )) && { print "usage: sym2num " ;\ 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/' - diff --git a/cde/programs/dtsearchpath/dtappg/Options.C b/cde/programs/dtsearchpath/dtappg/Options.C index 24e11cdc..e9ac99fa 100644 --- a/cde/programs/dtsearchpath/dtappg/Options.C +++ b/cde/programs/dtsearchpath/dtappg/Options.C @@ -31,7 +31,7 @@ #include "Options.h" #include -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/dtsearchpath/dtappg/dtappgather.C b/cde/programs/dtsearchpath/dtappg/dtappgather.C index 45f37eb7..4d73aba2 100644 --- a/cde/programs/dtsearchpath/dtappg/dtappgather.C +++ b/cde/programs/dtsearchpath/dtappg/dtappgather.C @@ -75,7 +75,7 @@ #include "dtappgather.h" #include "DirIterator.h" #include -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/dtsearchpath/dtsp/ManSearchPath.C b/cde/programs/dtsearchpath/dtsp/ManSearchPath.C index 96abf0dd..386466ca 100644 --- a/cde/programs/dtsearchpath/dtsp/ManSearchPath.C +++ b/cde/programs/dtsearchpath/dtsp/ManSearchPath.C @@ -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; diff --git a/cde/programs/dtsearchpath/dtsp/Options.C b/cde/programs/dtsearchpath/dtsp/Options.C index 08004356..9565353c 100644 --- a/cde/programs/dtsearchpath/dtsp/Options.C +++ b/cde/programs/dtsearchpath/dtsp/Options.C @@ -33,7 +33,7 @@ #include "Options.h" #include -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/dtsearchpath/dtsp/SearchPath.C b/cde/programs/dtsearchpath/dtsp/SearchPath.C index 5e9d3f83..812922df 100644 --- a/cde/programs/dtsearchpath/dtsp/SearchPath.C +++ b/cde/programs/dtsearchpath/dtsp/SearchPath.C @@ -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; diff --git a/cde/programs/dtsearchpath/dtsp/SearchPath.h b/cde/programs/dtsearchpath/dtsp/SearchPath.h index ee0750da..ea5cc308 100644 --- a/cde/programs/dtsearchpath/dtsp/SearchPath.h +++ b/cde/programs/dtsearchpath/dtsp/SearchPath.h @@ -34,7 +34,7 @@ #include "Environ.h" #include "cstring.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include @@ -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 &); diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C index 63e1f986..d2f3d5ab 100644 --- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C +++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C @@ -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; diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index 856806a4..a13f6058 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -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 diff --git a/cde/programs/fontaliases/Imakefile b/cde/programs/fontaliases/Imakefile index 0efbc217..e532e104 100644 --- a/cde/programs/fontaliases/Imakefile +++ b/cde/programs/fontaliases/Imakefile @@ -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) diff --git a/cde/programs/fontaliases/netbsd/C/Imakefile b/cde/programs/fontaliases/netbsd/C/Imakefile new file mode 100644 index 00000000..45f68666 --- /dev/null +++ b/cde/programs/fontaliases/netbsd/C/Imakefile @@ -0,0 +1,3 @@ +XCOMM $XConsortium: Imakefile /main/3 1996/09/13 17:50:44 drk $ + +#include "../../bdf/fonts.tmpl" diff --git a/cde/programs/fontaliases/netbsd/C/fonts.alias b/cde/programs/fontaliases/netbsd/C/fonts.alias new file mode 100644 index 00000000..bbc9369b --- /dev/null +++ b/cde/programs/fontaliases/netbsd/C/fonts.alias @@ -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" diff --git a/cde/programs/fontaliases/netbsd/Imakefile b/cde/programs/fontaliases/netbsd/Imakefile new file mode 100644 index 00000000..6532167c --- /dev/null +++ b/cde/programs/fontaliases/netbsd/Imakefile @@ -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)) diff --git a/cde/programs/localized/de_DE.ISO8859-1/msg/dtprintinfo.msg b/cde/programs/localized/de_DE.ISO8859-1/msg/dtprintinfo.msg index cf9260dc..e6542ce1 100644 --- a/cde/programs/localized/de_DE.ISO8859-1/msg/dtprintinfo.msg +++ b/cde/programs/localized/de_DE.ISO8859-1/msg/dtprintinfo.msg @@ -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 ----- diff --git a/cde/programs/localized/es_ES.ISO8859-1/msg/dtprintinfo.msg b/cde/programs/localized/es_ES.ISO8859-1/msg/dtprintinfo.msg index 100168ab..2c6350ef 100644 --- a/cde/programs/localized/es_ES.ISO8859-1/msg/dtprintinfo.msg +++ b/cde/programs/localized/es_ES.ISO8859-1/msg/dtprintinfo.msg @@ -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 ----- diff --git a/cde/programs/localized/fr_FR.ISO8859-1/msg/dtprintinfo.msg b/cde/programs/localized/fr_FR.ISO8859-1/msg/dtprintinfo.msg index 928c21eb..605a2d9c 100644 --- a/cde/programs/localized/fr_FR.ISO8859-1/msg/dtprintinfo.msg +++ b/cde/programs/localized/fr_FR.ISO8859-1/msg/dtprintinfo.msg @@ -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 ----- diff --git a/cde/programs/localized/it_IT.ISO8859-1/msg/dtprintinfo.msg b/cde/programs/localized/it_IT.ISO8859-1/msg/dtprintinfo.msg index 93f63f3a..e66d5b7e 100644 --- a/cde/programs/localized/it_IT.ISO8859-1/msg/dtprintinfo.msg +++ b/cde/programs/localized/it_IT.ISO8859-1/msg/dtprintinfo.msg @@ -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 diff --git a/cde/programs/localized/templates/header2.tmpl b/cde/programs/localized/templates/header2.tmpl index a7d30198..0dbdf20e 100644 --- a/cde/programs/localized/templates/header2.tmpl +++ b/cde/programs/localized/templates/header2.tmpl @@ -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() diff --git a/cde/programs/nsgmls/EUCJPCodingSystem.C b/cde/programs/nsgmls/EUCJPCodingSystem.C index f2fb30ef..99ecf24f 100644 --- a/cde/programs/nsgmls/EUCJPCodingSystem.C +++ b/cde/programs/nsgmls/EUCJPCodingSystem.C @@ -29,7 +29,7 @@ #ifdef SP_MULTI_BYTE #include "EUCJPCodingSystem.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/nsgmls/Fixed2CodingSystem.C b/cde/programs/nsgmls/Fixed2CodingSystem.C index 8114f7e9..25dfd2c1 100644 --- a/cde/programs/nsgmls/Fixed2CodingSystem.C +++ b/cde/programs/nsgmls/Fixed2CodingSystem.C @@ -34,7 +34,7 @@ #include "Fixed2CodingSystem.h" #include "macros.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/nsgmls/IdentityCodingSystem.C b/cde/programs/nsgmls/IdentityCodingSystem.C index 6f0e472b..cd1b070a 100644 --- a/cde/programs/nsgmls/IdentityCodingSystem.C +++ b/cde/programs/nsgmls/IdentityCodingSystem.C @@ -26,7 +26,7 @@ #include "splib.h" #include "IdentityCodingSystem.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/nsgmls/SJISCodingSystem.C b/cde/programs/nsgmls/SJISCodingSystem.C index aaa1a0c1..a2c8edd5 100644 --- a/cde/programs/nsgmls/SJISCodingSystem.C +++ b/cde/programs/nsgmls/SJISCodingSystem.C @@ -30,7 +30,7 @@ #include "SJISCodingSystem.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/nsgmls/UTF8CodingSystem.C b/cde/programs/nsgmls/UTF8CodingSystem.C index 343ead01..3fb39a82 100644 --- a/cde/programs/nsgmls/UTF8CodingSystem.C +++ b/cde/programs/nsgmls/UTF8CodingSystem.C @@ -30,7 +30,7 @@ #include "UTF8CodingSystem.h" #include "constant.h" -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/nsgmls/UnicodeCodingSystem.C b/cde/programs/nsgmls/UnicodeCodingSystem.C index 0b3a143c..2901063e 100644 --- a/cde/programs/nsgmls/UnicodeCodingSystem.C +++ b/cde/programs/nsgmls/UnicodeCodingSystem.C @@ -39,7 +39,7 @@ extern "C" { void *memmove(void *, const void *, size_t); } #endif -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/ttsnoop/stringChooser_stubs.C.src b/cde/programs/ttsnoop/stringChooser_stubs.C.src index 894e7e98..59ded2e6 100644 --- a/cde/programs/ttsnoop/stringChooser_stubs.C.src +++ b/cde/programs/ttsnoop/stringChooser_stubs.C.src @@ -42,7 +42,7 @@ #include -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/types/Imakefile b/cde/programs/types/Imakefile index 73ddb016..98fa82dd 100644 --- a/cde/programs/types/Imakefile +++ b/cde/programs/types/Imakefile @@ -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 diff --git a/cde/programs/types/dtwm.fp.src b/cde/programs/types/dtwm.fp.src index 69ece3ef..00562ec3 100644 --- a/cde/programs/types/dtwm.fp.src +++ b/cde/programs/types/dtwm.fp.src @@ -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 -- 2.25.1