From 4ec9658299e1e2b7ca93b6ae7699003e8d378240 Mon Sep 17 00:00:00 2001 From: Ulrich Wilkens Date: Wed, 28 Aug 2013 21:16:39 +0200 Subject: [PATCH] dtinfo other files --- cde/.gitignore | 38 +- cde/admin/IntegTools/dbTools/installCDE.src | 28 +- cde/admin/IntegTools/dbTools/mkProd | 4 +- cde/admin/IntegTools/post_install/Imakefile | 1 + .../post_install/freebsd/configRun.src | 3 - .../post_install/linux/configMin.src | 6 +- .../post_install/linux/configRun.src | 21 +- .../post_install/linux/configTT.src | 21 +- .../IntegTools/post_install/openbsd/Imakefile | 68 ++++ .../post_install/openbsd/configMin.src | 257 ++++++++++++++ .../post_install/openbsd/configRun.src | 328 ++++++++++++++++++ .../post_install/openbsd/configShlibs.src | 109 ++++++ .../post_install/openbsd/configTT.src | 150 ++++++++ cde/config/cf/Imake.rules | 2 +- cde/config/cf/Motif.tmpl | 15 +- cde/config/cf/OpenBSD.cf | 29 +- cde/config/cf/X11.tmpl | 10 +- cde/config/cf/cde.rules | 2 +- cde/config/cf/lnxLib.tmpl | 2 +- cde/config/cf/site.def | 6 + cde/databases/CDE-FONTS.udb | 22 +- cde/databases/CDE-INFOLIB-LOC.src | 2 +- cde/databases/CDE-SHLIBS.src | 108 ++++-- cde/databases/Imakefile | 4 +- cde/lib/DtSearch/Imakefile | 4 + cde/lib/DtSearch/dberr.c | 6 +- cde/lib/DtSearch/raima/Imakefile | 4 + cde/lib/DtSearch/raima/dblfcns.c | 4 +- cde/lib/DtSearch/raima/dio.c | 18 +- cde/lib/DtSearch/raima/inittab.c | 2 +- cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c | 2 +- cde/lib/DtTerm/TermPrim/TermPrimParser.c | 1 + cde/programs/dtcm/server/Imakefile | 4 +- cde/programs/dtksh/MakeClean | 8 + cde/programs/dtlogin/config/Xsession.src | 11 +- cde/programs/fontaliases/Imakefile | 4 + cde/programs/fontaliases/linux/C/Imakefile | 3 + cde/programs/fontaliases/linux/C/fonts.dir | 1 - cde/programs/fontaliases/linux/Imakefile | 8 + cde/programs/fontaliases/openbsd/C/Imakefile | 3 + .../fontaliases/openbsd/C/fonts.alias | 178 ++++++++++ cde/programs/fontaliases/openbsd/Imakefile | 8 + 42 files changed, 1401 insertions(+), 104 deletions(-) create mode 100644 cde/admin/IntegTools/post_install/openbsd/Imakefile create mode 100755 cde/admin/IntegTools/post_install/openbsd/configMin.src create mode 100755 cde/admin/IntegTools/post_install/openbsd/configRun.src create mode 100755 cde/admin/IntegTools/post_install/openbsd/configShlibs.src create mode 100755 cde/admin/IntegTools/post_install/openbsd/configTT.src create mode 100644 cde/programs/fontaliases/linux/C/Imakefile delete mode 100644 cde/programs/fontaliases/linux/C/fonts.dir create mode 100644 cde/programs/fontaliases/linux/Imakefile create mode 100644 cde/programs/fontaliases/openbsd/C/Imakefile create mode 100644 cde/programs/fontaliases/openbsd/C/fonts.alias create mode 100644 cde/programs/fontaliases/openbsd/Imakefile diff --git a/cde/.gitignore b/cde/.gitignore index c266566f..ae23caeb 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -23,7 +23,19 @@ exports # admin/IntegTools/ admin/IntegTools/post_install/*.list admin/IntegTools/post_install/*.lst -admin/IntegTools/post_install/linux + +admin/IntegTools/post_install/linux/CDE-MIN.list +admin/IntegTools/post_install/linux/CDE-MIN.lst +admin/IntegTools/post_install/linux/CDE-RUN.list +admin/IntegTools/post_install/linux/CDE-RUN.lst +admin/IntegTools/post_install/linux/CDE-SHLIBS.list +admin/IntegTools/post_install/linux/CDE-SHLIBS.lst +admin/IntegTools/post_install/linux/CDE-TT.list +admin/IntegTools/post_install/linux/CDE-TT.lst +admin/IntegTools/post_install/linux/configMin +admin/IntegTools/post_install/linux/configRun +admin/IntegTools/post_install/linux/configShlibs +admin/IntegTools/post_install/linux/configTT admin/IntegTools/post_install/freebsd/CDE-MIN.list admin/IntegTools/post_install/freebsd/CDE-MIN.lst @@ -38,6 +50,19 @@ admin/IntegTools/post_install/freebsd/configRun admin/IntegTools/post_install/freebsd/configShlibs admin/IntegTools/post_install/freebsd/configTT +admin/IntegTools/post_install/openbsd/CDE-MIN.list +admin/IntegTools/post_install/openbsd/CDE-MIN.lst +admin/IntegTools/post_install/openbsd/CDE-RUN.list +admin/IntegTools/post_install/openbsd/CDE-RUN.lst +admin/IntegTools/post_install/openbsd/CDE-SHLIBS.list +admin/IntegTools/post_install/openbsd/CDE-SHLIBS.lst +admin/IntegTools/post_install/openbsd/CDE-TT.list +admin/IntegTools/post_install/openbsd/CDE-TT.lst +admin/IntegTools/post_install/openbsd/configMin +admin/IntegTools/post_install/openbsd/configRun +admin/IntegTools/post_install/openbsd/configShlibs +admin/IntegTools/post_install/openbsd/configTT + admin/IntegTools/post_install/configDemos admin/IntegTools/post_install/configFonts admin/IntegTools/post_install/configHelp @@ -329,6 +354,7 @@ doc/es_ES.ISO8859-1/help-sdl/ doc/fr_FR.ISO8859-1/help-sdl/ doc/it_IT.ISO8859-1/help-sdl/ doc/ja_JP.dt-eucJP/m-guides/ +doc/tmp/ doc/util/dbtoman/instant/instant # lib/DtHelp @@ -1117,11 +1143,21 @@ programs/dtwm/dtfplist programs/dtwm/sys.dtwmrc # programs/fontaliases +programs/fontaliases/linux/C/dtinfo.bdf +programs/fontaliases/linux/C/dtinfo.pcf +programs/fontaliases/linux/C/dtinfo.pcf.gz +programs/fontaliases/linux/C/dtinfo.pcf.Z +programs/fontaliases/linux/C/fonts.dir programs/fontaliases/freebsd/C/dtinfo.bdf programs/fontaliases/freebsd/C/dtinfo.pcf programs/fontaliases/freebsd/C/dtinfo.pcf.gz programs/fontaliases/freebsd/C/dtinfo.pcf.Z programs/fontaliases/freebsd/C/fonts.dir +programs/fontaliases/openbsd/C/dtinfo.bdf +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/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 31a05a0d..a1204c8c 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -207,10 +207,15 @@ CleanDaemons() then stopsrc -s inetd >>$LOGFILE 2>&1 fi - elif [ "$PLATFORM" = openbsd ] + elif [ "$PLATFORM" = "openbsd" ] then - true - elif [ "$PLATFORM" = freebsd ] + 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" = "freebsd" ] then ps axo pid,comm | grep $i > /tmp/tmppsout if [ -s /tmp/tmppsout ] @@ -218,6 +223,14 @@ CleanDaemons() awk '{print "kill " $1}' /tmp/tmppsout | /bin/csh -f sleep 2 fi + elif [ "$PLATFORM" = "linux" ] + then + ps axo pid,comm | grep $i > /tmp/tmppsout + if [ -s /tmp/tmppsout ] + then + awk '{print "kill " $1}' /tmp/tmppsout | /bin/sh -f + sleep 2 + fi else ps -ef | grep $i | grep -v grep >/tmp/tmppsout if [ -s /tmp/tmppsout ] @@ -247,10 +260,13 @@ RestartInetd() /usr/sbin/inetd elif [ "$PLATFORM" = "openbsd" ] then - true + /etc/rc.d/inetd start >/dev/null elif [ "$PLATFORM" = "freebsd" ] then /etc/rc.d/inetd onestart + elif [ "$PLATFORM" = "linux" ] + then + /etc/init.d/openbsd-inetd start >/dev/null 2>&1 else #ifdef hpV4 /usr/sbin/inetd @@ -553,7 +569,7 @@ XCOMM elif [ $BUILDSYSTEM = "Linux" ]; then PLATFORM="linux" - PLATFORM_SCRIPT_DIR="" + PLATFORM_SCRIPT_DIR="linux" elif [ $BUILDSYSTEM = "FreeBSD" ]; then PLATFORM="freebsd" @@ -561,7 +577,7 @@ XCOMM elif [ $BUILDSYSTEM = "OpenBSD" ]; then PLATFORM="openbsd" - PLATFORM_SCRIPT_DIR="" + PLATFORM_SCRIPT_DIR="openbsd" 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 560bc14c..0d5bee94 100755 --- a/cde/admin/IntegTools/dbTools/mkProd +++ b/cde/admin/IntegTools/dbTools/mkProd @@ -517,12 +517,12 @@ doit() # set permissions for non-links if [ "${TYPE%link}" = "$TYPE" ]; then if [ "$USER" = "root" ]; then - chmod $MODE $DEST || - echo "ERROR: \"chmod $MODE $DEST\" failed" >&2 chgrp $GROUP $DEST || echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2 chown $OWNER $DEST || echo "ERROR: \"chown $OWNER $DEST\" failed" >&2 + chmod $MODE $DEST || + echo "ERROR: \"chmod $MODE $DEST\" failed" >&2 fi fi diff --git a/cde/admin/IntegTools/post_install/Imakefile b/cde/admin/IntegTools/post_install/Imakefile index b0dcbf84..eab9a69b 100644 --- a/cde/admin/IntegTools/post_install/Imakefile +++ b/cde/admin/IntegTools/post_install/Imakefile @@ -22,6 +22,7 @@ SUBDIRS = linux #endif #ifdef OpenBSDArchitecture PLATFORM = openbsd +SUBDIRS = openbsd #endif #ifdef FreeBSDArchitecture PLATFORM = freebsd diff --git a/cde/admin/IntegTools/post_install/freebsd/configRun.src b/cde/admin/IntegTools/post_install/freebsd/configRun.src index 42d26771..4b246fd8 100755 --- a/cde/admin/IntegTools/post_install/freebsd/configRun.src +++ b/cde/admin/IntegTools/post_install/freebsd/configRun.src @@ -322,9 +322,6 @@ DEFAULT_PRINTER="DtPrint" /etc/rc.d/inetd onereload fi - HASH dtmail requires setgid - chmod 2555 $DT_TOP/bin/dtmail - HASH dtmail requires setgid chmod 2555 $DT_TOP/bin/dtmail diff --git a/cde/admin/IntegTools/post_install/linux/configMin.src b/cde/admin/IntegTools/post_install/linux/configMin.src index 764b78d8..dcbb1608 100755 --- a/cde/admin/IntegTools/post_install/linux/configMin.src +++ b/cde/admin/IntegTools/post_install/linux/configMin.src @@ -227,7 +227,7 @@ XCOMM ############################################################### FixEtcInetdDotConf - FixEtcPamDotConf + HASH FixEtcPamDotConf HASH HASH create the /var/dt/tmp directory for the dtspcd @@ -266,9 +266,9 @@ XCOMM ############################################################### ps -ef | grep inetd | grep -v grep >/tmp/tmppsout if [ -s /tmp/tmppsout ] then - awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh + awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh else - /usr/sbin/inetd -s + [ -x /usr/sbin/inetd ] && /usr/sbin/inetd fi fi diff --git a/cde/admin/IntegTools/post_install/linux/configRun.src b/cde/admin/IntegTools/post_install/linux/configRun.src index 36b59449..688c34cc 100755 --- a/cde/admin/IntegTools/post_install/linux/configRun.src +++ b/cde/admin/IntegTools/post_install/linux/configRun.src @@ -20,6 +20,15 @@ FILE=/etc/inetd.conf TMPFILE=/tmp/inetd.conf CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd +XCOMM +XCOMM check for existence of /etc/inetd.conf +XCOMM + + if [ ! -f $FILE ] # highly unlikely + then + echo "" >$FILE + fi + XCOMM XCOMM desired inetd.conf entry: XCOMM 100068/2-4 dgram rpc/udp wait root CDE_INSTALLATION_TOP/bin/rpc.cmsd rpc.cmsd @@ -31,7 +40,7 @@ XCOMM XCOMM comment out any non-cde rpc.cmsd lines XCOMM - nawk -v cmsd=$CMSD \ + awk -v cmsd=$CMSD \ '{if ($1 == "100068/2-4" && $6 != cmsd) print "#cde " $0; else @@ -44,7 +53,7 @@ XCOMM XCOMM remove any cde 2-4 cmsd XCOMM - nawk -v cmsd=$CMSD \ + awk -v cmsd=$CMSD \ '{if ($1 == "100068/2-4" && $6 == cmsd) ; else @@ -58,7 +67,7 @@ XCOMM XCOMM now run an awk script to see if there is an occurrence of 2-5 cmsd XCOMM - nawk -v cmsd=$CMSD \ + awk -v cmsd=$CMSD \ '{if ($6 == cmsd && $1 == "100068/2-5") print $0 > "/tmp/cmsd-already-there" }' $FILE >/dev/null @@ -84,7 +93,7 @@ CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd HASH first remove the CDE rpc.cmsd entry - nawk -v cmsd=$CMSD \ + awk -v cmsd=$CMSD \ '{if (($1 == "100068/2-4" || $1 == "100068/2-5") && $6 == cmsd) ; else @@ -298,7 +307,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 @@ -341,7 +350,7 @@ DEFAULT_PRINTER="DtPrint" ps -ef | grep inetd | grep -v grep >/tmp/tmppsout if [ -s /tmp/tmppsout ] then - awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh + awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh else [ -x /usr/sbin/inetd ] && /usr/sbin/inetd fi diff --git a/cde/admin/IntegTools/post_install/linux/configTT.src b/cde/admin/IntegTools/post_install/linux/configTT.src index 444d5636..1ae27974 100755 --- a/cde/admin/IntegTools/post_install/linux/configTT.src +++ b/cde/admin/IntegTools/post_install/linux/configTT.src @@ -20,13 +20,22 @@ FixInetdDotConf() { FILE=/etc/inetd.conf TMPFILE=/tmp/inetd.conf -TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserverd +TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver + +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 - nawk -v ttdb=$TTDBSERVERD \ + awk -v ttdb=$TTDBSERVERD \ '{if ($1 == "100083/1" && $6 != ttdb) print "#cde " $0; else @@ -53,9 +62,9 @@ UnfixInetdDotConf() { FILE=/etc/inetd.conf TMPFILE=/tmp/inetd.conf -TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserverd +TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver - nawk -v ttdb=$TTDBSERVERD \ + awk -v ttdb=$TTDBSERVERD \ '{if ($1 == "100083/1" && $6 == ttdb) ; else @@ -155,9 +164,9 @@ XCOMM ###################################################################### ps -ef | grep inetd | grep -v grep >/tmp/tmppsout if [ -s /tmp/tmppsout ] then - awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh + awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh else - /usr/sbin/inetd -s + [ -x /usr/sbin/inetd ] && /usr/sbin/inetd fi rm /tmp/tmppsout diff --git a/cde/admin/IntegTools/post_install/openbsd/Imakefile b/cde/admin/IntegTools/post_install/openbsd/Imakefile new file mode 100644 index 00000000..b953ea9d --- /dev/null +++ b/cde/admin/IntegTools/post_install/openbsd/Imakefile @@ -0,0 +1,68 @@ +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 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/openbsd/configMin.src b/cde/admin/IntegTools/post_install/openbsd/configMin.src new file mode 100755 index 00000000..977ac861 --- /dev/null +++ b/cde/admin/IntegTools/post_install/openbsd/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#subprocess control" >>$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 + echo "dtspc stream tcp4 nowait root $DTSPCD $DTSPCD" >>$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 /var/dt/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/openbsd/configRun.src b/cde/admin/IntegTools/post_install/openbsd/configRun.src new file mode 100755 index 00000000..71bf3121 --- /dev/null +++ b/cde/admin/IntegTools/post_install/openbsd/configRun.src @@ -0,0 +1,328 @@ +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/udp4 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 + echo "cmsd/2-5 dgram rpc/udp4 wait root $CMSD rpc.cmsd" >>$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 +} + +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 + chown -R bin * + chgrp -R bin * + mv .hidden-appmanager $APPCONFIG/appmanager + chmod 755 . + chown 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 + + elif [ "$OPERATION" = "deconfigure" ] + then + + 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/openbsd/configShlibs.src b/cde/admin/IntegTools/post_install/openbsd/configShlibs.src new file mode 100755 index 00000000..82446e5c --- /dev/null +++ b/cde/admin/IntegTools/post_install/openbsd/configShlibs.src @@ -0,0 +1,109 @@ +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 + + /sbin/ldconfig -R + + VerifyInstalledFiles + + elif [ "$OPERATION" = "configure" ] + then + + MakeTheLink + + /sbin/ldconfig -m "${CDE_TOP}/lib" + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + return $retval diff --git a/cde/admin/IntegTools/post_install/openbsd/configTT.src b/cde/admin/IntegTools/post_install/openbsd/configTT.src new file mode 100755 index 00000000..2036c655 --- /dev/null +++ b/cde/admin/IntegTools/post_install/openbsd/configTT.src @@ -0,0 +1,150 @@ +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 + echo "ttdbserver/1 stream rpc/tcp4 wait root $TTDBSERVERD $TTDBSERVERD" \ + >>$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 +} + +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 + + elif [ "$OPERATION" = "deconfigure" ] + then + + : UnfixInetdDotConf + + RemoveTTFiles + + VerifyInstalledFiles + + elif [ "$OPERATION" = "verify" ] + then + + VerifyInstalledFiles + + fi + + return $retval diff --git a/cde/config/cf/Imake.rules b/cde/config/cf/Imake.rules index 5efbed16..94398e4e 100644 --- a/cde/config/cf/Imake.rules +++ b/cde/config/cf/Imake.rules @@ -2356,7 +2356,7 @@ target:: @@\ #ifdef UseInstalled #define ImakeSubCmdHelper $(IMAKE_CMD) #else -#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) +#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_DEF_DTINFO) #endif #endif /* MakeMakeSubdirs */ diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl index 14b2e3a7..8deebe9b 100644 --- a/cde/config/cf/Motif.tmpl +++ b/cde/config/cf/Motif.tmpl @@ -582,7 +582,16 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln # else DEPLIBS = $(LOCAL_LIBRARIES) # endif - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) + DEPLIBS1 = $(DEPLIBS) + DEPLIBS2 = $(DEPLIBS) + DEPLIBS3 = $(DEPLIBS) #endif /* NeedDefaultDepLibs */ + +/* check for existence of Dtinfo Motif Documents */ +#if defined(LinuxArchitecture) + MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi) +#elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) + MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi +#else + MOTIF_DOC = -D_MOTIFDOC_ +#endif diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf index a3764739..36188409 100644 --- a/cde/config/cf/OpenBSD.cf +++ b/cde/config/cf/OpenBSD.cf @@ -149,6 +149,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe /* * Compiler Features */ +#ifndef HasGcc2ForCplusplus +#define HasGcc2ForCplusplus YES +#endif #define GccUsesGas YES #define UseGas YES #define GnuCpp YES @@ -480,6 +483,8 @@ install:: fonts.alias @@\ # define HasAgpGart YES +# define LdPostLib -L/usr/X11R6/lib -L/usr/local/lib + # define ServerExtraSysLibs -lamd64 # define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines @@ -495,6 +500,9 @@ install:: fonts.alias @@\ # define HasX86Support YES # endif +/* For DtHelp TIFF processing routines. */ +#define LSBBitOrder YES + #endif /* AMD64Architecture */ /* @@ -542,13 +550,13 @@ install:: fonts.alias @@\ # ifndef DefaultGcc2i386Opt # if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */ -# define DefaultGcc2i386Opt -O2 GccAliasingArgs +# define DefaultGcc2i386Opt -O2 -fno-strict-aliasing # endif # endif # define OptimizedCDebugFlags DefaultGcc2i386Opt # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerExtraSysLibs -li386 -# define LdPostLib /**/ +# define LdPostLib -L/usr/X11R6/lib -L/usr/local/lib # define ServerExtraDefines GccGasOption XFree86ServerDefines # ifndef XFree86ConsoleDefines # define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT @@ -571,6 +579,9 @@ install:: fonts.alias @@\ # define HasX86Support UseElfFormat # endif +/* For DtHelp TIFF processing routines. */ +#define LSBBitOrder YES + #endif /* i386Architecture */ @@ -891,10 +902,24 @@ install:: fonts.alias @@\ * which can be overridden by architecture specific sections above */ +#ifdef HasGcc2ForCplusplus +CXXDEPENDINCLUDE != echo | `CcCmd -print-prog-name=cc1plus` -v 2>&1 | \ + sed -n 's/ \(.*[cg]++.*\)/-I\1/p'; rm -f gccdump.s +#define CplusplusDependIncludes $(CXXDEPENDINCLUDE) +#endif + #ifndef StandardDefines # define StandardDefines -DCSRG_BASED #endif +#ifndef StandardIncludes +# define StandardIncludes -I/usr/X11R6/include -I/usr/local/include +#endif + +#ifndef TopMotifInclude +# define TopMotifInclude /usr/local/include +#endif + #if !defined(OptimizedCDebugFlags) # define OptimizedCDebugFlags -O2 #endif diff --git a/cde/config/cf/X11.tmpl b/cde/config/cf/X11.tmpl index b5c354d7..53b7f5be 100644 --- a/cde/config/cf/X11.tmpl +++ b/cde/config/cf/X11.tmpl @@ -741,14 +741,14 @@ XCOMM X Window System make variables; these need to be coordinated with rules XPROJECTROOT = X11ProjectRoot #endif -#if UseInstalledX11 - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTDIR = $(BINDIR)/mkfontdir -#elif defined(X11ProjectRoot) +#if defined(X11ProjectRoot) RGB = $(XPROJECTROOT)/bin/rgb FONTC = $(XPROJECTROOT)/bin/bdftopcf MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir +#elif UseInstalledX11 + RGB = $(BINDIR)/rgb + FONTC = $(BINDIR)/bdftopcf + MKFONTDIR = $(BINDIR)/mkfontdir #else RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf diff --git a/cde/config/cf/cde.rules b/cde/config/cf/cde.rules index e173e46c..105d3495 100644 --- a/cde/config/cf/cde.rules +++ b/cde/config/cf/cde.rules @@ -207,7 +207,7 @@ all:: infolib/bkcase/dtsearch/dtsearch.ocf @@\ infolib/bkcase/dtsearch/dtsearch.ocf: dep @@\ MakeDir($(DTINFOGENTMPDIR)) @@\ MakeDir(infolib) @@\ - env $(DTINFOGEN) build -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc + env $(DTINFOGEN) build -v -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc #endif /* diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl index 1e4a2416..5f48674a 100644 --- a/cde/config/cf/lnxLib.tmpl +++ b/cde/config/cf/lnxLib.tmpl @@ -39,7 +39,7 @@ XMULIB = -lXmu $(XLIB) #endif #ifndef SharedCsaReqs -# define SharedCsaReqs -lXt +# define SharedCsaReqs -lXt $(TIRPCLIB) #endif #ifndef SharedDtHelpReqs diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def index 361166b8..54a33795 100644 --- a/cde/config/cf/site.def +++ b/cde/config/cf/site.def @@ -78,6 +78,12 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $ # endif #endif +#ifndef MotifProjectRoot +# if defined(OpenBSDArchitecture) +# define MotifProjectRoot /usr/local +# endif +#endif + #ifndef ProjectRoot # define ProjectRoot /usr/dt #endif diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb index 72514c83..495973c9 100644 --- a/cde/databases/CDE-FONTS.udb +++ b/cde/databases/CDE-FONTS.udb @@ -225,6 +225,11 @@ programs/fontaliases/linux/C/fonts.dir install_target = /usr/dt/config/xfonts/C/fonts.dir } # +programs/fontaliases/linux/C/dtinfo.pcf.Z +{ linux + install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z +} +# programs/fontaliases/linux/ja_JP/fonts.alias { linux install_target = /usr/dt/config/xfonts/ja_JP/fonts.alias @@ -1072,24 +1077,19 @@ programs/fontaliases/postscript/ja/prolog.ps # # for OpenBSD # -programs/fontaliases/linux/C/fonts.alias +programs/fontaliases/openbsd/C/fonts.alias { openbsd - install_target = /usr/local/dt/config/xfonts/C/fonts.alias -} -# -programs/fontaliases/linux/C/fonts.dir -{ openbsd - install_target = /usr/local/dt/config/xfonts/C/fonts.dir + install_target = /usr/dt/config/xfonts/C/fonts.alias } # -programs/fontaliases/linux/ja_JP/fonts.alias +programs/fontaliases/openbsd/C/fonts.dir { openbsd - install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.alias + install_target = /usr/dt/config/xfonts/C/fonts.dir } # -programs/fontaliases/linux/ja_JP/fonts.dir +programs/fontaliases/openbsd/C/dtinfo.pcf.gz { openbsd - install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.dir + install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.gz } # diff --git a/cde/databases/CDE-INFOLIB-LOC.src b/cde/databases/CDE-INFOLIB-LOC.src index 1480a49b..3532f673 100644 --- a/cde/databases/CDE-INFOLIB-LOC.src +++ b/cde/databases/CDE-INFOLIB-LOC.src @@ -277,7 +277,7 @@ doc/%_LANG_%/cde.dti/CDEDOC/dtsearch/dtsearch.ocf install_target = /usr/dt/infolib/%_LANG_%/cde.dti/CDEDOC/dtsearch/dtsearch.ocf } -#if defined(_ENGLISH_) || defined(_JAPANESE_) +#if defined(_MOTIFDOC_) && (defined(_ENGLISH_) || defined(_JAPANESE_)) XCOMM XCOMM >>----------------------------- XCOMM diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src index c756ca6e..6279c71a 100644 --- a/cde/databases/CDE-SHLIBS.src +++ b/cde/databases/CDE-SHLIBS.src @@ -560,8 +560,6 @@ XCOMM install_target = /usr/dt/lib/libDtSearch.so type = sym_link } - -#if 0 /* JET - not for linux (yet) */ XCOMM lib/DtMmdb/libDtMmdb.so.2.1 { linux @@ -580,7 +578,6 @@ XCOMM install_target = /usr/dt/lib/libDtMmdb.so type = sym_link } -#endif XCOMM @@ -1231,70 +1228,127 @@ XCOMM >>----------------------------- XCOMM openbsd libraries XCOMM <<----------------------------- XCOMM - -XCOMM -lib/DtHelp/libDtHelp.so.0.0 +XCOMM +lib/DtHelp/libDtHelp.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtHelp.so.0.0 + install_target = /usr/dt/lib/libDtHelp.so.2.1 mode = 0755 } XCOMM -lib/DtPrint/libDtPrint.so.0.0 +./libDtHelp.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtPrint.so.0.0 + install_target = /usr/dt/lib/libDtHelp.so + type = sym_link +} +XCOMM +lib/DtPrint/libDtPrint.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtPrint.so.2.1 mode = 0755 } XCOMM -lib/DtMrm/libDtMrm.so.0.0 +./libDtPrint.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtPrint.so + type = sym_link +} +XCOMM +lib/DtMrm/libDtMrm.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtMrm.so.0.0 + install_target = /usr/dt/lib/libDtMrm.so.2.1 mode = 0755 } +XCOMM +./libDtMrm.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtMrm.so + type = sym_link +} XCOMM -lib/DtSvc/libDtSvc.so.0.0 +lib/DtSvc/libDtSvc.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtSvc.so.0.0 + install_target = /usr/dt/lib/libDtSvc.so.2.1 mode = 0755 } +XCOMM +./libDtSvc.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtSvc.so + type = sym_link +} XCOMM -lib/DtWidget/libDtWidget.so.0.0 +lib/DtWidget/libDtWidget.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtWidget.so.0.0 + install_target = /usr/dt/lib/libDtWidget.so.2.1 mode = 0755 } +XCOMM +./libDtWidget.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtWidget.so + type = sym_link +} XCOMM -lib/DtTerm/libDtTerm.so.0.0 +lib/DtTerm/libDtTerm.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtTerm.so.0.0 + install_target = /usr/dt/lib/libDtTerm.so.2.1 mode = 0755 } +XCOMM +./libDtTerm.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtTerm.so + type = sym_link +} XCOMM -lib/tt/lib/libtt.so.0.0 +lib/tt/lib/libtt.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libtt.so.0.0 + install_target = /usr/dt/lib/libtt.so.2.1 mode = 0755 } XCOMM -lib/csa/libcsa.so.0.0 +./libtt.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libtt.so + type = sym_link +} +XCOMM +lib/csa/libcsa.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libcsa.so.0.0 + install_target = /usr/dt/lib/libcsa.so.2.1 mode = 0755 } +XCOMM +./libcsa.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libcsa.so + type = sym_link +} XCOMM -lib/DtSearch/libDtSearch.so.0.0 +lib/DtSearch/libDtSearch.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtSearch.so.0.0 + install_target = /usr/dt/lib/libDtSearch.so.2.1 mode = 0755 } -#if 0 /* JET - not for openbsd (yet) */ XCOMM -lib/DtMmdb/libDtMmdb.so.0.0 +./libDtSearch.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtSearch.so + type = sym_link +} +XCOMM +lib/DtMmdb/libDtMmdb.so.2.1 { openbsd - install_target = /usr/local/dt/lib/libDtMmdb.so.0.0 + install_target = /usr/dt/lib/libDtMmdb.so.2.1 mode = 0755 } +XCOMM +./libDtMmdb.so.2.1 +{ openbsd + install_target = /usr/dt/lib/libDtMmdb.so + type = sym_link +} XCOMM -#endif XCOMM XCOMM diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile index 37864401..8307b0fc 100644 --- a/cde/databases/Imakefile +++ b/cde/databases/Imakefile @@ -196,7 +196,7 @@ LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_ENGLISH_ CppSourceFile(CDE-LOC-C.tmp,CDE-LOC.src,$(LOC_CPP_LIST),) CppSourceFile(CDE-HELP-LOC-C.tmp,CDE-HELP-LOC.src,$(LOC_CPP_LIST),) CppSourceFile(CDE-MSG-LOC-C.tmp,CDE-MSG-LOC.src,$(LOC_CPP_LIST),) -CppSourceFile(CDE-INFOLIB-LOC-C.tmp,CDE-INFOLIB-LOC.src,$(LOC_CPP_LIST),) +CppSourceFile(CDE-INFOLIB-LOC-C.tmp,CDE-INFOLIB-LOC.src,$(LOC_CPP_LIST) $(MOTIF_DOC),) CreateLocalizedFilesets(C,C,C,CDE-RUN,CDE-ENG-A-HELP,CDE-ENG-A-MSG,C,C,CDE-LOC-C.tmp,CDE-HELP-LOC-C.tmp,CDE-MSG-LOC-C.tmp,CDE-INFOLIB-LOC-C.tmp) /* @@ -246,7 +246,7 @@ JP_LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_JAPANESE_ CppSourceFile(CDE-LOC-JP.tmp,CDE-LOC.src,$(JP_LOC_CPP_LIST),) CppSourceFile(CDE-HELP-LOC-JP.tmp,CDE-HELP-LOC.src,$(JP_LOC_CPP_LIST),) CppSourceFile(CDE-MSG-LOC-JP.tmp,CDE-MSG-LOC.src,$(JP_LOC_CPP_LIST),) -CppSourceFile(CDE-INFOLIB-LOC-JP.tmp,CDE-INFOLIB-LOC.src,$(JP_LOC_CPP_LIST),) +CppSourceFile(CDE-INFOLIB-LOC-JP.tmp,CDE-INFOLIB-LOC.src,$(JP_LOC_CPP_LIST) $(MOTIF_DOC),) CreateLocalizedFilesets(JP,ja_JP.dt-eucJP,Japanese EUC,CDE-LANGS,CDE-JPN-E-HELP,CDE-JPN-E-MSG,ja_JP.dt-eucJP,ja_JP.dt-eucJP,CDE-LOC-JP.tmp,CDE-HELP-LOC-JP.tmp,CDE-MSG-LOC-JP.tmp,CDE-INFOLIB-LOC-JP.tmp) $(DBS):: $(UDBS) diff --git a/cde/lib/DtSearch/Imakefile b/cde/lib/DtSearch/Imakefile index 5dc3f355..91b66cce 100644 --- a/cde/lib/DtSearch/Imakefile +++ b/cde/lib/DtSearch/Imakefile @@ -13,6 +13,10 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE EXTRA_DEFINES = -DBYTE_SWAP #endif +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) +EXTRA_DEFINES = -DBYTE_SWAP +#endif + MakeSubdirs($(SUBDIRS)) ForceSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/cde/lib/DtSearch/dberr.c b/cde/lib/DtSearch/dberr.c index 4a4fdcb9..39621b91 100644 --- a/cde/lib/DtSearch/dberr.c +++ b/cde/lib/DtSearch/dberr.c @@ -79,8 +79,10 @@ static int vista_syserrno = 0; static char vista_errmsg[1024]; void (*dberr_exit) (int) = exit; -extern nl_catd dtsearch_catd; /* non AusText user should #define to -1 */ -extern FILE *aa_stderr; /* non AusText user should #define to stderr */ +/* non AusText user should #define to -1 */ +#define dtsearch_catd -1 +/* non AusText user should #define to stderr */ +#define aa_stderr stderr /****************************************/ /* */ diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile index 857a8969..f501ee8b 100644 --- a/cde/lib/DtSearch/raima/Imakefile +++ b/cde/lib/DtSearch/raima/Imakefile @@ -23,6 +23,10 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE EXTRA_DEFINES = -D_XOPEN_SOURCE #endif +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) +EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700 +#endif + #define DoNormalLib NormalLibDtSearch #define DoSharedLib SharedLibDtSearch #define DoDebugLib DebugLibDtSearch diff --git a/cde/lib/DtSearch/raima/dblfcns.c b/cde/lib/DtSearch/raima/dblfcns.c index d3ecda8e..c9f03c6b 100644 --- a/cde/lib/DtSearch/raima/dblfcns.c +++ b/cde/lib/DtSearch/raima/dblfcns.c @@ -949,10 +949,10 @@ TASK_DECL #ifndef NO_TRANS if ( use_ovfl ) o_free(); #endif - termfree(); +/* termfree(); key_close(); sk_free(); - dio_free(); + dio_free(); */ #ifndef SINGLE_USER if ( db_lockmgr ) { termses(); diff --git a/cde/lib/DtSearch/raima/dio.c b/cde/lib/DtSearch/raima/dio.c index 9404a4bc..8f349dca 100644 --- a/cde/lib/DtSearch/raima/dio.c +++ b/cde/lib/DtSearch/raima/dio.c @@ -1056,7 +1056,7 @@ INT *rid; page = (sno - 1)/spp + 1; offset = PGHDRSIZE + page*file_ptr->ft_pgsize + (sno - 1 - (page - 1)*spp)*file_ptr->ft_slsize; - DB_LSEEK(file_ptr->ft_desc, offset, 0); + DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0); if ( DB_READ(file_ptr->ft_desc, (char FAR *)rid, sizeof(INT)) != sizeof(INT) ) { dberr(S_BADREAD); @@ -1118,7 +1118,7 @@ INT rid; offset += page*file_ptr->ft_pgsize; /* read rid from disk, and set/clear rlb accordingly */ - DB_LSEEK(file_ptr->ft_desc, offset, 0); + DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0); if ( DB_READ(file_ptr->ft_desc, (char FAR *)&trid, sizeof(INT)) != sizeof(INT) ) { dberr(S_BADREAD); @@ -1128,7 +1128,7 @@ INT rid; /* write original rid out with modified rlb */ trid = htons (rid); /* make a copy in trid for byte swap */ - DB_LSEEK(file_ptr->ft_desc, offset, 0); /* reseek */ + DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0); /* reseek */ if ( DB_WRITE(file_ptr->ft_desc, (char FAR *)&trid, sizeof(INT)) != sizeof(INT) ) dberr(S_BADWRITE); @@ -1507,7 +1507,7 @@ LOOKUP_ENTRY FAR *lu_ptr; /* corresponding lookup table entry */ if ( dio_open(fno) == S_OKAY ) { swab_page (pg_ptr->buff, &file_table[fno], HTON); desc = file_table[fno].ft_desc; - DB_LSEEK( desc, addr, 0 ); + DB_LSEEK( desc, (off_t)addr, 0 ); if (DB_WRITE( desc, pg_ptr->buff, pgsize ) != pgsize) dberr(S_BADWRITE); } MEM_UNLOCK(&pg_ptr->Buff); @@ -1565,14 +1565,14 @@ BOOLEAN db_cache; /* TRUE if pg_ptr in db cache */ #endif if ( dio_open(fno) == S_OKAY ) { desc = file_ptr->ft_desc; - DB_LSEEK(desc, addr, 0); + DB_LSEEK(desc, (off_t)addr, 0); MEM_LOCK(&pg_ptr->Buff); if ((r = DB_READ( desc, pg_ptr->buff, pgsize )) < pgsize) { byteset(&pg_ptr->buff[r], '\0', pgsize - r); - DB_LSEEK(desc, addr, 0); + DB_LSEEK(desc, (off_t)addr, 0); if (DB_WRITE( desc, pg_ptr->buff, pgsize ) != pgsize) { /* clean up and return out of space */ - DB_LSEEK(desc, addr, 0); + DB_LSEEK(desc, (off_t)addr, 0); DB_WRITE(desc, "", 0); pgzero_ptr = &pgzero[fno]; pgzero_ptr->pz_next--; @@ -1713,7 +1713,7 @@ static int dio_pzflush() memcpy (cptr, &align_LONG, sizeof(LONG)); } desc = file_ptr->ft_desc; - DB_LSEEK(desc, 0L, 0); + DB_LSEEK(desc, (off_t)0L, 0); if (DB_WRITE(desc, (char FAR *)pgzero_ptr, PGZEROSZ) != PGZEROSZ) return( dberr(S_BADWRITE) ); pgzero_ptr->pz_modified = FALSE; @@ -1761,7 +1761,7 @@ FILE_NO fno; /* file number */ } /* seek to and read page zero */ - DB_LSEEK(file_ptr->ft_desc, 0L, 0); + DB_LSEEK(file_ptr->ft_desc, (off_t)0L, 0); if ( DB_READ(file_ptr->ft_desc, (char FAR *)pgzero_ptr, PGZEROSZ) != PGZEROSZ ) { return( dberr(S_BADREAD) ); diff --git a/cde/lib/DtSearch/raima/inittab.c b/cde/lib/DtSearch/raima/inittab.c index 484013b0..0180a10e 100644 --- a/cde/lib/DtSearch/raima/inittab.c +++ b/cde/lib/DtSearch/raima/inittab.c @@ -275,7 +275,7 @@ goodver: * so opening .dbd file read-only is still ok. */ dbf = open_b (dbfile, O_RDONLY); - DB_LSEEK(dbf, DBD_COMPAT_LEN + 8L*sizeof(INT), 0); + DB_LSEEK(dbf, (off_t)(DBD_COMPAT_LEN + 8L*sizeof(INT)), 0); /*----------------- FILE TABLE -------------------*/ DB_READ(dbf, (char FAR *)&file_table[ORIGIN(ft_offset)], diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c index 1ffd419a..2fc19846 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c @@ -49,9 +49,9 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c /main/4 1996/11/21 19 #define XOS_USE_XT_LOCKING #include #include "TermPrim.h" +#include "TermHeader.h" #include "TermPrimDebug.h" #include "TermPrimUtil.h" -#include "TermHeader.h" typedef struct _ptyInfo { char *ptyName; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c b/cde/lib/DtTerm/TermPrim/TermPrimParser.c index f2114379..5f4738dc 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c @@ -37,6 +37,7 @@ static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 1999/10/15 12:23:41 mgree */ #include +#include "TermHeader.h" #include "TermPrimDebug.h" #include "TermPrimP.h" #include "TermPrimParserP.h" diff --git a/cde/programs/dtcm/server/Imakefile b/cde/programs/dtcm/server/Imakefile index 9c8f536c..81aafcc3 100644 --- a/cde/programs/dtcm/server/Imakefile +++ b/cde/programs/dtcm/server/Imakefile @@ -92,7 +92,7 @@ NormalProgramTarget($(PROGRAM),$(OBJS),,$(LOCAL_LIBRARIES),) parser.o: parser.c clean:: - $(RM) \ - parser.h parser.c + $(RM) parser.c + $(_NULLCMD_) > parser.h DependTarget() diff --git a/cde/programs/dtksh/MakeClean b/cde/programs/dtksh/MakeClean index ada74984..e41abd2c 100755 --- a/cde/programs/dtksh/MakeClean +++ b/cde/programs/dtksh/MakeClean @@ -70,6 +70,14 @@ rm -f ksh93/ship/shipslog/!t_gryphon_gsf echo "rm ksh93/src/cmd/ksh93/FEATURE/*" rm -f ksh93/src/cmd/ksh93/FEATURE/* +echo "cp /dev/null ksh93/src/cmd/ksh93/FEATURE/options" +cp /dev/null ksh93/src/cmd/ksh93/FEATURE/options +echo "cp /dev/null ksh93/src/cmd/ksh93/FEATURE/setjmp" +cp /dev/null ksh93/src/cmd/ksh93/FEATURE/setjmp +echo "cp /dev/null ksh93/src/cmd/ksh93/FEATURE/sigfeatures" +cp /dev/null ksh93/src/cmd/ksh93/FEATURE/sigfeatures +echo "cp /dev/null ksh93/src/cmd/ksh93/FEATURE/dynamic" +cp /dev/null ksh93/src/cmd/ksh93/FEATURE/dynamic echo "rm ksh93/src/cmd/pax/FEATURE/*" rm -f ksh93/src/cmd/pax/FEATURE/* diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index afee698b..423c2d70 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -76,7 +76,7 @@ XCOMM ########################################################################## # define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_XDMSYS "/etc/X11/Xsession" # undef cpp_HELLO -# define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &" +# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &" #endif #ifdef __FreeBSD__ @@ -84,7 +84,7 @@ XCOMM ########################################################################## # define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_XDMSYS "/usr/local/lib/X11/xdm/Xsession" # undef cpp_HELLO -# define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &" +# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &" #endif #ifdef __OpenBSD__ @@ -92,7 +92,7 @@ XCOMM ########################################################################## # define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_XDMSYS "/etc/X11/xdm/Xsession" # undef cpp_HELLO -# define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &" +# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &" #endif @@ -281,6 +281,7 @@ fi HASH XDIR=XPROJECTROOT/bin DT_BINPATH=CDE_INSTALLATION_TOP/bin + DT_INSTALL=CDE_INSTALLATION_TOP DT_INSTALL_CONFIG=CDE_INSTALLATION_TOP/config DT_CONFIG=CDE_CONFIGURATION_TOP/config DT_CONFIG_PATH="$DT_INSTALL_CONFIG $DT_CONFIG" @@ -602,13 +603,13 @@ StartFirst() sh | bash) $SHELL -c "$source_profile; \ unset DT; \ $dtdbcache; \ - PATH=CDE_INSTALLATION_TOP/bin:\$PATH $tooltalk; \ + PATH=$DT_BINPATH:\$PATH $tooltalk; \ $startup > $dtstart_sessionlogfile 2>&1" ;; ksh | ksh93 | dtksh) $SHELL -c "$source_profile; \ unset DT; \ $dtdbcache; \ - PATH=CDE_INSTALLATION_TOP/bin:\$PATH $tooltalk;\ + PATH=$DT_BINPATH:\$PATH $tooltalk;\ $startup >| $dtstart_sessionlogfile 2>&1" ;; csh | tcsh) $SHELL -c "unsetenv _ PWD; \ diff --git a/cde/programs/fontaliases/Imakefile b/cde/programs/fontaliases/Imakefile index 68fd3ce6..0efbc217 100644 --- a/cde/programs/fontaliases/Imakefile +++ b/cde/programs/fontaliases/Imakefile @@ -10,8 +10,12 @@ SUBDIRS = hp SUBDIRS = ibm #elif defined(SunArchitecture) SUBDIRS = sun +#elif defined(LinuxArchitecture) +SUBDIRS = linux #elif defined(FreeBSDArchitecture) SUBDIRS = freebsd +#elif defined(OpenBSDArchitecture) +SUBDIRS = openbsd #elif defined(USLArchitecture) SUBDIRS = novell #elif defined(UXPArchitecture) diff --git a/cde/programs/fontaliases/linux/C/Imakefile b/cde/programs/fontaliases/linux/C/Imakefile new file mode 100644 index 00000000..45f68666 --- /dev/null +++ b/cde/programs/fontaliases/linux/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/linux/C/fonts.dir b/cde/programs/fontaliases/linux/C/fonts.dir deleted file mode 100644 index 573541ac..00000000 --- a/cde/programs/fontaliases/linux/C/fonts.dir +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/cde/programs/fontaliases/linux/Imakefile b/cde/programs/fontaliases/linux/Imakefile new file mode 100644 index 00000000..6532167c --- /dev/null +++ b/cde/programs/fontaliases/linux/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/fontaliases/openbsd/C/Imakefile b/cde/programs/fontaliases/openbsd/C/Imakefile new file mode 100644 index 00000000..45f68666 --- /dev/null +++ b/cde/programs/fontaliases/openbsd/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/openbsd/C/fonts.alias b/cde/programs/fontaliases/openbsd/C/fonts.alias new file mode 100644 index 00000000..bbc9369b --- /dev/null +++ b/cde/programs/fontaliases/openbsd/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/openbsd/Imakefile b/cde/programs/fontaliases/openbsd/Imakefile new file mode 100644 index 00000000..6532167c --- /dev/null +++ b/cde/programs/fontaliases/openbsd/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)) -- 2.25.1