Remove UXPDS support

cde/.gitignore

@@ -108,7 +108,6 @@ install.dt.hp
 install.dt.ibm
 install.dt.sun
 install.dt.usl
-install.dt.uxp
 dinstall.dt
 dinstallCDE
 installCDE
@@ -240,7 +239,6 @@ programs/dtappbuilder/src/ab/Makefile.hpux
 programs/dtappbuilder/src/ab/Makefile.osf1
 programs/dtappbuilder/src/ab/Makefile.sunos
 programs/dtappbuilder/src/ab/Makefile.unixware
-programs/dtappbuilder/src/ab/Makefile.uxp
 programs/dtappbuilder/src/ab/Makefile.linux
 programs/dtappbuilder/src/ab/Makefile.freebsd
 programs/dtappbuilder/src/ab/Makefile.netbsd
@@ -2338,7 +2336,6 @@ programs/ttsnoop/Makefile.hpux
 programs/ttsnoop/Makefile.osf1
 programs/ttsnoop/Makefile.sunos
 programs/ttsnoop/Makefile.unixware
-programs/ttsnoop/Makefile.uxp
 programs/ttsnoop/Makefile.linux
 programs/ttsnoop/Makefile.freebsd
 programs/ttsnoop/Makefile.netbsd

cde/admin/IntegTools/Imakefile

@@ -17,11 +17,6 @@ LOCAL_CPP_DEFINES=-Usun
 OVERRIDE=install.dt.sun
 #endif
 
-#ifdef UXPArchitecture
-LOCAL_CPP_DEFINES=-Uuxp
-OVERRIDE=install.dt.uxp
-#endif
-
 #ifdef USLArchitecture
 LOCAL_CPP_DEFINES=-Uusl
 OVERRIDE=install.dt.usl

cde/admin/IntegTools/config/config.uxp

@@ -1,207 +0,0 @@
-#########################################################################
-# Configuration Instructions for the Fujitsu UXP/DS Environments        #
-#########################################################################
-
-The following instructions assume you have already installed the Common Desktop
-Environment according to the Installation Instructions on the CD jacket.  
-
-There are two ways to start the desktop:
-
-* You can manually start the desktop Login Manager. This method can be used to
-avoid rebooting the system.  See the section  To Start and Stop the Desktop
-Manually .
-
-* You can configure the system to start the desktop automatically  upon reboot.
- See the section To Enable and Disable Desktop Auto-Start..
-
-
-
-Before You Start the Desktop
-============================
-******************************************************************************
-If you have a previous Common Desktop Environment (CDE) version on the system:
-******************************************************************************
-
-*Advise all CDE users on the system to remove or rename their $HOME/.dt directory
-and their $HOME/.dtprofile.  The new files are not compatible with the old
-ones.  If users have customized the $HOME/.dt/dtwmrc file and want to keep
-it, they will need to cut and paste the appropriate pieces into the new dtwmrc
-file provided.
-
-*Become the root user on the system.  Make sure all other users on the system
-are logged out of CDE.  Kill the Login Manager if running.
-
-   kill -15 `cat /etc/opt/dt/Xpid`
-
-Killing the Login Manager process works no matter how the process was started.
-An alternate method is to stop the system resource control for the desktop.
-This method should only be used if CDE was configured on the system by
-replacing the /etc/rc2.d/S69xdm script.  You can tell if CDE was configured
-this way by checking the existence of /etc/S69xdm.old.  If this file
-exists, then do the following:
-
-	 mv /etc/S69xdm.old /etc/rc2.d/S69xdm
-
-
-
-Special Configurations
-----------------------
-
-If your system has one of these special configurations, you may need to
-edit certain Login Manager files before starting the desktop. See the
-Advanced User's and System Administrator's Guide:
-
-        * If the system console is not a UnixWare supported bitmap device.
-
-        * If the system is an X terminal or a host for X terminals.
-
-        * If the system has more than one display.
-
-
-To Start and Stop the Desktop Manually
-======================================
-
-There are two ways to start the desktop manually:
-
-
-    * You can manually start the CDE Login Manager, which will 
-      display the desktop Login screen.  To use this method, you 
-      must have permission to log in as root.
-
-      This method is preferable, since Login Manager sets certain 
-      environment variables that are needed during desktop sessions.
-
-    * You can log in using conventional methods, and then manually 
-      run the CDE Session Manager, which starts a desktop session.
-      See the section Manually Starting and Stopping the Session 
-      Manager.
-
-Manually Starting and Stopping Login Manager
---------------------------------------------
-
-When you use this method, you log in using the CDE Login screen.
-When you log in, a desktop session starts.
-
-To manually start Login Manager:
-
-1. Log in as root.
-
-2. Type:
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/dt/lib:/usr/X/lib export LD_LIBRARY_PATH
-
-3. With no window system running, from the command line enter:
-
-	/usr/dt/bin/dtlogin -daemon
-
-   The CDE Graphical Login screen will appear.
-
-4.  For security reasons, you need to exit the shell that invoked dtlogin.
-    Type <Alt><SysRq> p
-       (i.e. Press the <Alt> and <SysRq> keys at the same time, 
-	     release both and then hit 'p'. )
-
-    You should return to an ASCII terminal session.
-
-5. Type:
-       <return>
-       exit
-
-6. You will be asked if you want your virtual terminals closed at once.
-   Type: n
-
-   The CDE Graphical Login screen will reappear.
-
-
-To manually stop Login Manager:
-
- 1. Log out of the CDE Desktop.
-
- 2. From the options menu of the CDE Graphical Login choose Command Line.
-
-    This will give you the ASCII login screen.
-
- 3. Log in as root.
-
- 4. Type:
-      kill -15 `cat /usr/dt/config/Xpid`
-
-    
-
-Manually Starting and Stopping Session Manager
-----------------------------------------------
-
-If you use this method, you are responsible for setting certain 
-environment variables to values required by the desktop if suitable 
-values are not already set in your environment.  Refer to the Getting
-Started Guide for setting the necessary environment variables.
-
-
-1. Log in.  (You do not need to log in as root).
-
-2. With no window system running, from the command line enter:
-
-	LD_LIBRARY_PATH=/usr/dt/lib:/usr/X/lib:$LD_LIBRARY_PATH
-	export LD_LIBRARY_PATH
-
-	PATH=$PATH:/usr/X/bin
-	export PATH
-	
-	/usr/X/bin/olinit /usr/dt/bin/Xsession 
-
-The Session Manager stops when you log out.
-When auto-start is enabled, the CDE Login Manager runs 
-automatically each time the system is booted.  You then log 
-in using the CDE Login Screen.
-
-
-To Enable and Disable Desktop Auto-Start
-========================================
-UnixWare can be configured to start the CDE Desktop automatically when the system
-is booted.  This method starts CDE as the Session Manager for all users on
-the system.
-
-
-To Enable Desktop Auto-Start
-----------------------------
-
-1. Log in as root.
-
-2.  From the command line, enter:
-
-      NOTE: Step 'a' is necessay only if the /etc/rc2.d/S69xdm
-	    script has been modified after UnixWare was
-	    installed on your system and if the graphical login
-	    is enabled. A copy of the S69xdm script that 
-	    came with the UnixWare installation is located 
-	    in /usr/X/adm.
-	    
-      a. cp /etc/rc2.d/S69xdm /etc/S69xdm.preCDE
-      b. cp /usr/dt/config/S69xdm /etc/rc2.d/S69xdm
-
-A CDE Login screen will appear the next time the system is booted.
-
-
-To Disable Desktop Auto-Start
------------------------------
-
-
-	1. Log in as root.
-	
-	2. From a command line, enter:
-	
-		rm /etc/rc2.d/S69xdm
-	
-	If you would like the original UnixWare Desktop Manager Login
-	to appear upon reboot:
-		
-		/usr/X/bin/enable_glogin
-
-		   - OR -
-
-	If a copy of S69xdm was saved as outlined in the section
-	"To Enable Desktop Auto-Start":
-
-		mv /etc/S69xdm.preCDE /etc/rc2.d/S69xdm
-
-	The UnixWare Desktop Manager Login will appear 
-	the next time the system is rebooted.

cde/admin/IntegTools/dbTools/Imakefile

@@ -4,7 +4,7 @@ LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
                     -DKORNSHELL=$(KORNSHELL) \
-                    -Usun -Uusl -Uuxp -Uaix -Udec -UAIX -Uibm -Uhp
+                    -Usun -Uusl -Uaix -Udec -UAIX -Uibm -Uhp
 
 AllTarget(installCDE dinstallCDE)
 

cde/admin/IntegTools/dbTools/UDB.format

@@ -174,7 +174,7 @@ Pseudo-BNF:
 
 	release_def = "{" release_id ":" "defaults" record_defs "}"
 
-	release_id = "hp-ux" | "aix" | "sun" | "usl" | "uxp" | "default"
+	release_id = "hp-ux" | "aix" | "sun" | "usl" | "default"
 
 	record_defs = keyword_def "=" special_token |
 		      keyword_def "=" keyword_value

cde/admin/IntegTools/dbTools/dinstallCDE.src

@@ -158,10 +158,6 @@ XCOMM
   then
     PLATFORM=usl
     PLATFORM_SCRIPT_DIR=usl
-  elif [ $BUILDSYSTEM = "UNIX_System_V" ];
-  then
-    PLATFORM=uxp
-    PLATFORM_SCRIPT_DIR=uxp
   elif [ $BUILDSYSTEM = "OSF1" ];
   then
     PLATFORM=dec
@@ -174,7 +170,7 @@ XCOMM
   if [ "$PLATFORM" = "aix" ];
   then
     USER=`/bin/whoami`
-  elif [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
+  elif [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" ];
   then
     USER=`/usr/ucb/whoami`
   else

cde/admin/IntegTools/dbTools/installCDE.src

@@ -62,7 +62,7 @@ MakeTarball()
     HASH
     Log "Creating tarball..."
 
-    if [ $PLATFORM = "usl" -o "$PLATFORM" = "uxp" ]
+    if [ $PLATFORM = "usl" ]
     then
       ulimit -f unlimited
     fi
@@ -257,7 +257,7 @@ RestartInetd()
 
   OLDPWD=`pwd`
   cd /
-  if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
+  if [ "$PLATFORM" = "usl" ]
   then
     /usr/sbin/inetd -s
   elif [ "$PLATFORM" = "sun" ]
@@ -573,10 +573,6 @@ XCOMM
   then
     PLATFORM=usl
     PLATFORM_SCRIPT_DIR=usl
-  elif [ $BUILDSYSTEM = "UNIX_System_V" ];
-  then
-    PLATFORM=uxp
-    PLATFORM_SCRIPT_DIR=uxp
   elif [ $BUILDSYSTEM = "OSF1" ];
   then
     PLATFORM=dec
@@ -605,7 +601,7 @@ XCOMM
   if [ "$PLATFORM" = "aix" ];
   then
     USER=`/bin/whoami`
-  elif [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
+  elif [ "$PLATFORM" = "usl" ];
   then
     USER=`/usr/ucb/whoami`
   else
@@ -619,7 +615,7 @@ XCOMM
     echo ""
   fi
 
-  if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
+  if [ "$PLATFORM" = "usl" ]
   then
     umask 000
   fi

cde/admin/IntegTools/dbTools/mkProd

@@ -95,9 +95,6 @@ then
 elif [ $BUILDSYSTEM = "UNIX_SV" ];
 then
 	PLATFORM=usl
-elif [ $BUILDSYSTEM = "UNIX_System_V" ];
-then
-	PLATFORM=uxp
 elif [ $BUILDSYSTEM = "OSF1" ];
 then
 	PLATFORM=dec
@@ -108,7 +105,7 @@ fi
 if [ $PLATFORM = "aix" ];
 then
         USER=`/bin/whoami`
-elif [ $PLATFORM = "usl" -o $PLATFORM = "uxp" ];
+elif [ $PLATFORM = "usl" ];
 then
         USER=`/usr/ucb/whoami`
 else
@@ -638,13 +635,7 @@ TOOL_DIR=$SRCTREE/admin/IntegTools/dbTools
 # Avoid making duplicate entries
 # make sure links are referred to AFTER the files to which they point.
 #
-if [ $PLATFORM = "uxp" ]; then
-  $TOOL_DIR/uncomment $files | sort | uniq | $TOOL_DIR/linksLast - > /tmp/awk.in
-  cat /tmp/awk.in | awkit > /tmp/awk.out
-  cat /tmp/awk.out | doit
-else
 $TOOL_DIR/uncomment $files | sort | uniq | $TOOL_DIR/linksLast - | awkit | doit
-fi
 
 echo ""
 echo "#-------------- $(date) --------------"

cde/admin/IntegTools/dinstall.dt.src

@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+wXCOMM!/bin/ksh
 XCOMM $XConsortium: dinstall.dt.src /main/6 1996/04/23 11:18:22 drk $
 
 XCOMM ==========================================================================
@@ -6,7 +6,7 @@ XCOMM ==========================================================================
 XCOMM deinstall.dt
 XCOMM
 XCOMM   Script to deinstall the April 1994 Snapshot Desktop on
-XCOMM   HP, IBM, Sun, Fujitsu,  or Novell Unix systems from a CDROM
+XCOMM   HP, IBM, Sun or Novell Unix systems from a CDROM
 XCOMM
 XCOMM ==========================================================================
 XCOMM ==========================================================================
@@ -143,7 +143,6 @@ XCOMM Return
 XCOMM   "hpux"
 XCOMM   "aix"
 XCOMM   "sun"
-XCOMM   "uxp"
 XCOMM   "usl"
 XCOMM   "dec"
 XCOMM ==========================================================================
@@ -156,7 +155,6 @@ GetPlatform()
         *HP-UX*)    getPlatform=hp;;
         *AIX*)      getPlatform=ibm;;
         *SunOS*)    getPlatform=sun;;
-        *UNIX_System_V*)  getPlatform=uxp;;
         *UNIX_SV*)  getPlatform=usl;;
 	*OSF1*)     getPlatform=dec;;
     esac
@@ -176,7 +174,6 @@ XCOMM Return
 XCOMM   "hpux"
 XCOMM   "aix"
 XCOMM   "sun"
-XCOMM   "uxp"
 XCOMM   "usl"
 XCOMM   "dec"
 XCOMM ==========================================================================
@@ -185,7 +182,7 @@ ValidOS()
 {
     platform=$(GetPlatform)
     case "$platform"  in
-         hp|ibm|sun|uxp|usl|dec)
+         hp|ibm|sun|usl|dec)
                          DtiReturn $platform
                          ;;
                       *) Exit $INVALID_OS_MSG 1
@@ -678,8 +675,6 @@ XCOMM set up the path for whoami command
           ;;
       sun) WHOAMI_PATH=/usr/ucb
           ;;
-      uxp) WHOAMI_PATH=/usr/ucb
-          ;;
       usl) WHOAMI_PATH=/usr/ucb
           ;;
       dec) WHOAMI_PATH=/usr/bin

cde/admin/IntegTools/install.dt.src

@@ -6,7 +6,7 @@ XCOMM ==========================================================================
 XCOMM install.dt
 XCOMM
 XCOMM   Script to install the April 1994 Snapshot Desktop on
-XCOMM   HP, IBM, Sun, UXP, USL, or DEC Unix systems from a CDROM
+XCOMM   HP, IBM, Sun, USL, or DEC Unix systems from a CDROM
 XCOMM
 XCOMM ==========================================================================
 XCOMM ==========================================================================
@@ -167,7 +167,6 @@ XCOMM Return
 XCOMM   "hpux"
 XCOMM   "aix"
 XCOMM   "sun"
-XCOMM   "uxp"
 XCOMM   "usl"
 XCOMM   "dec"
 XCOMM ==========================================================================
@@ -180,7 +179,6 @@ GetPlatform()
         *HP-UX*) getPlatform=hp;;
         *AIX*) getPlatform=ibm;;
         *SunOS*) getPlatform=sun;;
-        *UNIX_System_V*) getPlatform=uxp;;
         *UNIX_SV*) getPlatform=usl;;
 	*OSF1*) getPlatform=dec;;
       esac
@@ -408,7 +406,7 @@ Main()
       HASH 3) verify platform is supported
       HASH
       case "$dtiPlatform" in
-        hp|ibm|sun|uxp|usl|dec)
+        hp|ibm|sun|usl|dec)
           NewState 4.1
           ;;
         *)

cde/admin/IntegTools/install.dt.uxp.src

@@ -1,175 +0,0 @@
-XCOMM $XConsortium: install.dt.uxp.src /main/4 1996/11/19 11:44:17 drk $
-XCOMM ==========================================================================
-XCOMM ==========================================================================
-XCOMM install.dt.usl
-XCOMM
-XCOMM   Platform specific function overrides for the April 1994 Snapshot
-XCOMM   install script, install.dt. 
-XCOMM
-XCOMM   This file is sourced by the install.dt script to allow platform
-XCOMM   specific behavior for certain functionality. These functions are:
-XCOMM
-XCOMM   DtiClearScreen() - clear the screen
-XCOMM   DtiFreeSpace() - return available bytes in a directory
-XCOMM   DtiVerifyConfiguration() - verify system configuration
-XCOMM   DtiWhoami() - return user name
-XCOMM
-XCOMM ==========================================================================
-#define HASH #
-
-XCOMM ==========================================================================
-XCOMM
-XCOMM DtiClearScreen() - clears the screen
-XCOMM
-XCOMM The default DtiClearScreen() uses the 'clear' command to clear the
-XCOMM screen. If this platform does not have the 'clear' command, 
-XCOMM declare DtiClearScreen() here with the appropriate functionality.
-XCOMM
-XCOMM Note: The default DtiClearScreen() writes to stderr, rather than stdout,
-XCOMM so be sure to do the same here. DtiPrint() does this automatically, so
-XCOMM use it if possible.
-XCOMM 
-XCOMM Example:
-XCOMM
-XCOMM DtiClearScreen()
-XCOMM {
-XCOMM   DtiPrint "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-XCOMM   DtiPrint "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-XCOMM }
-XCOMM
-XCOMM Input - none
-XCOMM Output - none
-XCOMM Return -none
-XCOMM
-XCOMM USL uses the default (clear).  We'll define it here to ensure usage.
-XCOMM ==========================================================================
-
-DtiClearScreen() {
-  clear 1>&2
-}
-
-XCOMM ==========================================================================
-XCOMM
-XCOMM DtiFreeSpace
-XCOMM
-XCOMM The default DtiFreeSpace() does not check for free space, rather it
-XCOMM simply returns a BigNumber that install.dt will assume is large 
-XCOMM enough in which to install the desktop. 
-XCOMM
-XCOMM Declare DtiFreeSpace() here to return the actual available space for
-XCOMM a particular directory.
-XCOMM
-XCOMM The $1 parameter will contain the directory name to test. The directory 
-XCOMM specified will exist. DtiFreeSpace() should return the number of bytes
-XCOMM available via the DtiReturn() function. 
-XCOMM
-XCOMM Input
-XCOMM   $1 - directory name
-XCOMM Output - none
-XCOMM Return
-XCOMM   number of bytes available
-XCOMM
-XCOMM ==========================================================================
-
-DtiFreeSpace()
-{
-  blocks="$(df "$1" | sed 's/^.*://' | awk '{print $1}')"
-  case "$blocks" in
-  [0-9]*)	let blocks=blocks*512
-		DtiReturn "$blocks" ;;
-  *)		DtiReturn "0" ;;	# install.dt warn and confirm
-  esac
-}
-
-XCOMM ==========================================================================
-XCOMM
-XCOMM DtiVerifyConfiguration
-XCOMM
-XCOMM The default DtiVerifyConfiguration() does no system configuration 
-XCOMM testing. For a particular platform, one might want to test for
-XCOMM the presence of X11R5 or the OS version, for example, before allowing
-XCOMM the desktop to be installed.
-XCOMM
-XCOMM Declare this function to make such platform specific tests. Return
-XCOMM "yes" if the system passed, or "<message text>" if the system failed
-XCOMM in which case install.dt will display the <message text> as the reason.
-XCOMM
-XCOMM Input - none
-XCOMM Output - none
-XCOMM Return 
-XCOMM   "yes" - system configuration verified
-XCOMM   "<message text>" - verification failed, display message text
-XCOMM
-XCOMM ==========================================================================
-
-DtiVerifyConfiguration()
-{
-  if [ "$(uname -s)" = UNIX_System_V  -a "$(uname -r)" = 4.2.0 ]
-  then
-	DtiReturn "yes"
-	
-    HASH if [ "$(uname -v)" = 1.0 ]
-    HASH then
-    HASH  DtiReturn "WARNING: THE CDE DESKTOP IS NOT SUPPORTED ON UnixWare 1.0"
-    HASH else
-    HASH  for all 4.2 releases after 1.0
-    HASH    DtiReturn "yes"
-    HASH fi
-  else
-	DtiReturn "ERROR: THIS IS NOT A \"UNIX_System_V 4.2.0\" SYSTEM"
-  fi
-}
-
-XCOMM ==========================================================================
-XCOMM
-XCOMM DtiWhoami
-XCOMM
-XCOMM The default DtiWhoami() uses the 'whoami' command to determine
-XCOMM the user name. If this platform does not have the 'whoami' command,
-XCOMM declare DtiWhoami() here with the appropriate functionality.
-XCOMM
-XCOMM Input - none
-XCOMM Output - none
-XCOMM Return
-XCOMM   result of system 'whoami' command
-XCOMM
-XCOMM ==========================================================================
-
-DtiWhoami()
-{
-  /usr/ucb/whoami
-}
-
-XCOMM ==========================================================================
-XCOMM
-XCOMM DtiPrint - echo to stderr and log
-XCOMM
-XCOMM Input 
-XCOMM   $1 - data to echo to stdout and log
-XCOMM Output - none
-XCOMM Return -none
-XCOMM
-XCOMM Override on UnixWare because of printf "%s" integer-const problem
-XCOMM This coordinates with the leading blank in the passing of " $meg" in master.
-XCOMM ==========================================================================
-
-DtiPrint()
-{
-  if [ "$#" -gt 1 ]
-  then
-	if [ "$#" -gt 5 ]
-	then
-  		printf "$1" "$2" "$3" "$4" "$5" "$6" $7 $8 $9 >&2
-	else
-		if [ "$#" -gt 4 ]
-		then
-  			printf "$1" "$2" "$3" "$4" "$5" $6 $7 $8 $9 >&2
-		else
-  			printf "$1" "$2" $3 $4 $5 $6 $7 $8 $9 >&2
-		fi
-	fi
-  else
-  	printf "$1" $2 $3 $4 $5 $6 $7 $8 $9 >&2
-  fi
-  Log "$1" $2 $3 $4 $5 $6 $7 $8 $9
-}

cde/admin/IntegTools/post_install/Imakefile

@@ -40,10 +40,6 @@ SUBDIRS = ibm
 PLATFORM = sun
 SUBDIRS = sun
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-SUBDIRS = uxp
-#endif
 #ifdef USLArchitecture
 PLATFORM = usl
 SUBDIRS = usl

cde/admin/IntegTools/post_install/dec/Imakefile

@@ -15,9 +15,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 #ifdef AlphaArchitecture
 PLATFORM = dec
 #endif

cde/admin/IntegTools/post_install/freebsd/Imakefile

@@ -21,9 +21,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
 BUILD_UDB_LIST = $(SHELL) ../build_udb_list

cde/admin/IntegTools/post_install/ibm/Imakefile

@@ -15,9 +15,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 
 all::

cde/admin/IntegTools/post_install/linux/Imakefile

@@ -18,9 +18,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 all::
 

cde/admin/IntegTools/post_install/netbsd/Imakefile

@@ -27,9 +27,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
 BUILD_UDB_LIST = $(SHELL) ../build_udb_list

cde/admin/IntegTools/post_install/openbsd/Imakefile

@@ -24,9 +24,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
 BUILD_UDB_LIST = $(SHELL) ../build_udb_list

cde/admin/IntegTools/post_install/sun/Imakefile

@@ -15,9 +15,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 all::
 

cde/admin/IntegTools/post_install/usl/Imakefile

@@ -15,9 +15,6 @@ PLATFORM = sun
 #ifdef USLArchitecture
 PLATFORM = usl
 #endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
 
 
 all::

cde/admin/IntegTools/post_install/uxp/Imakefile

@@ -1,55 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/3 1996/04/21 19:13:20 drk $
-TOOL_DIR = ../../dbTools
-DATABASE_DIR = ../../../../databases
-
-#ifdef HPArchitecture
-PLATFORM = hp-ux
-#endif
-#ifdef RsArchitecture
-PLATFORM = aix
-#endif
-#ifdef SunArchitecture
-PLATFORM = sun
-#endif
-#ifdef USLArchitecture
-PLATFORM = usl
-#endif
-#ifdef UXPArchitecture
-PLATFORM = uxp
-#endif
-
-all::
-
-configMin:: $(DATABASE_DIR)/CDE-MIN.udb
-	$(TOOL_DIR)/udbToAny.ksh  -toLst -ReleaseStream $(PLATFORM) \
-            $(DATABASE_DIR)/CDE-MIN.udb > CDE-MIN.lst
-	../build_udb_list CDE-MIN ../../../..
-
-configTT:: $(DATABASE_DIR)/CDE-TT.udb
-	$(TOOL_DIR)/udbToAny.ksh  -toLst -ReleaseStream $(PLATFORM) \
-            $(DATABASE_DIR)/CDE-TT.udb > CDE-TT.lst
-	../build_udb_list CDE-TT ../../../..
-
-configRun:: $(DATABASE_DIR)/CDE-RUN.udb
-	$(TOOL_DIR)/udbToAny.ksh  -toLst -ReleaseStream $(PLATFORM) \
-            $(DATABASE_DIR)/CDE-RUN.udb > CDE-RUN.lst
-	../build_udb_list CDE-RUN ../../../..
-
-configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
-	$(TOOL_DIR)/udbToAny.ksh  -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

cde/admin/IntegTools/post_install/uxp/S69xdm

@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# Start X Display Manager for CDE
-#
-XNETACCESS=on			#!@ Do not edit this line !@
-XWINHOME=/usr/X	export XWINHOME	#!@ (or your mount point) !@
-DTHOME=/usr/dt
-PATH=$PATH:$XWINHOME/bin:$DTHOME/bin export PATH	#!@ Do not edit this line !@
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DTHOME/lib:$XWINHOME/lib export LD_LIBRARY_PATH	#!@ Do not edit this line !@
-
-XUXP=/usr/X/bin/X
-XDMPROG="$DTHOME/bin/dtlogin"
-XDM="$XDMPROG -daemon"
-                                    # Installed by els.4.2 package instance
-XNLSPATH=$XWINHOME/lib/nls/elsXsi   # Installed by els.4.2 package instance
-XMODIFIERS=@im=Local                # Installed by els.4.2 package instance
-export XNLSPATH XMODIFIERS          # Installed by els.4.2 package instance
-
-KillProgram()
-{
-    if [ "$#" -ne 2 ]
-    then
-	echo "usage: KillProgram -signal program-name"
-    fi
-    SIGNAL=$1
-    PROGRAM=$2
-    /bin/ps -ef | grep "$2" | grep -v grep >/tmp/tmppsout
-    if test -s /tmp/tmppsout
-    then
-		awk "{print \"kill $1 \" \$2}" /tmp/tmppsout | /bin/ksh
-    fi
-    rm -f /tmp/tmppsout
-}
-
-case "$1" in
-  start)
-	if test -x $XDMPROG; then
-		if test -x $XUXP; then
-			rm -rf /var/dt/Xpid
-			exec $XDM
-		fi
-	fi
-        ;;
-
-  stop)
-	KillProgram -15 dtlogin
-        ;;
-
-  *)
-        echo "usage: S69xdm {start|stop}"
-        ;;
-esac
-

cde/admin/IntegTools/post_install/uxp/configHelp.src

@@ -1,67 +0,0 @@
-XCOMM! /bin/ksh
-XCOMM #######
-XCOMM   Product: CDE
-XCOMM   Fileset: CDE-HELP
-XCOMM   customize
-XCOMM   @(#) $XConsortium: configHelp.src /main/4 1996/07/18 15:49:15 drk $
-XCOMM #######
-XCOMM 
-XCOMM  (c) Copyright Hewlett-Packard Company, 1993
-XCOMM 
-XCOMM #######
-#define STAR *
-XCOMM ############################################
-XCOMM #
-XCOMM # HELP_symlinks
-XCOMM #
-XCOMM # create various symlinks 
-XCOMM # 
-XCOMM ############################################
-HELP_symlinks()
-{
-    HELP_LOC="appconfig/help"
-    theLANG="C"
-    DESTDIR=$CDE_CONF_TOP/$HELP_LOC/$theLANG
-    SRCDIR=$CDE_TOP/$HELP_LOC/$theLANG
-    EXT=".sdl"
-
-    [ -d $DESTDIR ] || mkdir -p $DESTDIR
-
-	for j in $CDE_TOP/$HELP_LOC/$theLANG/STAR
-	do
-	    thedir=`basename $j`
-	    if [[ -d $j && -f $j/${thedir}$EXT ]]
-	    then
-		rm -f $DESTDIR/${thedir}$EXT
-		ln -s $j/${thedir}$EXT $DESTDIR/${thedir}$EXT
-	    fi
-	done
-
-	for j in $CDE_TOP/$HELP_LOC/$theLANG/STAR.hf
-	do
-	    thefile=`basename $j`
-	    rm -f $DESTDIR/$thefile
-	    ln -s $CDE_TOP/$HELP_LOC/$theLANG/$thefile $DESTDIR/$thefile
-	done
-}
-
-XCOMM ##########################################################################
-XCOMM 
-XCOMM 				Main Body
-XCOMM 
-XCOMM ##########################################################################
-
-PRODUCT=CDE
-FILESET=CDE-HELP
-retval=0
-CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
-
-XCOMM 
-XCOMM  set up symlinks that point into the $CDE_TOP tree
-XCOMM 
-
-HELP_symlinks
-
-return $retval
-

cde/admin/IntegTools/post_install/uxp/configHelpPrg.src

@@ -1,65 +0,0 @@
-XCOMM! /bin/ksh
-XCOMM #######
-XCOMM   Product: CDE
-XCOMM   Fileset: CDE-HELP
-XCOMM   customize
-XCOMM   @(#) $XConsortium: configHelpPrg.src /main/4 1996/07/18 15:49:38 drk $
-XCOMM #######
-XCOMM 
-XCOMM  (c) Copyright Hewlett-Packard Company, 1993
-XCOMM 
-XCOMM #######
-#define STAR *
-XCOMM ############################################
-XCOMM #
-XCOMM # HELP_symlinks
-XCOMM #
-XCOMM # create various symlinks 
-XCOMM # 
-XCOMM ############################################
-HELP_symlinks()
-{
-    DEST_HELP_LOC="appconfig/help"
-    SRC_HELP_LOC="dthelp/help"
-    theLang="C"
-    DESTDIR=$CDE_CONF_TOP/$DEST_HELP_LOC/$theLang
-    SRCDIR=$CDE_TOP/$SRC_HELP_LOC/$theLang
-
-    [ -d $DESTDIR ] || mkdir -p $DESTDIR
-
-    for j in $SRCDIR/STAR
-    do
-	dir=`basename $j`
-	for k in $j/STAR
-	do
-	    file=`basename $k`
-	    EXT=${file##*\.}
-	    if [[ "$EXT" = "sdl" || "$EXT" = "hf" ]]
-	    then
-		rm -f $DESTDIR/$file
-		ln -s $SRCDIR/$dir/$file $DESTDIR/$file
-	    fi
-	done
-    done
-}
-
-XCOMM ##########################################################################
-XCOMM 
-XCOMM 				Main Body
-XCOMM 
-XCOMM ##########################################################################
-
-PRODUCT=CDE
-FILESET=CDE-HELP
-retval=0
-CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
-
-XCOMM 
-XCOMM  set up symlinks that point into the $CDE_TOP tree
-XCOMM 
-
-HELP_symlinks
-
-return $retval
-

cde/admin/IntegTools/post_install/uxp/configMin.src

@@ -1,197 +0,0 @@
-XCOMM! /bin/ksh
-XCOMM #######
-XCOMM  Product: CDE
-XCOMM  Fileset: CDE-MIN
-XCOMM  configure
-XCOMM  @(#) $XConsortium: configMin.src /main/2 1996/04/21 19:13:28 drk $
-XCOMM #######
-XCOMM
-XCOMM (c) Copyright Hewlett-Packard Company, 1993
-XCOMM
-XCOMM #######
-
-PRODUCT=CDE
-FILESET=CDE-MIN
-DO_CONFIGURATION=""
-retval=0
-
-CheckForClobberedLinks()
-{
-XCOMM
-XCOMM ensure links not clobbered
-XCOMM
-
-	for file in services inetd.conf
-	do
-		if test ! -L /etc/$file
-		then	if test -f /etc/$file
-			then
-				rm /etc/$file
-				ln -s /etc/inet/$file /etc/$file
-		    	fi
-		fi
-	done
-}
-
-FixEtcInetServices()
-{
-SERVICES=/etc/inet/services
-
-XCOMM
-XCOMM see if it already exists
-XCOMM
-
-    nawk '{if ($1 == "dtspc") print $0 > "/tmp/dtspc-already-there"}' \
-		$SERVICES >/dev/null
-    if [ ! -f /tmp/dtspc-already-there ]
-    then
-	if test ! -f ${SERVICES}.preCDE
-        then	mv $SERVICES $SERVICES.preCDE
-		cp ${SERVICES}.preCDE $SERVICES
-		chmod 444 $SERVICES
-	fi
-        echo "dtspc\t6112/tcp\t#subprocess control" >>$SERVICES
-    else
-	rm /tmp/dtspc-already-there
-    fi
-
-XCOMM
-XCOMM remove legacy entries like dtspcd
-XCOMM
-
-    nawk '{if ($1 == "dtspcd" || $1 == "#dtspcd") ; else print $0}' \
-		$SERVICES >/tmp/etc-services
-    mv /tmp/etc-services $SERVICES
-    chmod 444 $SERVICES
-}
-
-UnfixEtcInetServices()
-{
-SERVICES=/etc/inet/services
-TMPFILE=/tmp/etc-services
-
-    nawk '{if ($1 == "dtspc" && $2 == "6112/tcp")
-		;
-	  else
-		print $0
-	 }' $SERVICES >$TMPFILE
-
-    mv $TMPFILE $SERVICES
-}
-
-FixInetdDotConf()
-{
-INETD_CONF=/etc/inet/inetd.conf
-
-XCOMM
-XCOMM see if it already exists
-XCOMM
-
-    nawk '{if ($1 == "dtspc") print $0 > "/tmp/dtspc-already-there"}' \
-	$INETD_CONF >/dev/null
-
-    if [ ! -f /tmp/dtspc-already-there ]
-    then
-	if test ! -f ${INETD_CONF}.preCDE
-        then	mv $INETD_CONF $INETD_CONF.preCDE
-		cp ${INETD_CONF}.preCDE $INETD_CONF
-		chmod 444 $INETD_CONF
-	fi
-	DTSPCD=CDE_INSTALLATION_TOP/bin/dtspcd
-	echo "dtspc stream tcp nowait root $DTSPCD $DTSPCD" >>$INETD_CONF
-    else
-	rm /tmp/dtspc-already-there
-    fi
-
-XCOMM
-XCOMM remove legacy entries like dtspcd
-XCOMM
-
-    nawk '{if ($1 == "dtspcd" || $1 == "#dtspcd") ; else print $0}' \
-		$INETD_CONF >/tmp/etc-inetd-conf
-    mv /tmp/etc-inetd-conf $INETD_CONF
-    chmod 444 $INETD_CONF
-}
-
-UnfixInetdDotConf()
-{
-INETD_CONF=/etc/inet/inetd.conf
-TMPFILE=/tmp/inetd.conf
-
-    nawk '{if ($1 == "dtspc")
-		;
-	  else
-		print $0
-	 }' $INETD_CONF >$TMPFILE
-
-    mv $TMPFILE $INETD_CONF
-}
-
-PokeInetd()
-{
-XCOMM issue a SIGHUP to the inetd process
-
-    ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
-    if [ -s /tmp/tmppsout ]
-    then
-	nawk '{print "kill -HUP " $2}' /tmp/tmppsout | /bin/ksh
-    else
-	/usr/sbin/inetd -s
-    fi
-    rm /tmp/tmppsout
-}
-
-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 ####################################################################
-
-  CheckForClobberedLinks
-
-  HandleOption $*
-
-  if [ "$OPERATION" = "configure" ]
-  then
-
-    FixEtcInetServices
-    FixInetdDotConf
-    PokeInetd()
-
-  elif [ "$OPERATION" = "deconfigure" ]
-  then
-
-    UnfixEtcInetServices
-    UnfixInetdDotConf
-    PokeInetd()
-
-    RemoveMinFiles
-    VerifyInstalledFiles
-
-  elif [ "$OPERATION" = "verify" ]
-  then
-
-    VerifyInstalledFiles
-
-  fi
-
-  return $retval
-

cde/admin/IntegTools/post_install/uxp/configRun.src

@@ -1,306 +0,0 @@
-XCOMM! /bin/ksh
-XCOMM #######
-XCOMM  Product: CDE
-XCOMM  Fileset: CDE-RUN
-XCOMM  configure
-XCOMM  @(#) $XConsortium: configRun.src /main/5 1996/10/18 16:27:01 drk $
-XCOMM #######
-
-#define HASH #
-#define STAR *
-
-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
-
-}
-
-FixInetdDotConf()
-{
-FILE="/etc/inet/inetd.conf"
-TMPFILE="/tmp/inetd.conf"
-
-XCOMM
-XCOMM desired inetd.conf entry:
-XCOMM 100068/2-4 dgram rpc/udp wait root CDE_INSTALLATION_TOP/bin/rpc.cmsd 
-XCOMM         rpc.cmsd
-XCOMM
-
-XCOMM
-XCOMM ensure links not clobbered
-XCOMM
-
-	for file in services inetd.conf
-	do
-		if test ! -L /etc/$file
-		then	if test -f /etc/$file
-			then
-				rm /etc/$file
-				ln -s /etc/inet/$file /etc/$file
-		    	fi
-		fi
-	done
-
-    CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd
-    nawk -v cmsd=$CMSD \
-		'{if ($1 == "100068/2-4" && $6 != cmsd)
-			print "#cde " $0;
-		  else
-			print $0
-		 }' $FILE >$TMPFILE
-
-    if test ! -f ${FILE}.preCDE
-    then	mv $FILE ${FILE}.preCDE
-		cp ${FILE}.preCDE $FILE
-    fi
-    mv $TMPFILE $FILE
-    chmod 444 $FILE
-
-XCOMM
-XCOMM now see if there is an occurrence of cmsd
-XCOMM
-
-    rm -f /tmp/cmsd-already-there
-    nawk '{if ($7 == "rpc.cmsd" && $1 == "100068/2-4") 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 "100068/2-4 dgram rpc/udp wait root $CMSD rpc.cmsd" >>$FILE
-    else
-	rm /tmp/cmsd-already-there
-    fi
-}
-
-UnfixInetdDotConf()
-{
-FILE=/etc/inet/inetd.conf
-TMPFILE=/tmp/inetd.conf
-CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd
-
-    nawk -v cmsd=$CMSD \
-		'{if ($1 == "100068/2-4" && $6 == cmsd)
-			;
-		  else
-			print $0
-		 }' $FILE >$TMPFILE
-
-    mv $TMPFILE $FILE
-
-    nawk '{if ($1 == "#cde" && $2 == "100068/2-4") {
-		$1 = $2;
-		$2 = ""
-	    }
-	    print $0
-	 }' $FILE >$TMPFILE
-
-    mv $TMPFILE $FILE
-}
-
-PokeInetd()
-{
-XCOMM
-XCOMM Schedule inetd to re-read inetd.conf with SIGHUP.
-XCOMM
-    ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
-    if test -s /tmp/tmppsout
-    then
-		nawk '{print "kill -HUP " $2}' /tmp/tmppsout | /bin/ksh
-    else
-		/usr/sbin/inetd -s
-    fi
-    rm -f /tmp/tmppsout
-}
-
-doDttermTerminfo()
-{
-    if [ -f $DT_TOP/config/dtterm.ti ]
-    then
-	/bin/tic $DT_TOP/config/dtterm.ti
-	if [ -f /usr/share/lib/terminfo/d/dtterm ]
-	then
-	    chown bin /usr/share/lib/terminfo/d/dtterm
-	    chgrp bin /usr/share/lib/terminfo/d/dtterm
-	    chmod 644 /usr/share/lib/terminfo/d/dtterm
-	else
-	    echo "Unable to compile $DT_TOP/config/dtterm.ti"
-	fi
-    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
-}
-
-#include "../option.func"
-
-XCOMM ######################################################################
-XCOMM
-XCOMM  Main body
-XCOMM
-XCOMM ######################################################################
-
-PRODUCT=CDE
-FILESET=CDE-RUN
-retval=0
-
-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"
-
-  HandleOption $*
-
-  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 Create default printer actions
-    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
-    PokeInetd
-
-    doDttermTerminfo
-
-  elif [ "$OPERATION" = "deconfigure" ]
-  then
-
-    UnfixInetdDotConf
-    PokeInetd
-    RemoveRunFiles
-    VerifyInstalledFiles
-
-  elif [ "$OPERATION" = "verify" ]
-  then
-
-    VerifyInstalledFiles
-
-  fi
-
-  return $retval

cde/admin/IntegTools/post_install/uxp/configShlibs.src

@@ -1,114 +0,0 @@
-XCOMM!/bin/ksh
-XCOMM $XConsortium: configShlibs.src /main/5 1996/06/13 16:39:07 drk $
-
-XCOMM (c) Copyright 1996 Digital Equipment Corporation.
-XCOMM (c) Copyright 1996 Hewlett-Packard Company.
-XCOMM (c) Copyright 1996 International Business Machines Corp.
-XCOMM (c) Copyright 1996 Sun Microsystems, Inc.
-XCOMM (c) Copyright 1996 Novell, Inc. 
-XCOMM (c) Copyright 1996 FUJITSU LIMITED.
-XCOMM (c) Copyright 1996 Hitachi.
-
-#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: configShlibs
-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
-    echo "  Creating symlink for $lib"
-
-    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

cde/admin/IntegTools/post_install/uxp/configTT.src

@@ -1,166 +0,0 @@
-XCOMM! /bin/ksh
-XCOMM #######
-XCOMM  Product: CDE
-XCOMM  Fileset: CDE-TT
-XCOMM  configure
-XCOMM  @(#) $XConsortium: configTT.src /main/5 1996/09/20 18:22:32 cde-fuj $
-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.ttdbserverd
-
-XCOMM
-XCOMM see if it already exists
-XCOMM
-
-    nawk -v ttdb=$TTDBSERVERD \
-	'{if ($1 == "100083/1" && $6 != ttdb)
-		print "#cde " $0;
-	  else
-		print $0
-	 }' $FILE >$TMPFILE
-
-    cp $TMPFILE $FILE
-    rm $TMPFILE
-
-    awk '{if ($1 == "100083/1")
-		print $0 > "/tmp/tt-already-there"
-	 }' $FILE >/dev/null
-
-    if [ ! -f /tmp/tt-already-there ]
-    then
-        echo "100083/1 tli rpc/tcp 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.ttdbserverd
-
-    nawk -v ttdb=$TTDBSERVERD \
-	'{if ($1 == "100083/1" && $6 == ttdb)
-		;
-	  else
-		print $0
-	 }' $FILE >$TMPFILE
-
-    cp $TMPFILE $FILE
-    rm $TMPFILE
-
-    awk '{if ($1 == "#cde" && ($2 == "100083/1" || $2 == "100083")) {
-		$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
-
-  if [ "$OPERATION" != "verify" ]
-  then
-
-    HASH issue a SIGHUP to the inetd process
-
-    ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
-    if [ -s /tmp/tmppsout ]
-    then
-	awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
-    else
-	/usr/sbin/inetd -s
-    fi
-
-    rm /tmp/tmppsout
-  fi
-
-  return $retval

cde/admin/IntegTools/updateTools/updateCDE.src

@@ -47,9 +47,6 @@ XCOMM Set system
   elif [ $BUILDSYSTEM = "UNIX_SV" ]
   then
     PLATFORM=usl
-  elif [ $BUILDSYSTEM = "UNIX_System_V" ]
-  then
-    PLATFORM=uxp
   elif [ $BUILDSYSTEM = "OSF1" ]
   then
     PLATFORM=dec
@@ -60,7 +57,7 @@ XCOMM Set system
   if [ $PLATFORM = "aix" ]
   then
     USER=`/bin/whoami`
-  elif [ $PLATFORM = "sun" -o $PLATFORM = "uxp" ]
+  elif [ $PLATFORM = "sun" ]
   then
     USER=`/usr/ucb/whoami`
   else

cde/config/cf/DtInfo.tmpl

@@ -142,12 +142,6 @@ EXTRA_LIBRARIES=$(DYNAMIC) ExtraLibraries -lresolv
 # endif
 #endif
 
-#ifdef UXPArchitecture
-STATIC=-Bstatic
-DYNAMIC=-Bdynamic
-EXTRA_LIBRARIES=$(DYNAMIC) ExtraLibraries -lgen
-#endif
-
 #ifdef HPArchitecture
 STATIC=-Wl,-a,archive
 DYNAMIC=-Wl,-a,shared
@@ -163,8 +157,6 @@ PLATFORM=halos
 PLATFORM=hpux
 #elif defined(AIXArchitecture)
 PLATFORM=aix
-#elif defined(UXPArchitecture)
-PLATFORM=uxpds
 #elif defined(AlphaArchitecture)
 PLATFORM=digital
 #elif defined(USLArchitecture)
@@ -428,7 +420,7 @@ TEMPLATE_OBJS=TemplateDB//**/*.o
 
 #if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture)
 # define ByteOrderDefines LittleEndianDefines
-#elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(AIXArchitecture) || defined(HPArchitecture) || defined(UXPArchitecture)
+#elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(AIXArchitecture) || defined(HPArchitecture)
 # define ByteOrderDefines BigEndianDefines
 #else
 # define ByteOrderDefines DefaultEndianDefines

cde/config/cf/Imake.cf

@@ -579,27 +579,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # endif
 #endif /* linux */
 
-#ifdef __uxp__
-# define MacroIncludeFile <fujitsu.cf>
-# define MacroFile fujitsu.cf
-# define FujitsuArchitecture
-# undef __uxp__
-# define UXPArchitecture
-# define SVR4Architecture
-# ifdef sparc
-#  undef sparc
-#  define SparcArchitecture
-# endif
-#endif /* __uxp__ */
-
-#ifdef __sxg__
-# define MacroIncludeFile <fujitsu.cf>
-# define MacroFile fujitsu.cf
-# define FujitsuArchitecture
-# undef __sxg__
-# define mc68000Architecture
-#endif /* __sxg__ */
-
 #if defined(sequent) || defined(_SEQUENT_)
 # define MacroIncludeFile <sequent.cf>
 # define MacroFile sequent.cf

cde/config/cf/Imakefile

@@ -69,7 +69,6 @@ apollo.cf \
 bsd.cf \
 convex.cf \
 cray.cf \
-fujitsu.cf \
 generic.cf \
 hp.cf \
 ibm.cf \

cde/config/cf/fujitsu.cf

@@ -1,95 +0,0 @@
-XCOMM platform:  $TOG: fujitsu.cf /main/9 1997/04/17 14:11:44 barstow $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion)
-
-#define PatheticCpp	   YES
-
-#ifdef SparcArchitecture
-
-#define BootstrapCFlags    -D__uxp__
-#define StandardDefines    -D__uxp__ -DSVR4 -DANSICPP
-#define StandardCppDefines -D__uxp__ -DSVR4 -DANSICPP
-
-#define CppCmd             /usr/ccs/lib/cpp
-
-#ifndef  ArCmdBase
-# define ArCmdBase	/usr/ccs/bin/ar
-#endif
-#ifndef  AsCmd
-# define AsCmd		/usr/ccs/bin/as
-#endif
-#ifndef  CcCmd
-# define CcCmd		/usr/ccs/bin/cc
-#endif
-#ifndef  CplusplusCmd
-# define CplusplusCmd	/opt/uxpcplus/bin/CC
-#endif
-#ifndef  CplusplusFilt
-# define CplusplusFilt	/opt/uxpcplus/bin/c++filt
-#endif
-#ifndef  CplusplusDependIncludes
-# define CplusplusDependIncludes	-I/opt/uxpcplus/include/CC
-#endif
-#ifndef  LdCmd
-# define LdCmd		/usr/ccs/bin/ld
-#endif
-#ifndef  LexCmd
-# define LexCmd		/usr/ccs/bin/lex
-#endif
-#ifndef  YaccCmd
-# define YaccCmd	/usr/ccs/bin/yacc
-#endif
-
-#define BuildLibPathVar	   LD_LIBRARY_PATH
-#define SystemV4	   YES
-#define HasSockets         YES
-#define DBMLibrary         /* ndbm modules are in -lc */
-#define HasNdbm            YES
-#ifndef HasLdRunPath
-#define HasLdRunPath       YES
-#endif
-#define BuildServer        NO
-
-#include <sv4Lib.rules>
-
-#endif
-
-#ifdef mc68000Architecture
-
-#define BootstrapCFlags    -D__sxg__
-#define StandardDefines    -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-#define StandardCppDefines -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-
-#define LnCmd              ln
-
-#define DoRanlibCmd        NO 
-#define DefaultCCOptions   +Z384
-#define ExtraLibraries     -lXbsd -lsocket -lu
-#define TermcapLibrary     -lcurses
-#define BuildServer        NO
-#define HasSymLinks        NO
-#define HasVFork           NO
-#define XawI18nDefines     -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-#endif
-
-#define GencatFlags		-m
-
-#define DtSvcDefines		-DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines -DNEED_STRCASECMP
-#define DtWidgetDefines		DtSearchDefines
-
-#define ArchitectureDefines	-DUXP_ARCHITECTURE
-
-#define CdeProjectDefines \
-	-DMULTIBYTE -DNLS16 \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion

cde/config/cf/site.def

@@ -34,7 +34,7 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
  * TopLevelProject macro defined above).
  */
 # if defined(SunArchitecture) || defined(AIXArchitecture) \
-     || defined(USLArchitecture) || defined(UXPArchitecture)
+     || defined(USLArchitecture)
 #  ifndef ProjectRulesFile
 #   define ProjectRulesFile	<cde.rules>
 #  endif
@@ -74,8 +74,7 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 #  endif
 # endif
 
-# if defined(UXPArchitecture) || defined(USLArchitecture) \
+# if defined(USLArchitecture) || defined(AIXArchitecture)
-     || defined(AIXArchitecture)
 #  define HasCplusplus		YES
 # endif
 
@@ -122,10 +121,6 @@ XCOMM build the DtXinerama support
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
-#ifdef UXPArchitecture
-# define DtLocalesToBuild ja_JP.dt-eucJP
-#endif
-
 XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
 #if defined(BSDArchitecture)

cde/config/imake/imakemdep.h

@@ -156,10 +156,6 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif
 
-#ifdef __uxp__
-#define imake_ccflags "-DSVR4 -DANSICPP"
-#endif
-
 #ifdef __sxg__
 #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
 #endif
@@ -261,9 +257,6 @@ in this Software without prior written authorization from The Open Group.
 #if defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC))
 #define DEFAULT_CPP "/usr/bin/cpp"
 #endif
-#ifdef __uxp__
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
 #ifdef __sxg__
 #define DEFAULT_CPP "/usr/lib/cpp"
 #endif
@@ -555,9 +548,6 @@ char *cpp_argv[ARGUMENTS] = {
         "-traditional",
         "-Dlinux",
 #endif
-#ifdef __uxp__
-	"-D__uxp__",
-#endif
 #ifdef __sxg__
 	"-D__sxg__",
 #endif
@@ -621,7 +611,7 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV	"r %[0-9]"
 /* No information available to generate default OSTeenyVersion value. */
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(linux) || defined(sony)
+#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(linux) || defined(sony)
 /* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
 # define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
 # define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
@@ -644,12 +634,6 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
 # define DEFAULT_OS_MINOR_REV	"r %*[^.].%[0-9]"
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(__uxp__)
-/* NOTE: "x.y[.z]" above handles UXP/DF.  This is a sample alternative. */
-/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */
-# 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__)
 /* uname -r returns "x.y[.z]-mumble", e.g. "9.0-RELEASE" or "11.0-CURRENT" */
 # define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
@@ -841,9 +825,6 @@ struct symtab	predefs[] = {
 #ifdef __unix__
 	{"__unix__", "1"},
 #endif
-#ifdef __uxp__
-	{"__uxp__", "1"},
-#endif
 #ifdef __sxg__
 	{"__sxg__", "1"},
 #endif

cde/databases/CDE-DEMOS.udb

@@ -197,11 +197,6 @@ examples/dtaction/Makefile.sun
         install_target = /usr/dt/share/examples/dtaction/Makefile.SUN
 }
 
-examples/dtaction/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtaction/Makefile.UXP
-}
-
 examples/dtaction/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtaction/Makefile.NOVELL
@@ -236,11 +231,6 @@ examples/dtcalendar/Makefile.sun
         install_target = /usr/dt/share/examples/dtcalendar/Makefile.SUN
 }
 
-examples/dtcalendar/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtcalendar/Makefile.UXP
-}
-
 examples/dtcalendar/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtcalendar/Makefile.NOVELL
@@ -324,11 +314,6 @@ examples/dtdnd/Makefile.usl
         install_target = /usr/dt/share/examples/dtdnd/Makefile.USL
 }
 #
-examples/dtdnd/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtdnd/Makefile.UXP
-}
-#
 examples/dtdnd/Makefile.ibm
 { default
         install_target = /usr/dt/share/examples/dtdnd/Makefile.IBM
@@ -362,11 +347,6 @@ examples/dtdts/Makefile.sun
         install_target = /usr/dt/share/examples/dtdts/Makefile.SUN
 }
 
-examples/dtdts/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtdts/Makefile.UXP
-}
-
 examples/dtdts/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtdts/Makefile.NOVELL
@@ -401,11 +381,6 @@ examples/dtsession/Makefile.sun
         install_target = /usr/dt/share/examples/dtsession/Makefile.SUN
 }
 
-examples/dtsession/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtsession/Makefile.UXP
-}
-
 examples/dtsession/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtsession/Makefile.NOVELL
@@ -440,11 +415,6 @@ examples/dtscreen/Makefile.sun
         install_target = /usr/dt/share/examples/dtscreen/Makefile.SUN
 }
 
-examples/dtscreen/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtscreen/Makefile.UXP
-}
-
 examples/dtscreen/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtscreen/Makefile.NOVELL
@@ -484,11 +454,6 @@ examples/dtterm/Makefile.sun
         install_target = /usr/dt/share/examples/dtterm/Makefile.SUN
 }
 
-examples/dtterm/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtterm/Makefile.UXP
-}
-
 examples/dtterm/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtterm/Makefile.NOVELL
@@ -528,11 +493,6 @@ examples/dtwidget/Makefile.sun
         install_target = /usr/dt/share/examples/dtwidget/Makefile.SUN
 }
 
-examples/dtwidget/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtwidget/Makefile.UXP
-}
-
 examples/dtwidget/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtwidget/Makefile.NOVELL
@@ -572,11 +532,6 @@ examples/dtwsm/Makefile.sun
         install_target = /usr/dt/share/examples/dtwsm/Makefile.SUN
 }
 
-examples/dtwsm/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/dtwsm/Makefile.UXP
-}
-
 examples/dtwsm/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/dtwsm/Makefile.NOVELL
@@ -611,11 +566,6 @@ examples/tt/Makefile.sun
         install_target = /usr/dt/share/examples/tt/Makefile.SUN
 }
 
-examples/tt/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/tt/Makefile.UXP
-}
-
 examples/tt/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/tt/Makefile.NOVELL
@@ -679,11 +629,6 @@ examples/template/Makefile.sun
         install_target = /usr/dt/share/examples/template/Makefile.SUN
 }
 
-examples/template/Makefile.uxp
-{ default
-        install_target = /usr/dt/share/examples/template/Makefile.UXP
-}
-
 examples/template/Makefile.novell
 { default
         install_target = /usr/dt/share/examples/template/Makefile.NOVELL

cde/databases/CDE-FONTS.udb

@@ -111,29 +111,6 @@
         responsible_project = cde_dt
 }
 
-#>>------------------------------
-# Defaults for: sun/fujitsu
-#<<------------------------------
-#
-{ uxp : defaults
-        install_target =
-        fileset = CDE-FONTS
-        type = file
-        status = di----
-        processor = 378
-        mode = 0444
-        owner = bin
-        group = bin
-        link_source = <LNK>
-        build_target = /
-        install_rule_name =
-        install_flags =
-        a_out_location = <SRC>
-        order = 0
-        responsible_project = cde_dt
-}
-
-
 #>>-------------------------------------------------
 # Defaults for: Digital
 #<<-------------------------------------------------
@@ -721,39 +698,6 @@ programs/fontaliases/novell/C/dtinfo.pcf.Z
 	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z
 }
 
-#
-# for Fujitsu
-#
-programs/fontaliases/uxp/C/fonts.alias
-{ uxp
-	install_target = /usr/dt/config/xfonts/C/fonts.alias
-}
-#
-programs/fontaliases/uxp/C/fonts.dir
-{ uxp
-	install_target = /usr/dt/config/xfonts/C/fonts.dir
-}
-#
-programs/fontaliases/uxp/C/dtinfo.pcf
-{ uxp
-	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
-}
-#
-programs/fontaliases/uxp/ja_JP/fonts.alias
-{ uxp
-	install_target = /usr/dt/config/xfonts/ja_JP/fonts.alias
-}
-#
-programs/fontaliases/uxp/ja_JP/fonts.dir
-{ uxp
-	install_target = /usr/dt/config/xfonts/ja_JP/fonts.dir
-}
-#
-programs/fontaliases/uxp/ja_JP/dtinfo.pcf
-{ uxp
-	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
-}
-
 #
 # for Digital
 #
@@ -1037,29 +981,6 @@ programs/fontaliases/postscript/ja/prolog.ps
 #	install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps
 #}
 
-#
-# For Novell/Fujitsu
-#
-programs/fontaliases/postscript/ja/prolog.ps
-{ uxp
-	install_target = /usr/dt/config/psfonts/ja/prolog.ps
-}
-#
-#programs/fontaliases/postscript/ko/prolog.ps
-#{ uxp
-#	install_target = /usr/dt/config/psfonts/ko/prolog.ps
-#}
-#
-#programs/fontaliases/postscript/zh/prolog.ps
-#{ uxp
-#	install_target = /usr/dt/config/psfonts/zh/prolog.ps
-#}
-#
-#programs/fontaliases/postscript/zh_TW/prolog.ps
-#{ uxp
-#	install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps
-#}
-
 #
 # For Digital
 #

cde/databases/CDE-HELP-LOC.src

@@ -3070,77 +3070,6 @@ XCOMM #########################################################################
 #endif
 #endif /* USL */
 
-XCOMM #########################################################################
-XCOMM 
-XCOMM  Fujitsu - Locale and platform specific entries
-XCOMM 
-XCOMM #########################################################################
-#ifdef __uxp__
-#ifdef _GERMAN_
-/usr/dt/appconfig/help/de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/help/de_DE
-	type = sym_link
-}
-#endif
-#ifdef _SPANISH_
-/usr/dt/appconfig/help/es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/help/es
-	type = sym_link
-}
-#endif
-#ifdef _FRENCH_
-/usr/dt/appconfig/help/fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/help/fr
-	type = sym_link
-}
-#endif
-#ifdef _ITALIAN_
-/usr/dt/appconfig/help/it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/help/it
-	type = sym_link
-}
-#endif
-#ifdef _JAPANESE_
-/usr/dt/appconfig/help/ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/appconfig/help/ja_JP
-	type = sym_link
-}
-#endif
-#ifdef _KOREAN_
-/usr/dt/appconfig/help/ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/appconfig/help/ko_KR.5601
-	type = sym_link
-}
-#endif
-#ifdef _SWEDISH_
-/usr/dt/appconfig/help/sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/help/sv
-	type = sym_link
-}
-#endif
-#ifdef _CHINESE_
-/usr/dt/appconfig/help/zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/appconfig/help/zh_CN
-	type = sym_link
-}
-#endif
-#ifdef _TAIWANESE_
-/usr/dt/appconfig/help/zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/appconfig/help/zh_TW
-	type = sym_link
-}
-#endif
-#endif /* __uxp__ */
-
 XCOMM #########################################################################
 XCOMM 
 XCOMM  DEC - Locale and platform specific entries

cde/databases/CDE-HELP-PRG.udb

@@ -202,11 +202,6 @@ programs/dthelp/dthelpdemo/Makefile.Sun
 	install_target = /usr/dt/share/examples/dthelp/Makefile.SUN
 }
 #
-programs/dthelp/dthelpdemo/Makefile.UXP
-{ default
-	install_target = /usr/dt/share/examples/dthelp/Makefile.UXP
-}
-#
 #>>-----------------------------------
 #  Helpdemo source: Sample help volume
 #-------------------------------------

cde/databases/CDE-HELP-RUN.udb

@@ -518,9 +518,3 @@ lib/DtHelp/UNIX_SV.lcx
 { usl
         install_target = /usr/dt/config/svc/UNIX_SV.lcx
 }
-#
-lib/DtHelp/UNIX_Syst.lcx
-{ uxp
-        install_target = /usr/dt/config/svc/UNIX_Syst.lcx
-}
-

cde/databases/CDE-INFOLIB-LOC.src

@@ -553,56 +553,6 @@ XCOMM ##########################################################################
 
 #endif /* USL */
 
-
-XCOMM ##########################################################################
-XCOMM 
-XCOMM  Fujitsu - Locale and platform specific entries
-XCOMM 
-XCOMM ##########################################################################
-#ifdef __uxp__
-
-#ifdef _GERMAN_
-../infolib/de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/infolib/de_DE
-	type = sym_link
-}
-#endif
-
-#ifdef _SPANISH_
-../infolib/es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/infolib/es
-	type = sym_link
-}
-#endif
-
-#ifdef _FRENCH_
-../infolib/fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/infolib/fr
-	type = sym_link
-}
-#endif
-
-#ifdef _ITALIAN_
-../infolib/it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/infolib/it
-	type = sym_link
-}
-#endif
-
-#ifdef _JAPANESE_
-../infolib/ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/infolib/ja_JP
-	type = sym_link
-}
-#endif
-
-#endif /* __uxp__ */
-
 XCOMM ##########################################################################
 XCOMM 
 XCOMM  DEC - Locale and platform specific entries

cde/databases/CDE-LOC.src

@@ -2078,397 +2078,6 @@ programs/dtimsstart/conf/hpux/none
 #endif
 #endif /* USL */
 
-
-XCOMM ##########################################################################
-XCOMM 
-XCOMM  Fujitsu - Locale and platform specific entries
-XCOMM 
-XCOMM ##########################################################################
-#ifdef __uxp__
-#ifdef _GERMAN_
-./de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/app-defaults/de_DE
-	type = sym_link
-}
-./de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/de_DE
-	type = sym_link
-}
-./de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/types/de_DE
-	type = sym_link
-}
-./de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/config/de_DE
-	type = sym_link
-}
-./desc.de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.de_DE
-	type = sym_link
-}
-./desc.de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.de_DE
-	type = sym_link
-}
-./de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/examples/types/de_DE
-	type = sym_link
-}
-#endif
-#ifdef _SPANISH_
-./es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/app-defaults/es
-	type = sym_link
-}
-./es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/es
-	type = sym_link
-}
-./es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/types/es
-	type = sym_link
-}
-./es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/config/es
-	type = sym_link
-}
-./desc.es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.es
-	type = sym_link
-}
-./desc.es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.es
-	type = sym_link
-}
-./es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/examples/types/es
-	type = sym_link
-}
-#endif
-#ifdef _FRENCH_
-./fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/app-defaults/fr
-	type = sym_link
-}
-./fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/fr
-	type = sym_link
-}
-./fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/types/fr
-	type = sym_link
-}
-./fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/config/fr
-	type = sym_link
-}
-./desc.fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.fr
-	type = sym_link
-}
-./desc.fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.fr
-	type = sym_link
-}
-./fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/examples/types/fr
-	type = sym_link
-}
-#endif
-#ifdef _ITALIAN_
-./it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/app-defaults/it
-	type = sym_link
-}
-./it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/it
-	type = sym_link
-}
-./it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/types/it
-	type = sym_link
-}
-./it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/config/it
-	type = sym_link
-}
-./desc.it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.it
-	type = sym_link
-}
-./desc.it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.it
-	type = sym_link
-}
-./it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/examples/types/it
-	type = sym_link
-}
-#endif
-#ifdef _JAPANESE_
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/app-defaults/ja_JP
-	type = sym_link
-}
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/app-defaults/ja_JP.U90
-	type = sym_link
-}
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/ja_JP
-	type = sym_link
-}
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/appconfig/types/ja_JP
-	type = sym_link
-}
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/config/ja_JP
-	type = sym_link
-}
-./desc.ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.ja_JP
-	type = sym_link
-}
-./desc.ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.ja_JP
-	type = sym_link
-}
-./ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/share/examples/types/ja_JP
-	type = sym_link
-}
-XCOMM 
-XCOMM  dtimsstart configuration files
-XCOMM 
-programs/dtimsstart/conf/hpux/ja_JP.eucJP
-{ uxp
-	install_target = /usr/dt/config/ims/ja
-}
-programs/dtimsstart/conf/uxp/ja_JP
-{ uxp
-	install_target = /usr/dt/config/ims/ja_JP
-}
-./ja_JP
-{ uxp
-	install_target = /usr/dt/config/ims/ja_JP.U90
-	type = sym_link
-}
-programs/dtimsstart/conf/uxp/xfeoak2
-{ uxp
-	install_target = /usr/dt/config/ims/xfeoak2
-}
-programs/dtimsstart/conf/hpux/xjim
-{ uxp
-	install_target = /usr/dt/config/ims/xjim
-}
-programs/dtimsstart/conf/hpux/atok8
-{ uxp
-	install_target = /usr/dt/config/ims/atok8
-}
-programs/dtimsstart/conf/hpux/vje
-{ uxp
-	install_target = /usr/dt/config/ims/vje
-}
-programs/dtimsstart/conf/hpux/egb
-{ uxp
-	install_target = /usr/dt/config/ims/egb
-}
-programs/dtimsstart/conf/hpux/builtin.jpn
-{ uxp
-	install_target = /usr/dt/config/ims/builtin.jpn
-}
-programs/dtimsstart/conf/hpux/none
-{ uxp
-	install_target = /usr/dt/config/ims/none
-}
-#endif
-#ifdef _KOREAN_
-./ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/app-defaults/ko_KR.5601
-	type = sym_link
-}
-./ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/ko_KR.5601
-	type = sym_link
-}
-./ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/appconfig/types/ko_KR.5601
-	type = sym_link
-}
-./ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/config/ko_KR.5601
-	type = sym_link
-}
-./desc.ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.ko_KR.5601
-	type = sym_link
-}
-./desc.ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.ko_KR.5601
-	type = sym_link
-}
-./ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/share/examples/types/ko_KR.5601
-	type = sym_link
-}
-#endif
-#ifdef _SWEDISH_
-./sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/app-defaults/sv
-	type = sym_link
-}
-./sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/sv
-	type = sym_link
-}
-./sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/appconfig/types/sv
-	type = sym_link
-}
-./sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/config/sv
-	type = sym_link
-}
-./desc.sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.sv
-	type = sym_link
-}
-./desc.sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.sv
-	type = sym_link
-}
-./sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/share/examples/types/sv
-	type = sym_link
-}
-#endif
-#ifdef _CHINESE_
-./zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/app-defaults/zh_CN
-	type = sym_link
-}
-./zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/zh_CN
-	type = sym_link
-}
-./zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/appconfig/types/zh_CN
-	type = sym_link
-}
-./zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/config/zh_CN
-	type = sym_link
-}
-./desc.zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.zh_CN
-	type = sym_link
-}
-./desc.zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.zh_CN
-	type = sym_link
-}
-./zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/share/examples/types/zh_CN
-	type = sym_link
-}
-#endif
-#ifdef _TAIWANESE_
-./zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/app-defaults/zh_TW
-	type = sym_link
-}
-./zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/appconfig/appmanager/zh_TW
-	type = sym_link
-}
-./zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/appconfig/types/zh_TW
-	type = sym_link
-}
-./zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/config/zh_TW
-	type = sym_link
-}
-./desc.zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/share/palettes/desc.zh_TW
-	type = sym_link
-}
-./desc.zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/share/backdrops/desc.zh_TW
-	type = sym_link
-}
-./zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/share/examples/types/zh_TW
-	type = sym_link
-}
-#endif
-#endif /* __uxp__ */
-
 XCOMM ##########################################################################
 XCOMM 
 XCOMM  DEC - Locale and platform specific entries

cde/databases/CDE-MSG-LOC.src

@@ -606,77 +606,6 @@ XCOMM ##########################################################################
 #endif
 #endif /* USL */
 
-XCOMM ##########################################################################
-XCOMM 
-XCOMM  Fujitsu - Locale and platform specific entries
-XCOMM 
-XCOMM ##########################################################################
-#ifdef __uxp__
-#ifdef _GERMAN_
-/usr/dt/lib/nls/msg/de_DE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/de_DE
-	type = sym_link
-}
-#endif
-#ifdef _SPANISH_
-/usr/dt/lib/nls/msg/es_ES.ISO8859-1
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/es
-	type = sym_link
-}
-#endif
-#ifdef _FRENCH_
-/usr/dt/lib/nls/msg/fr_FR.ISO8859-1
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/fr
-	type = sym_link
-}
-#endif
-#ifdef _ITALIAN_
-/usr/dt/lib/nls/msg/it_IT.ISO8859-1
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/it
-	type = sym_link
-}
-#endif
-#ifdef _JAPANESE_
-/usr/dt/lib/nls/msg/ja_JP.dt-eucJP
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/ja_JP
-	type = sym_link
-}
-#endif
-#ifdef _KOREAN_
-/usr/dt/lib/nls/msg/ko_KR.dt-eucKR
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/ko_KR.5601
-	type = sym_link
-}
-#endif
-#ifdef _SWEDISH_
-/usr/dt/lib/nls/msg/sv_SE.ISO8859-1
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/sv
-	type = sym_link
-}
-#endif
-#ifdef _CHINESE_
-/usr/dt/lib/nls/msg/zh_CN.dt-eucCN
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/zh_CN
-	type = sym_link
-}
-#endif
-#ifdef _TAIWANESE_
-/usr/dt/lib/nls/msg/zh_TW.dt-eucTW
-{ uxp
-	install_target = /usr/dt/lib/nls/msg/zh_TW
-	type = sym_link
-}
-#endif
-#endif /* __uxp__ */
-
 XCOMM ###########################################################################
 XCOMM 
 XCOMM  DEC - Locale and platform specific entries

cde/databases/CDE-RUN.udb

@@ -1252,14 +1252,6 @@ programs/dtaction/dtaction
 }
 #
 programs/dtaction/dtaction
-{ uxp
-        install_target = /usr/dt/bin/dtaction
-	owner = root
-	group = sys
-        mode = 06555
-}
-#
-programs/dtaction/dtaction
 { usl
         install_target = /usr/dt/bin/dtaction
 	owner = root

cde/databases/CDE-SHLIBS.src

@@ -804,124 +804,6 @@ lib/DtMmdb/libDtMmdb.so.2.1
 	mode = 0755
 }
 XCOMM 
-XCOMM >>-----------------------------
-XCOMM  UXP libraries
-XCOMM <<-----------------------------
-XCOMM 
-./libXm.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libXm.so.1.2
-	type = sym_link
-}
-XCOMM 
-./libMrm.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libMrm.so.1.2
-	type = sym_link
-}
-XCOMM 
-./libUil.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libUil.so.1.2
-	type = sym_link
-}
-XCOMM 
-lib/DtHelp/libDtHelp.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtHelp.so.2.1
-	mode = 0555
-}
-XCOMM 
-./libDtHelp.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtHelp.so.1
-	type = sym_link
-}
-XCOMM 
-lib/DtPrint/libDtPrint.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtPrint.so.2.1
-	mode = 0555
-}
-XCOMM 
-lib/DtMrm/libDtMrm.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtMrm.so.2.1
-	mode = 0555
-}
-XCOMM 
-lib/DtSvc/libDtSvc.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtSvc.so.2.1
-	mode = 0555
-}
-XCOMM 
-./libDtSvc.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtSvc.so.1
-	type = sym_link
-}
-XCOMM 
-lib/DtWidget/libDtWidget.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtWidget.so.2.1
-	mode = 0555
-}        
-XCOMM 
-./libDtWidget.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtWidget.so.1
-	type = sym_link
-}        
-XCOMM 
-lib/DtTerm/libDtTerm.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtTerm.so.2.1
-	mode = 0555
-}
-XCOMM 
-./libDtTerm.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtTerm.so.1
-	type = sym_link
-}
-XCOMM 
-lib/tt/lib/libtt.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libtt.so.2.1
-	mode = 0755
-}
-XCOMM 
-./libtt.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libtt.so.2
-	type = sym_link
-}
-XCOMM 
-lib/csa/libcsa.so.2.1
-{ uxp
-	install_target = /usr/dt/lib/libcsa.so.2.1
-	mode = 0555
-}
-XCOMM 
-./libcsa.so.2.1
-{ uxp
-	install_target = /usr/dt/lib/libcsa.so.0
-	type = sym_link
-}
-XCOMM 
-lib/DtSearch/libDtSearch.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtSearch.so.2.1
-	mode = 0555
-}
-XCOMM 
-lib/DtMmdb/libDtMmdb.so.2.1
-{ uxp
-        install_target = /usr/dt/lib/libDtMmdb.so.2.1
-	mode = 0755
-}
-XCOMM 
 XCOMM 
 XCOMM >>-----------------------------
 XCOMM  DEC OSF/1 libraries

cde/databases/CDE-TT.udb

@@ -188,12 +188,6 @@ lib/tt/bin/ttdbserverd/rpc.ttdbserver
 	type = sym_link
 }
 #
-/usr/dt/bin/rpc.ttdbserver
-{ uxp
-	install_target = /usr/dt/bin/rpc.ttdbserverd
-	type = sym_link
-}
-#
 lib/tt/bin/tt_type_comp/tt_type_comp
 { default
 	install_target = /usr/dt/bin/tt_type_comp

cde/databases/Imakefile

@@ -21,9 +21,6 @@ UDB_RELEASE_OPT = -ReleaseStream dec
 #ifdef USLArchitecture
 UDB_RELEASE_OPT = -ReleaseStream usl
 #endif
-#ifdef UXPArchitecture
-UDB_RELEASE_OPT = -ReleaseStream uxp
-#endif
 #ifdef LinuxArchitecture
 UDB_RELEASE_OPT = -ReleaseStream linux
 #endif
@@ -41,7 +38,7 @@ UDB_RELEASE_OPT = -ReleaseStream netbsd
  * Insure that symbols used in the .udb files are undefined for
  * pre-processing by cpp.
  */
-UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd
+UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd
 
 
 #define CreateLocalizedFilesets(Locale,Lang,readablename,runfs,helpfs,msgfs,AltLang,HelpLang,ResDB,HelpDB,MsgDB,InfoDB)	@@\

cde/doc/C/man/Imakefile

@@ -1,8 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/20 1996/10/31 09:37:44 rws $
 
-#ifdef UXPArchitecture
-DBOPTS = -c
-#endif
 DBTOMAN = $(CDETOP)/doc/util/dbtoman/dbtoman
 DBENVSETUP = CDETOP=$(CDETOP)
 

cde/examples/dtaction/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:43:31 drk $
-##########################################################################
-#
-#  Makefile for dtdts examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= actions
-SOURCES		= actions.c
-OBJECTS		= actions.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtcalendar/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:44:58 drk $
-##########################################################################
-#
-#  Makefile for dtcalendar examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= attributes
-SOURCES		= attributes.c
-OBJECTS		= attributes.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lcsa
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lnsl
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= -R/usr/dt/lib
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtdnd/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/3 1996/05/13 11:46:45 drk $
-##########################################################################
-#
-#  Makefile for dtdnddemo
-#
-#	UXP Platform 
-#
-#	    (Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Unix System Labs, Inc., a subsidiary of
-#      Novell, Inc.
-##########################################################################
-
-PROGRAM		= dtdnddemo
-SOURCES		= demo.c icon.c text.c file.c buff.c
-OBJECTS		= demo.o icon.o text.o file.o buff.o
-APPDEFAULTS	= Dtdnddemo
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	${CC} -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS) $(APPDEFAULTS)
-	${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	rm -f $(PROGRAM) $(OBJECTS)

cde/examples/dtdts/Makefile.uxp

@@ -1,47 +0,0 @@
-# $XConsortium: Makefile.uxp /main/1 1996/08/23 08:21:04 barstow $
-##########################################################################
-#
-#  Makefile for dtdts examples (UXP)
-#
-# (c) Copyright 1996 Digital Equipment Corporation.
-# (c) Copyright 1996 Hewlett-Packard Company.
-# (c) Copyright 1996 International Business Machines Corp.
-# (c) Copyright 1996 Sun Microsystems, Inc.
-# (c) Copyright 1996 Novell, Inc.
-# (c) Copyright 1996 FUJITSU LIMITED.
-# (c) Copyright 1996 Hitachi.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= datatyping
-SOURCES		= datatyping.c
-OBJECTS		= datatyping.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtscreen/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:49:20 drk $
-##########################################################################
-#
-#  Makefile for dtsession examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= screensaver
-SOURCES		= screensaver.c
-OBJECTS		= screensaver.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm 
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket -lm
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtsession/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:50:42 drk $
-##########################################################################
-#
-#  Makefile for dtsession examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= session
-SOURCES		= session.c
-OBJECTS		= session.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtterm/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:52:00 drk $
-##########################################################################
-#
-#  Makefile for dtterm examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= term
-SOURCES		= term.c
-OBJECTS		= term.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtTerm -lDtHelp -lDtSvc -ltt -lXm 
-X11LIBS		= -L/usr/X/lib -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket -lm
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/examples/dtwidget/Makefile.uxp

@@ -1,54 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:53:20 drk $
-##########################################################################
-#
-#  Makefile for dtwidget examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM1	= controls
-SOURCES1	= controls.c
-OBJECTS1	= controls.o
-
-PROGRAM2	= editor
-SOURCES2	= editor.c
-OBJECTS2	= editor.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtWidget -lDtSvc -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM1) $(PROGRAM2)	
-
-$(PROGRAM1)::	$(OBJECTS1)
-	$(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES)
-
-$(PROGRAM2)::	$(OBJECTS2)
-	$(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM1) $(OBJECTS1)
-	$(RM) $(PROGRAM2) $(OBJECTS2)

cde/examples/dtwsm/Makefile.uxp

@@ -1,54 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 11:54:50 drk $
-##########################################################################
-#
-#  Makefile for dtwidget examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM1	= occupy
-SOURCES1	= occupy.c
-OBJECTS1	= occupy.o
-
-PROGRAM2	= wsinfo
-SOURCES2	= wsinfo.c
-OBJECTS2	= wsinfo.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM1) $(PROGRAM2)	
-
-$(PROGRAM1)::	$(OBJECTS1)
-	$(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES)
-
-$(PROGRAM2)::	$(OBJECTS2)
-	$(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM1) $(OBJECTS1)
-	$(RM) $(PROGRAM2) $(OBJECTS2)

cde/examples/template/Makefile.uxp

@@ -1,111 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 12:02:07 drk $
-##########################################################################
-#
-#  Makefile for template example (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-DTHELPTAG	= dthelptag
-GENCAT		= gencat
-MKDIR		= mkdir -p
-CP		= cp
-CHMODEXE	= chmod a+x
-
-LOCALE		= C
- 
-PACKAGE		= template
-APPGROUPNAME	= template
-PROGRAM		= templatebin
-SOURCES		= template.c
-OBJECTS		= template.o
-HELPSOURCE	= $(LOCALE)/template.htg
-HELPFILE	= $(LOCALE)/template.sdl
-MSGSOURCE	= $(LOCALE)/template.msg
-MSGFILE		= $(LOCALE)/template.cat
-TYPEFILE	= $(LOCALE)/template.dt
-ICONFILES	= \
-		$(LOCALE)/template.t.pm $(LOCALE)/template.t.bm \
-		$(LOCALE)/template.s.pm $(LOCALE)/template.s.bm \
-		$(LOCALE)/template.m.pm $(LOCALE)/template.m.bm \
-		$(LOCALE)/template.l.pm $(LOCALE)/template.l.bm \
-		$(LOCALE)/template_icon.pm $(LOCALE)/template_icon_m.bm \
-		$(LOCALE)/template-brush.bm
-APPDEFAULTSSRC	= $(LOCALE)/Template.ad
-APPDEFAULTS	= $(LOCALE)/Template
-README		= $(LOCALE)/README
-EXAMPLES	= $(LOCALE)/example.template
-ACTIONS		= TemplateNew TemplateOpen TemplatePrint
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -lDtHelp -lDtSvc -lXm -ltt
-X11LIBS		= -L/usr/X/lib -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket -lm
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= -R/usr/dt/lib:/usr/openwin/lib
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-#all::	$(PACKAGE)
-
-$(PACKAGE):: $(PROGRAM) $(HELPFILE) $(MSGFILE) $(APPDEFAULTS) \
-		$(ICONFILES) $(TYPEFILE) $(README) $(EXAMPLES) $(ACTIONS)
-	
-	$(RM) -r $(PACKAGE)
-
-	$(MKDIR) $(PACKAGE)/bin
-	$(MKDIR) $(PACKAGE)/app-defaults/C
-	$(MKDIR) $(PACKAGE)/msg/C
-
-	$(CP) $(PROGRAM) $(PACKAGE)/bin
-	$(CP) $(MSGFILE) $(PACKAGE)/msg/C
-	$(CP) $(APPDEFAULTS) $(PACKAGE)/app-defaults/C
-
-	$(MKDIR) $(PACKAGE)/dt/appconfig/icons/C
-	$(MKDIR) $(PACKAGE)/dt/appconfig/help/C
-	$(MKDIR) $(PACKAGE)/dt/appconfig/types/C
-	$(MKDIR) $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME)
-	
-	$(CP) $(ICONFILES) $(PACKAGE)/dt/appconfig/icons/C
-	$(CP) $(HELPFILE) $(PACKAGE)/dt/appconfig/help/C
-	$(CP) $(TYPEFILE)  $(PACKAGE)/dt/appconfig/types/C
-	$(CP) $(README) $(EXAMPLES) $(ACTIONS) \
-		$(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME)
-
-	$(CHMODEXE) $(ACTIONS) 
-	$(CP) $(ACTIONS) \
-		$(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-$(APPDEFAULTS):: $(APPDEFAULTSSRC)
-	$(CP) $(APPDEFAULTSSRC) $(APPDEFAULTS)
-
-$(HELPFILE)::	$(HELPSOURCE)
-	$(DTHELPTAG) $(HELPSOURCE)
-
-$(MSGFILE)::	$(MSGSOURCE)
-	$(GENCAT) $(MSGFILE) $(MSGSOURCE)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS) $(MSGFILE) $(APPDEFAULTS)
-	$(DTHELPTAG) -clean $(HELPSOURCE)
-	$(RM) -r template

cde/examples/tt/Makefile.uxp

@@ -1,46 +0,0 @@
-# $XConsortium: Makefile.uxp /main/2 1996/05/13 12:03:30 drk $
-##########################################################################
-#
-#  Makefile for ToolTalk examples (UXP)
-#
-#	(Fujitsu.patch applied)
-#
-#  (c) Copyright 1993, 1994 Hewlett-Packard Company	
-#  (c) Copyright 1993, 1994 International Business Machines Corp.
-#  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-#  (c) Copyright 1993, 1994 Novell, Inc.
-#
-##########################################################################
-
-CC		= cc
-RM		= rm -f
-
-PROGRAM		= broadcast
-SOURCES		= broadcast.c
-OBJECTS		= broadcast.o
-
-DEFINES		= 
-CDEBUGFLAGS	= -O
-CFLAGS		= -Xc $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-
-INCLUDES	= $(DTINCLUDE) 
-
-DTLIBS		= -L/usr/dt/lib -ltt -lXm
-X11LIBS		= -lXt -lX11
-SYSLIBS		= -lw -lgen -lnsl -lresolv -lsocket 
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		= 
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	$(RM) $(PROGRAM) $(OBJECTS)

cde/historical/OPENBUGS

@@ -1777,7 +1777,6 @@ Component: Applications         Sub-component: dtmail
 
 CDExc15608 Undocumented function is being used
 CDExc15822 Can not view postscript mail attachmen
-CDExc21726 Dtmail tests fail on Fujitsu because of incorrect keyboard binding
 CDExc23026 Message/openMsg test having trouble with secondary windo
 CDExc23865 Dtmail tests which receive mail need to be updated for POP/IMAP
 CDExc24042 dtmail manual test needs updating
@@ -1831,7 +1830,6 @@ Component: Applications         Sub-component: dtwm
 
 CDExc14722 Appearance of front panel incorrec
 CDExc22338 dtwm does not produce icon box on Digita
-CDExc22347 dtwm test iplacemt1, assertion 3 fails on Fujitsu: probable golden dat
 CDExc22931 dtwm fails to find icon box
 CDExc22944 Icon Box scrolling test failed on IBM platfor
 CDExc23177 dtwm manual tests - updates, correction
@@ -1922,7 +1920,6 @@ CDExc23041 Threadsafe tests fail to run on Digita
 
 Component: DtWidget             Sub-component: DtComboBox            
 
-CDExc20917 Fujitsu DtWidget golden images need updatin
 CDExc22872 IBM DtWidget golden images need updatin
 
 Component: DtWidget             Sub-component: DtEditor              
@@ -2026,7 +2023,6 @@ CDExc23048 TT test mt_test fails on Sun and IBM with TT_ERR_TOOLAT
 Component: ToolTalk             Sub-component: rpc.ttdbserver        
 
 CDExc22329 Tooltalk tests fail on Digital with error: cannot shif
-CDExc22331 ToolTalk tests failing on Fujitsu with error: rpc.ttdbserver not installe
 CDExc22333 ToolTalk tests fail on IBM with error: Memory fault, coredum
 
 Component: Tooltalk             Sub-component:                       

cde/include/EUSCompat.h

@@ -59,7 +59,7 @@ extern "C" {
 ** System V R4 based systems define the stuff we need in
 ** sys/types.h. Include that and then we are done.
 */
-#if defined(HPUX) || defined(linux) || defined(SunOS) || defined(UNIX_SV) || defined(USL) || defined(__uxp__)
+#if defined(HPUX) || defined(linux) || defined(SunOS) || defined(UNIX_SV) || defined(USL)
 #include <sys/types.h>
 #endif
 
@@ -162,7 +162,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 #endif /* AIX */
 
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 
 #include <sys/param.h>
 

cde/lib/DtHelp/CvString.c

@@ -355,7 +355,7 @@ _DtCvFreeArray (void **array)
     return (0);
 }
 
-#if defined(_AIX) || defined (USL) || defined(__uxp__)
+#if defined(_AIX) || defined (USL)
 /*****************************************************************************
  * Function: _DtCvStrCaseCmp
  *

cde/lib/DtHelp/CvStringI.h

@@ -53,7 +53,7 @@
 /*****************************************************************************
  *           Extern defines
  *****************************************************************************/
-#if !defined(_AIX) && !defined(USL) || defined(__uxp__)
+#if !defined(_AIX) && !defined(USL)
 #define _DtCvStrCaseCmp(s1,s2)      strcasecmp(s1,s2)
 #endif /* _AIX  or USL */
 
@@ -78,7 +78,7 @@ extern	void	 *_DtCvStrPtr (
 			int		 type,
 			int		 count);
 
-#if     defined(_AIX) || defined(USL) || defined(__uxp__)
+#if     defined(_AIX) || defined(USL)
 extern  int     _DtCvStrCaseCmp(
 			const char      *s1,
 			const char      *s2);

cde/lib/DtHelp/StringFuncs.c

@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <locale.h>  /* getlocale(), LOCALE_STATUS, LC_xxx */
 
-#if defined(_AIX) || defined(USL) || defined(__uxp__) || defined(CSRG_BASED)
+#if defined(_AIX) || defined(USL) || defined(CSRG_BASED)
 #include <ctype.h>
 #endif
 
@@ -533,7 +533,7 @@ int _DtHelpCeStrHashToKey(
 #endif
 
    extern int strcoll(const char *,const char *);
-#if defined(_AIX) || defined(USL) || defined(__uxp__)
+#if defined(_AIX) || defined(USL)
    extern int _DtHelpCeStrCaseCmp(const char *,const char *);
 #else
    extern int strcasecmp(const char *,const char *);
@@ -553,7 +553,7 @@ int _DtHelpCeStrHashToKey(
 #endif
 
    if (Clang)
-#if defined(_AIX) || defined(USL) || defined(__uxp__)
+#if defined(_AIX) || defined(USL)
      return _DtHelpCeStrCaseCmp;
 #else
      return strcasecmp; 
@@ -1048,7 +1048,7 @@ int _DtHelpCeIconvContextSuitable(
 }
 
 
-#if defined(_AIX) || defined (USL) || defined(__uxp__)
+#if defined(_AIX) || defined (USL)
 /*****************************************************************************
  * Function: _DtHelpCeStrCaseCmp
  *

cde/lib/DtHelp/StringFuncsI.h

@@ -56,7 +56,7 @@ typedef struct _DtHelpCeIconvContextRec * _DtHelpCeIconvContext;
 /****************************************************************************
  *			Semi Public Re-defines
  ****************************************************************************/
-#if !defined(_AIX) && !defined(USL) && !defined(__uxp__)
+#if !defined(_AIX) && !defined(USL)
 #define	_DtHelpCeStrCaseCmp(s1,s2)	strcasecmp(s1,s2)
 #endif /* _AIX  or USL */
 
@@ -223,11 +223,11 @@ extern	int	_DtHelpCeCountChars (
 			int		 max_len,
 			int		*ret_len );
 extern  int	_DtHelpCeFreeStringArray ( char **array);
-#if	defined(_AIX) || defined(USL) || defined(__uxp__)
+#if	defined(_AIX) || defined(USL)
 extern	int	_DtHelpCeStrCaseCmp(
 			const char	*s1,
 			const char	*s2);
-#endif /* _AIX or USL or __uxp__ */
+#endif /* _AIX or USL */
 extern	int	_DtHelpCeStrCaseCmpLatin1(
 			const char	*s1,
 			const char	*s2);

cde/lib/DtHelp/UNIX_Syst.lcx

@@ -1,543 +0,0 @@
-!
-!  (c) Copyright 1993, 1994 Hewlett-Packard Company
-!  (c) Copyright 1993, 1994 International Business Machines Corp.
-!  (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc.
-!  (c) Copyright 1993, 1994 Novell, Inc.
-!
-!!!!!!!!!!!!!! UNIX_System_V Locale-Related Translations !!!!!!!!!!!!!!
-! File:			UNIX_Syst.lcx
-! Default location:	/usr/dt/config/svc/UNIX_Syst.lcx
-! Purpose:
-!    Define the UNIX_System_V (FUJITSU UXP/DS) 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 UNIX_System_V 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
-! Product:	@(#)Cde1
-! Revision:	$XConsortium: UNIX_Syst.lcx /main/2 1996/08/25 02:01:38 cde-fuj $
-! 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>.<version range>.<operation(s)>.<kind>
-!
-! 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.
-!      Because there is no way to turn off a translation marked
-!      with .0. once it is specified, the preferred method of
-!      indicating that a translation is not supported --at the moment--
-!      is just to comment out the translation rather than use .0.
-!
-! Standard values:
-! ================
-! _DtLcx defines the order of the standard values in the
-! translations it utilizes.  All translation specifications
-! must adhere to this order.
-!    <std lang_terr>.<std codeset>.<std modifier>
-! In CDE 1.0, no modifiers are standardized and that
-! portion of the table is unspecified.  This means
-! that no CDE standard modifiers are available across
-! platforms.  Operations that use only the <std codeset>
-! should specify the wildcard character ("?") for the 
-! <std lang_terr> value.
-!
-! Operation-specific value:
-! =========================
-! The operation-specific value is a string that is used
-! according to the kind of translation.  The syntax is
-!      : <op-string>
-! or   :  "<op-string>", 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.
-! 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! uncomment this resource to debug/test translation
-!*debugDtXlate:  True
-
-!!!!!!!!!!!!!!!! UNIX_System_V (FUJITSU UXP/DS) 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 AIX 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.
-!!!
-UNIX_System_V.?.version.<.420:   ".*"		!! any UXP/DS V20 System V 4.2.0
-
-
-!!!!!!!!!!!!!!!! UNIX_System_V (FUJITSU UXP/DS) 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 Sun 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
-UNIX_System_V.420+.setlocale.=.C.ISO-8859-1:     C               ! setlocales compliance           ,IBM, HP, Sun       , USL, UXP
-UNIX_System_V.420+.setlocale.~.POSIX.ISO-8859-1: POSIX           ! setlocales compliance           ,IBM, HP, Sun       , USL, UXP
-
-! W European/Americas, Latin 1 codeset
-! UNIX_System_V.420+.setlocale.>.da_DK.ISO-8859-1:	de         	! Danish, Denmark            XoJIG,IBM, HP,           , USL ("da")
-! UNIX_System_V.420+.setlocale.>.de_AT.ISO-8859-1:	de         	! German,Austria             XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.de_CH.ISO-8859-1:	de         	! German,Switzerland         XoJIG,IBM,   ,           , USL        
-! UNIX_System_V.420+.setlocale.~.de_DE.ISO-8859-1:	de         	! German, Germany            XoJIG,IBM, HP, Sun ("de"), USL ("de")
-! UNIX_System_V.420+.setlocale.>.en_AU.ISO-8859-1:	en         	! English,Australia               ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_AU.ISO-8859-1:	en_US         	! English,Australia               ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_CA.ISO-8859-1:	en         	! English,Canada             XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_CA.ISO-8859-1:	en_US         	! English,Canada             XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_DK.ISO-8859-1:	en         	! English, Denmark           XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_DK.ISO-8859-1:	en_US         	! English, Denmark           XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_GB.ISO-8859-1:	en         	! English, U.K.              XoJIG,IBM, HP,           , USL ("en")
-! UNIX_System_V.420+.setlocale.>.en_GB.ISO-8859-1:	en_US         	! English, U.K.              XoJIG,IBM, HP,           , USL ("en")
-! UNIX_System_V.420+.setlocale.>.en_JP.ISO-8859-1:	en         	! English, Japan             XoJIG,IBM,   ,           , 
-! UNIX_System_V.420+.setlocale.>.en_JP.ISO-8859-1:	en_US         	! English, Japan             XoJIG,IBM,   ,           , 
-! UNIX_System_V.420+.setlocale.>.en_IE.ISO-8859-1:	en         	! English, Ireland           XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_IE.ISO-8859-1:	en_US         	! English, Ireland           XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_MY.ISO-8859-1:	en         	! English,Malaysia                ,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_MY.ISO-8859-1:	en_US         	! English,Malaysia                ,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.en_NZ.ISO-8859-1:	en         	! English,New Zealand             ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_NZ.ISO-8859-1:	en_US         	! English,New Zealand             ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_KR.ISO-8859-1:	en         	! English,Korea                   ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_KR.ISO-8859-1:	en_US         	! English,Korea                   ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_TW.ISO-8859-1:	en         	! English,Taiwan                  ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.en_TW.ISO-8859-1:	en_US         	! English,Taiwan                  ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.~.en_US.ISO-8859-1:	en         	! English, USA               XoJIG,IBM, HP,           , USL
-! UNIX_System_V.420+.setlocale.~.en_US.ISO-8859-1:	en_US         	! English, USA               XoJIG,IBM, HP,           , USL
-
-! UNIX_System_V.420+.setlocale.>.es_AR.ISO-8859-1:	es         	! Spanish, Argentina              ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_AR.ISO-8859-1:	es_AR         	! Spanish, Argentina              ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.>.es_BO.ISO-8859-1:	es         	! Spanish, Bolivia                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_BO.ISO-8859-1:	es_BO         	! Spanish, Bolivia                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.>.es_CL.ISO-8859-1:	es         	! Spanish, Chile                  ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.~.es_CL.ISO-8859-1:	es_CL         	! Spanish, Chile                  ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.>.es_CO.ISO-8859-1:	es         	! Spanish, Columbia               ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_CO.ISO-8859-1:	es_CO         	! Spanish, Columbia               ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.>.es_CR.ISO-8859-1:	es         	! Spanish, Costa Rica             ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_CR.ISO-8859-1:	es_CR         	! Spanish, Costa Rica             ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.>.es_EC.ISO-8859-1:	es         	! Spanish, Ecuador                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_EC.ISO-8859-1:	es_EC         	! Spanish, Ecuador                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_ES.ISO-8859-1:	es         	! Spanish, Spain             XoJIG,IBM, HP, Sun       , USL
-
-! UNIX_System_V.420+.setlocale.>.es_GT.ISO-8859-1:	es         	! Spanish, Guatemala              ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_GT.ISO-8859-1:	es_GT         	! Spanish, Guatemala              ,   ,   , Sun
-
-! UNIX_System_V.420+.setlocale.>.es_MX.ISO-8859-1:	es         	! Spanish, Mexico                 ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.~.es_MX.ISO-8859-1:	es_MX         	! Spanish, Mexico                 ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.>.es_PE.ISO-8859-1:	es         	! Spanish, Peru                   ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_PE.ISO-8859-1:	es_PE         	! Spanish, Peru                   ,   ,   , Sun
-
-! UNIX_System_V.420+.setlocale.>.es_UY.ISO-8859-1:	es         	! Spanish, Uruguay                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.~.es_UY.ISO-8859-1:	es_UY         	! Spanish, Uruguay                ,   ,   , Sun
-! UNIX_System_V.420+.setlocale.>.es_VE.ISO-8859-1:	es         	! Spanish, Venezuela              ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.~.es_VE.ISO-8859-1:	es_VE         	! Spanish, Venezuela              ,   ,   , Sun       , USL
-! UNIX_System_V.420+.setlocale.>.et_EE.ISO-8859-1:			! Estonian, Estonia          XoJIG, 
-! UNIX_System_V.420+.setlocale.>.fi_FI.ISO-8859-1:			! Finnish, Finland           XoJIG,IBM, HP,           , USL ("fi")
-! UNIX_System_V.420+.setlocale.>.fo_FO.ISO-8859-1:			! Faroese, Faeroe Island     XoJIG,
-! UNIX_System_V.420+.setlocale.>.fr_BE.ISO-8859-1:	fr         	! French,Belgium             XoJIG,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.>.fr_CA.ISO-8859-1:	fr         	! French, Canada             XoJIG,IBM, HP,           , USL
-! UNIX_System_V.420+.setlocale.>.fr_CH.ISO-8859-1:	fr         	! French, Switzerland        XoJIG,IBM,   ,           , USL
-! UNIX_System_V.420+.setlocale.~.fr_FR.ISO-8859-1:	fr         	! French, France             XoJIG,IBM, HP, Sun ("fr"), USL ("fr")
-! UNIX_System_V.420+.setlocale.>.is_IS.ISO-8859-1:			! Icelandic, Iceland         XoJIG,IBM, HP,           , USL ("is")
-! UNIX_System_V.420+.setlocale.>.it_CH.ISO-8859-1:	it         	! Italian,Switzerland             ,   ,   ,           , USL        
-! UNIX_System_V.420+.setlocale.~.it_IT.ISO-8859-1:	it         	! Italian, Italy             XoJIG,IBM, HP, Sun ("it"), USL ("it")
-! UNIX_System_V.420+.setlocale.>.kl_GL.ISO-8859-1:			! Greenlandic, Greenland     XoJIG,
-! UNIX_System_V.420+.setlocale.>.lt_LT.ISO-8859-1:			! Lithuanian, Lithuania      XoJIG,
-! UNIX_System_V.420+.setlocale.>.lv_LV.ISO-8859-1:			! Latvian, Latvia            XoJIG,
-! UNIX_System_V.420+.setlocale.>.nl_BE.ISO-8859-1:	ge         	! Dutch, Belgium             XoJIG,IBM,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.nl_BE.ISO-8859-1:	nl_BE         	! Dutch, Belgium             XoJIG,IBM,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.nl_NL.ISO-8859-1:	ge         	! Dutch, The Netherlands     XoJIG,IBM, HP,           , USL ("nl")
-! UNIX_System_V.420+.setlocale.>.nl_NL.ISO-8859-1:	nl         	! Dutch, The Netherlands     XoJIG,IBM, HP,           , USL ("nl")
-! UNIX_System_V.420+.setlocale.>.no_NO.ISO-8859-1:	ge         	! Norwegian, Norway          XoJIG,IBM, HP,           , USL ("no")
-! UNIX_System_V.420+.setlocale.>.no_NO.ISO-8859-1:	no         	! Norwegian, Norway          XoJIG,IBM, HP,           , USL ("no")
-
-! UNIX_System_V.420+.setlocale.>.pt_BR.ISO-8859-1:	es         	! Portuguese,Brazil               ,   ,   ,           , USL
-! UNIX_System_V.420+.setlocale.>.pt_BR.ISO-8859-1:	pt         	! Portuguese,Brazil               ,   ,   ,           , USL
-
-! UNIX_System_V.420+.setlocale.>.pt_PT.ISO-8859-1:	pt         	! Portuguese, Portugal       XoJIG,IBM, HP,           , USL
-! UNIX_System_V.420+.setlocale.>.sv_FI.ISO-8859-1:	sv         	! Swedish, Finland           XoJIG,
-! UNIX_System_V.420+.setlocale.~.sv_SE.ISO-8859-1:	sv         	! Swedish, Sweden            XoJIG,IBM, HP, Sun ("sv"), USL ("sv") 
-
-! E European 
-! UNIX_System_V.420+.setlocale.>.cs_CS.ISO-8859-2: 	cs        		! Czech(1)                        ,IBM, HP
-! UNIX_System_V.420+.setlocale.>.hr_HR.ISO-8859-2:				! Croatian, Croatia               ,IBM
-! UNIX_System_V.420+.setlocale.>.hu_HU.ISO-8859-2:	hu        			! Hungarian, Hungry          XoJIG,IBM, HP
-! UNIX_System_V.420+.setlocale.>.pl_PL.ISO-8859-2:	pl        			! Polish, Poland             XoJIG,IBM, HP 
-! UNIX_System_V.420+.setlocale.>.ro_RO.ISO-8859-2:				! Rumanian, Romania          XoJIG,IBM, HP
-! UNIX_System_V.420+.setlocale.>.sh_YU.ISO-8859-2:				! Serbocroatian, Yugoslavia(1)    ,IBM, HP 
-! UNIX_System_V.420+.setlocale.>.sl_CS.ISO-8859-2:				! Slovenian                       ,   , HP
-! UNIX_System_V.420+.setlocale.>.si_SI.ISO-8859-2: 			! Slovenian                       ,IBM, 
-! UNIX_System_V.420+.setlocale.>.sk_SK.ISO-8859-2: 			! Slovak                          ,IBM
-
-! Cyrillic 
-! UNIX_System_V.420+.setlocale.>.bg_BG.ISO-8859-5:				! Bulgarian, Bulgaria             ,IBM, HP
-! UNIX_System_V.420+.setlocale.>.mk_MK.ISO-8859-5: 			! Macedonian                      ,IBM
-! UNIX_System_V.420+.setlocale.>.ru_RU.ISO-8859-5:	ru        			! Russian(1)                      ,IBM, 
-! UNIX_System_V.420+.setlocale.>.ru_SU.ISO-8859-5:				! Russian(1)                      ,   , HP
-! UNIX_System_V.420+.setlocale.>.sp_YU.ISO-8859-5: 			! Serbian,Yugoslavia(1)           ,IBM
-
-! Arabic 
-! UNIX_System_V.420+.setlocale.>.ar_DZ.ISO-8859-6:				! Arabic(2)                       ,   , HP
-! UNIX_System_V.420+.setlocale.>.ar_SA.ISO-8859-6:				! Arabic(2)                       ,   , HP
-
-! Hebrew 
-! UNIX_System_V.420+.setlocale.>.iw_IL.ISO-8859-8:				! Hebrew, Israel                  ,IBM, HP
-
-! Greek 
-! UNIX_System_V.420+.setlocale.>.el_GR.ISO-8859-7:				! Greek, Greece                   ,IBM, HP
-
-! Turkish 
-! UNIX_System_V.420+.setlocale.>.tr_TR.ISO-8859-9:				! Turkish, Turkey                 ,IBM, HP
-
-! East Asia 
-UNIX_System_V.420+.setlocale.~.ja_JP.EUC-JP:	ja_JP			! Japanese, Japan                 ,IBM, HP, Sun ("ja"), USL, UXP
-UNIX_System_V.420+.setlocale.=.ja_JP.EUC-JP:	ja_JP.U90		! Japanese, Japan                 ,IBM, HP, Sun ("ja"), USL, UXP
-UNIX_System_V.420+.setlocale.=.ja_JP.SJIS:	ja_JP.SJIS		! Japanese, Japan                 ,IBM, HP, Sun ("ja"), USL, UXP
-! UNIX_System_V.420+.setlocale.~.ko_KR.EUC-KR:	ko			! Korean, Korea                   ,IBM, HP, Sun ("ko"), USL
-! UNIX_System_V.420+.setlocale.~.zh_CN.EUC-CN:	zh			! Chinese, China                  ,IBM,   , Sun ("zh"), USL
-! UNIX_System_V.420.setlocale.~.zh_TW.EUC-TW:	zh_TW			! Chinese, Taiwan                 ,IBM, HP, Sun       , USL
-! UNIX_System_V.420+.setlocale.~.zh_TW.EUC-TW:	zh_TW			! Chinese, Taiwan                 ,IBM, HP, Sun       , USL
-! UNIX_System_V.420+.setlocale.>.zh_CN.HP-15CN:	zh			! Chinese, China                  ,   , HP
-! UNIX_System_V.420+.setlocale.0.zh_TW.HP-BIG5:		 		! Chinese, Taiwan                 ,   , HP,           , 
-! UNIX_System_V.420+.setlocale.>.zh_TW.HP-CCDC:				! Chinese, Taiwan                 ,   , HP,           , 
-! UNIX_System_V.420+.setlocale.>.ja_JP.HP-SJIS:     				! Japanese, Japan aka japanese 15 ,   , HP,
-! UNIX_System_V.420+.setlocale.>.ja_JP.HP-KANA8:  				! Japanese, Japan ,   , HP,           ,
-
-! Thai 
-! UNIX_System_V.420+.setlocale.>.th_TH.TIS-620:				! Thai, Thailand                  ,IBM, HP
-
-! codesets supported for iconv(1); iconv(3) & nl_langinfo not supported
-UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-1:     ISO-8859-1
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-2:     ISO8859-2
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-5:     ISO8859-5
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-6:     ISO8859-6
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-7:     ISO8859-7
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-8:     ISO8859-8
-! UNIX_System_V.420+.iconv1,iconv3.=.?.ISO-8859-9:     ISO8859-9
-! UNIX_System_V.420+.iconv1,iconv3.=.?.EUC-KR:         IBM-eucKR
-UNIX_System_V.420+.iconv1,iconv3.=.?.EUC-JP:         eucJP
-UNIX_System_V.420+.iconv1,iconv3.~.ja_JP.SJIS:       SJIS
-! UNIX_System_V.420+.iconv1,iconv3.=.?.EUC-TW:         IBM-eucTW
-! UNIX_System_V.420+.iconv1,iconv3.=.?.EUC-CN:         IBM-eucCN
-! UNIX_System_V.420+.iconv1,iconv3.>.?.HP-15CN:        IBM-eucCN
-! UNIX_System_V.420+.iconv1,iconv3.=.?.IBM-437:        IBM-437
-! UNIX_System_V.420+.iconv1,iconv3.=.?.IBM-850:        IBM-850
-! UNIX_System_V.420+.iconv1,iconv3.=.?.IBM-856:        IBM-856
-! UNIX_System_V.420+.iconv1,iconv3.=.?.IBM-932:        IBM-932
-! UNIX_System_V.420+.iconv1,iconv3.>.?.HP-SJIS:        IBM-932
-! UNIX_System_V.420+.iconv1,iconv3.=.?.IBM-1046:       IBM-1046
-! UNIX_System_V.420+.iconv1,iconv3.=.?.UTF-8:          UTF-8           
-UNIX_System_V.420+.iconv1,iconv3.>.?.ISO-2022-JP:    ISO-2022-JP
-! UNIX_System_V.420+.iconv1,iconv3.>.?.ISO-2022-KR:                         fold7
-! UNIX_System_V.420+.iconv1,iconv3.>.?.ISO-2022-TW:                         fold7
-! UNIX_System_V.420+.iconv1,iconv3.>.?.ISO-2022-CN:                         fold7
-! UNIX_System_V.420+.iconv1,iconv3.>.?.HP-BIG5:                         big5
-! UNIX_System_V.420+.iconv1,iconv3.>.?.TIS-620:                         TIS-620
-
-! codesets not supported by UNIX_System_V iconv(1)
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-2:
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-5:
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-6:
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-7:
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.ISO-8859-9:
-! UNIX_System_V.?.iconv1,iconv3.~.?.IBM-437:
-! UNIX_System_V.?.iconv1,iconv3.~.?.IBM-850:
-! UNIX_System_V.?.iconv1,iconv3.~.?.IBM-856:
-! UNIX_System_V.?.iconv1,iconv3.~.?.IBM-1046:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-ARABIC8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-GREEK8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-HEBREW8
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-ROMAN8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-TURKISH8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.TIS-620:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-KANA8:
-! UNIX_System_V.?.iconv1,iconv3.~.?.HP-CCDC:
-! UNIX_System_V.?.iconv1,iconv3.~.?.UCS-2:
-
-! multibyte codesets 
-! This translation provides an alternative to a call to
-! using setlocale() and MB_CUR_MAX to determine this.
-! UNIX_System_V.420+.multibyte.=.?.EUC-KR:	2
-UNIX_System_V.420+.multibyte.=.?.EUC-JP:	2
-UNIX_System_V.420+.multibyte.=.?.SJIS:		2
-! UNIX_System_V.420+.multibyte.=.?.EUC-TW:	4
-! UNIX_System_V.420+.multibyte.=.?.EUC-CN:	2
-! UNIX_System_V.?.multibyte.~.?.HP-SJIS:	2
-! UNIX_System_V.?.multibyte.~.?.IBM-932:	2
-! UNIX_System_V.?.multibyte.~.?.HP-CCDC:	2
-! UNIX_System_V.?.multibyte.~.?.HP-BIG5:	2
-! UNIX_System_V.?.multibyte.~.?.TIS-620:	2
-! UNIX_System_V.?.multibyte.~.?.HP-15CN:	2
-
-
-! Translations from predefined CCDF-locales to CDE Standard Locales
-! UNIX_System_V.?.ccdf.=.?.HP-ROMAN8:    	hp-roman8
-! UNIX_System_V.?.ccdf.=.?.ISO-8859-1:	iso8859-1
-! UNIX_System_V.?.ccdf.=.ko_KR.EUC-KR:	hp-korean15
-! UNIX_System_V.?.ccdf.=.ja_JP.HP-SJIS:	hp-japanese15
-! UNIX_System_V.?.ccdf.=.?.DT-SYMBOL-1:	symbol        !!! standard Dt symbol font
-
-! These CDE standard locales may have CCDF-locales, but they are defined by localizers
-! UNIX_System_V.?.ccdf.=.ar_SA.HP-ARABIC8:	arabic8
-! UNIX_System_V.?.ccdf.=.el_GR.HP-GREEK8:	greek8
-! UNIX_System_V.?.ccdf.=.iw_IL.HP-HEBREW8:	hebrew8
-! UNIX_System_V.?.ccdf.=.tr_TR.HP-TURKISH8:	turkish8
-! UNIX_System_V.?.ccdf.<.ja_JP.HP-SJIS:		sjis
-! UNIX_System_V.?.ccdf.=.ja_JP.HP-KANA8:	kana8
-! UNIX_System_V.?.ccdf.<.ja_JP.EUC-JP:		ujis
-! UNIX_System_V.?.ccdf.=.zh_CN.HP-CCDC:		roc15		
-
-
-! Codesets that require multibyte parsing to avoid confusion with shell special chars
-! Sun doesn't have these codesets
-! UNIX_System_V.?.dtkshSpecialParse.=.ja_JP.HP-SJIS:	True
-! UNIX_System_V.?.dtkshSpecialParse.=.ja_JP.IBM-932:	True
-! UNIX_System_V.?.dtkshSpecialParse.=.zh_TW.HP-BIG5:	True
-! UNIX_System_V.?.dtkshSpecialParse.=.zh_TW.HP-CCDC:	True
-! UNIX_System_V.?.dtkshSpecialParse.=.zh_TW.EUC-TW:	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 ISO-2022-JP
-!! before it is sent.
-UNIX_System_V.420+.interchangeCodeset.~.?.ISO-8859-1:	ISO-8859-1	! ISO Latin 1
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-ROMAN8:	ISO-8859-1	! HP Roman8 
-! UNIX_System_V.?.interchangeCodeset.>.?.IBM-437:	ISO-8859-1	! PC (US)
-! UNIX_System_V.?.interchangeCodeset.>.?.IBM-850:	ISO-8859-1	! PC (Multi-lingual)
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-2:	ISO-8859-2	! ISO Latin 2
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-5:	ISO-8859-5	! ISO Latin/Cyrillic
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-6:	ISO-8859-6	! ISO Latin/Arabic
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-ARABIC8:	ISO-8859-6	! HP Arabic8
-! UNIX_System_V.?.interchangeCodeset.>.?.IBM-1046:	ISO-8859-6	! PC Arabic Code Set
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-8:	ISO-8859-8	! ISO Latin/Hebrew
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-HEBREW8:	ISO-8859-8	! HP Hebrew8
-! UNIX_System_V.?.interchangeCodeset.>.?.IBM-856:	ISO-8859-7	! PC Hebrew
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-7:	ISO-8859-7	! ISO Latin/Greek
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-GREEK8:	ISO-8859-7	! HP Greek8
-! UNIX_System_V.?.interchangeCodeset.~.?.ISO-8859-9:	ISO-8859-9	! ISO Latin 5
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-TURKISH8:	ISO-8859-9	! HP Turkish8
-UNIX_System_V.420+.interchangeCodeset.~.?.EUC-JP:	ISO-2022-JP	! Japanese EUC
-! Add the following line -- hack to see if "japanese" works
-UNIX_System_V.420+.interchangeCodeset.=.?.EUC-JP:	ISO-2022-JP	! Japanese EUC
-UNIX_System_V.420+.interchangeCodeset.~.?.ja_JP.SJIS:	ja_JP.SJIS	! Japanese EUC
-UNIX_System_V.420+.interchangeCodeset.~.?.ISO-2022-JP:	ISO-2022-JP	! Japanese EUC
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-SJIS:	ISO-2022-JP	! HP Japanese Shift JIS
-! UNIX_System_V.?.interchangeCodeset.>.?.IBM-932:	ISO-2022-JP	! PC Japanese Shift JIS
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-KANA8:	ISO-2022-JP	! HP Japanese Katakana8
-! UNIX_System_V.?.interchangeCodeset.~.?.EUC-KR:		ISO-2022-KR	! Korean EUC
-! UNIX_System_V.?.interchangeCodeset.~.?.EUC-CN:		ISO-2022-CN	! China Chinese EUC
-! UNIX_System_V.?.interchangeCodeset.~.?.EUC-TW:		ISO-2022-TW	! Taiwan Chinese EUC
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-BIG5:	ISO-2022-TW	! HP Big5 Chinese
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-CCDC:	ISO-2022-TW	! HP CCDC Chinese 
-! UNIX_System_V.?.interchangeCodeset.>.?.HP-15CN:	ISO-2022-CN 	! HP Chinese EUC
-! UNIX_System_V.?.interchangeCodeset.~.?.TIS-620:		TIS-620		! Thai
-! UNIX_System_V.?.interchangeCodeset.>.?.UCS-2:		UTF-8		! Unicode
-! UNIX_System_V.?.interchangeCodeset.~.?.UTF-8:		UTF-8		! 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).
-UNIX_System_V.?.mime.~.?.ISO-8859-1:      ISO-8859-1      ! ISO Latin 1
-UNIX_System_V.?.mime.~.?.HP-ROMAN8:       X-HP-ROMAN8     ! HP Roman8 
-UNIX_System_V.?.mime.~.?.IBM-437:         X-IBM-437       ! PC (US)
-UNIX_System_V.?.mime.~.?.IBM-850:         X-IBM-850       ! PC (Multi-lingual)
-UNIX_System_V.?.mime.~.?.ISO-8859-2:      ISO-8859-2      ! ISO Latin 2
-UNIX_System_V.?.mime.~.?.ISO-8859-5:      ISO-8859-5      ! ISO Latin/Cyrillic
-UNIX_System_V.?.mime.~.?.ISO-8859-6:      ISO-8859-6      ! ISO Latin/Arabic
-UNIX_System_V.?.mime.~.?.HP-ARABIC8:      X-HP-ARABIC8    ! HP Arabic8
-UNIX_System_V.?.mime.~.?.IBM-1046:        X-IBM-1046      ! PC Arabic Code Set
-UNIX_System_V.?.mime.~.?.ISO-8859-8:      ISO-8859-8      ! ISO Latin/Hebrew
-UNIX_System_V.?.mime.~.?.HP-HEBREW8:      X-HP-HEBREW8    ! HP Hebrew8
-UNIX_System_V.?.mime.~.?.IBM-856:         X-IBM-856       ! PC Hebrew
-UNIX_System_V.?.mime.~.?.ISO-8859-7:      ISO-8859-7      ! ISO Latin/Greek
-UNIX_System_V.?.mime.~.?.HP-GREEK8:       X-HP-GREEK8     ! HP Greek8
-UNIX_System_V.?.mime.~.?.ISO-8859-9:      ISO-8859-9      ! ISO Latin 5
-UNIX_System_V.?.mime.~.?.HP-TURKISH8:     X-HP-TURKISH8   ! HP Turkish8
-UNIX_System_V.?.mime.~.?.EUC-JP:          X-EUC-JP        ! Japanese EUC
-UNIX_System_V.?.mime.~.?.ISO-2022-JP:     ISO-2022-JP     ! Japanese JIS with 7-bit encoding per ISO-2022-JP
-UNIX_System_V.?.mime.~.?.HP-SJIS:         X-HP-SJIS       ! HP Japanese Shift JIS
-UNIX_System_V.?.mime.~.?.IBM-932:         X-IBM-932       ! PC Japanese Shift JIS
-UNIX_System_V.?.mime.~.?.HP-KANA8:        X-HP-KANA8      ! HP Japanese Katakana8
-UNIX_System_V.?.mime.~.?.EUC-KR:          X-EUC-KR        ! Korean EUC
-UNIX_System_V.?.mime.~.?.ISO-2022-KR:     ISO-2022-KR     ! Korean with 7-bit encoding per ISO-2022-KR
-UNIX_System_V.?.mime.~.?.EUC-CN:          X-EUC-CN        ! China Chinese EUC
-UNIX_System_V.?.mime.~.?.ISO-2022-CN:     ISO-2022-CN     ! China Chinese with 7-bit encoding per ISO-2022-CN
-UNIX_System_V.?.mime.~.?.HP-15CN:         X-HP-15CN       ! HP China Chinese EUC
-UNIX_System_V.?.mime.~.?.EUC-TW:          X-EUC-TW        ! Taiwan Chinese EUC
-UNIX_System_V.?.mime.~.?.ISO-2022-TW:     ISO-2022-TW     ! Taiwan Chinese with 7-bit encoding per ISO-2022-TW
-UNIX_System_V.?.mime.~.?.HP-BIG5:         X-HP-BIG5       ! HP Big5 Taiwan Chinese
-UNIX_System_V.?.mime.~.?.HP-CCDC:         X-HP-CCDC       ! HP CCDC Taiwan Chinese 
-UNIX_System_V.?.mime.~.?.TIS-620:         X-TIS-620       ! Thai
-UNIX_System_V.?.mime.~.?.UCS-2:           X-UCS-2         ! Unicode; group 0, plane 0 of ISO-10646
-UNIX_System_V.?.mime.~.?.UCS-4:           X-UCS-4         ! ISO-10646
-UNIX_System_V.?.mime.~.?.UTF-7:           X-UTF-7         ! multibyte encoding of Unicode 
-UNIX_System_V.?.mime.~.?.UTF-8:           X-UTF-8         ! multibyte encoding of Unicode 
-UNIX_System_V.?.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 <platform>.lcx file in the /etc/dt/config/svc 
-!! or $HOME/.dt/config/svc directories.  Such translations should read:
-!! <platform>.100+.mime.<.?.<CDE std codeset>: <mailer identifier for the codeset>
-!!
-!! ***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.
-UNIX_System_V.?.mime.<.?.ISO-8859-1:      us-ascii        ! ISO Latin 1
-UNIX_System_V.?.mime.<.?.ISO-8859-1:      US-ASCII        ! ISO Latin 1
-

cde/lib/DtSearch/raima/Imakefile

@@ -19,10 +19,6 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE -D_XOPEN_SOURCE
 EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE
 #endif
 
-#ifdef UXPArchitecture
-EXTRA_DEFINES = -D_XOPEN_SOURCE
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
 #endif

cde/lib/DtSvc/DtEncap/pty.c

@@ -1068,7 +1068,7 @@ int SPC_Setpgrp(int read_current_termio)
     return(SPC_ERROR);
   }
 
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL)
   if(tcsetattr(setpgrp_wire->fd[SLAVE_SIDE], TCSANOW, XeTermioStruct)==ERROR) {
     SPC_Error(SPC_Bad_tc_Call,(XeString)"tcsetattr");
     _DtSvcProcessUnlock();

cde/lib/DtSvc/DtUtil1/CmdMain.c

@@ -1030,7 +1030,7 @@ _DtCmdCommandInvokerExecute (
 #ifdef _SUN_OS
              open_max = NOFILE;
 #else
-#if defined(USL) || defined(__uxp__) || defined(_AIX)
+#if defined(USL) || defined(_AIX)
              open_max = FOPEN_MAX;
 #else
              open_max = FD_SETSIZE;

cde/lib/DtSvc/DtUtil1/CmdProcess.c

@@ -41,7 +41,7 @@
 #include <Dt/ActionUtilP.h>
 #include "myassertP.h"
 
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 #include <limits.h>
 #endif 
 

cde/lib/DtSvc/DtUtil1/DbLoad.c

@@ -53,7 +53,7 @@
 #include <ndir.h>
 #else
 
-#if defined(sun) || defined(USL) || defined(sco) || defined(__uxp__)
+#if defined(sun) || defined(USL) || defined(sco)
 #include <dirent.h>
 #else
 #include <sys/dir.h>

cde/lib/DtSvc/DtUtil1/DtsInit.c

@@ -51,7 +51,7 @@
 #include <ndir.h>
 #else
 
-#if defined(sun) || defined(USL) || defined(sco) || defined(__uxp__)
+#if defined(sun) || defined(USL) || defined(sco)
 #include <dirent.h>
 #else
 #include <sys/dir.h>

cde/lib/DtSvc/DtUtil2/FileUtil.c

@@ -40,7 +40,7 @@
 #ifdef __hpux
 #include <ndir.h>		/* opendir(), directory(3C) */
 #else
-#if defined(sun) || defined(USL) || defined(sco) || defined(__uxp__)
+#if defined(sun) || defined(USL) || defined(sco)
 #include <dirent.h>		/* opendir(), directory(3C) */
 #else
 #include <sys/dir.h>

cde/lib/DtSvc/DtUtil2/Utility.c

@@ -38,7 +38,7 @@
 #ifdef __hpux
 #include <ndir.h>
 #else
-#if defined(sun) || defined(USL) || defined(sco) || defined(__uxp__)
+#if defined(sun) || defined(USL) || defined(sco)
 #include <dirent.h>
 #else
 #include <sys/dir.h>

cde/lib/DtSvc/DtUtil2/XlationSvc.c

@@ -54,7 +54,7 @@ $END$
 #endif
 #include <langinfo.h>       
 
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 #include <regexpr.h>          /* for compile,advance */
 #else
 #include <regex.h>            /* for regcomp,regexec */
@@ -125,7 +125,7 @@ typedef enum {
    __DtXLATE_TYPE_CONTAINS = 4
 } __DtXlateType;
 
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 /* Sun doesn't support regcomp() and regexec() yet, so
    define this here and fill it will the results of advance() */
 typedef struct regmatch_t {
@@ -1127,7 +1127,7 @@ Boolean CheckSearchOpValueMatchesSpec(
        value or do a pure match */
     if (srchData->curTransType == __DtXLATE_TYPE_REGEX)
     {
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
         char *     ex = NULL;
 
         /* True: leave escape char in place */
@@ -2199,7 +2199,7 @@ int _DtXlateGetXlateEnv(
    /* then look up version number of execution host */
    if (ret_AppExecEnvVersion) 
    {
-#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(sun) || defined(_AIX) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
       char version[SYS_NMLN+SYS_NMLN+2];
 #else
       char version[UTSLEN+UTSLEN+2];

cde/lib/DtSvc/include/bms/sbport.h

@@ -230,7 +230,7 @@
 #   ifdef __sun
 #      include <sys/time.h>
 #   endif
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #      include <sys/time.h>
 #   endif
 #   ifdef __apollo
@@ -255,7 +255,7 @@
 #       include <sys/select.h>
 #   endif
 /*
-#   if defined(USL) || defined(__uxp__)
+#   if defined(USL)
 #       include <sys/select.h>
 #   endif
 */
@@ -293,7 +293,7 @@
 /* about above.  So, declare them only if we don't already have them */
 /* ----------------------------------------------------------------- */
 
-#if defined(_HPUX_SOURCE) || defined(__sun) || defined(USL) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(_HPUX_SOURCE) || defined(__sun) || defined(USL) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux)
        /* the "u_types" are defined in standard files */
 #      undef _INCLUDE_BSD_SOURCE
 #else

cde/lib/DtSvc/include/codelibs/dynarray.h

@@ -39,7 +39,7 @@
 #if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #endif
-#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
+#if defined(USL) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #define _DELETE_ARRAY(sz) delete[]
 #else
 #define _DELETE_ARRAY(sz) delete[(sz)]

cde/lib/DtSvc/include/codelibs/mbstring.h

@@ -32,7 +32,7 @@
 #ifndef	__MBSTRING_H_
 #define	__MBSTRING_H_
 
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #include <stdlib.h>
 #endif
 

cde/lib/DtSvc/include/codelibs/stringx.h

@@ -125,14 +125,14 @@ extern size_t     nl_strlen();		/* __OBSOLETE */
 #if defined(__cplusplus)
 }
 
-#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(apollo) || defined(__aix) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>
 #endif /* apollo */
 
 inline char *strnew(size_t len) { return (char*)malloc(len + 1); }
-#if defined(sun) || defined(__sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(__sun) || defined(USL)
 inline void  strfree(const char *s)
 	{ if (s != NULL) free((char *)s); }
 #else

cde/lib/DtTerm/Term/TermParse.c

@@ -67,7 +67,7 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"
 #include  <values.h>
 #endif
 
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #include <ctype.h>
 #include <wctype.h>
 #endif

cde/lib/DtTerm/TermPrim/Imakefile

@@ -106,10 +106,6 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 #endif
 
-#ifdef UXPArchitecture
-LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
-#endif
-
 #ifdef BSDArchitecture
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
 #endif

cde/lib/DtTerm/TermPrim/TermHeader.h

@@ -44,7 +44,7 @@
 #include <Xm/Xm.h>
 #include <X11/Xos.h>
 
-#if defined(linux) || defined(UXPArchitecture) || (defined(USL) && (OSMAJORVERSION > 1)) || defined(CSRG_BASED)
+#if defined(linux) || (defined(USL) && (OSMAJORVERSION > 1)) || defined(CSRG_BASED)
 #define _NFILE   FOPEN_MAX
 #endif
 

cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h

@@ -132,12 +132,5 @@
 # define USE_TCSENDBREAK	/* use tiocbreak()		*/
 #endif	/* USL_ARCHITECTURE */
 
-#ifdef	UXP_ARCHITECTURE
-# define XOR_CAPS_LOCK		/* xor caps lock and shift	*/
-# define USE_STREAMS		/* use streams			*/
-# define USE_STREAMS_TTCOMPAT	/* use ttcompat streams mod	*/
-# define USE_TCSENDBREAK	/* use tiocbreak()		*/
-#endif	/* UXP_ARCHITECTURE */
-
 #endif	/* _Dt_TermPrimOSDepI_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif... */

cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c

@@ -390,14 +390,14 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
 	(void) strncpy(utPtr->ut_id, utmpLine,
 		sizeof(utPtr->ut_id));
 #else	/* __AIX || __osf__ */
-#if defined(linux) || defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(linux) || defined(sun) || defined(USL)
 	if (c = strchr(utmpLine, '/')) {
 	    c++;
 	} else {
 	    c = utmpLine;
 	}
 	(void) strncpy(utPtr->ut_id, c, sizeof(utPtr->ut_id));
-#else	/* linux || sun  || USL || __uxp__ */
+#else	/* linux || sun  || USL */
 	error out -- missing code for utPtr->ut_id
 #endif	/* sun */
 #endif	/* __AIX || __osf__ */

cde/lib/DtWidget/Editor.c

@@ -55,9 +55,6 @@
 
 #if defined(__hpux) || defined(__osf__) || defined(USL)
 # include <wchar.h>
-#elif defined(__uxp__)
-# include <widec.h>
-# include <wctype.h>
 #elif defined(sun)
 # if (_XOPEN_VERSION==3)
 #  include <wctype.h>
@@ -787,23 +784,11 @@ static XtActionsRec EditorActionTable[] = {
    static wctype_t _DtEditor_blankClass;
 #else
 #  define wctype_t 	int
-#   if defined(__uxp__)
-#      if (OSMAJORVERSION < 2)
-         typedef long wint_t ;
-#      endif
-#      define WEOF (-1)
-#   endif /* uxp */
 
 #  define iswblank(a)	iswspace(a)
-#     if !defined(__uxp__) 
 #  define iswctype(a,b)	_iswctype(a,b)
-#     endif
-#     if defined(__uxp__)
-#	  define wcwidth(a)	scrwidth(a)
-#     else
 #  define wcwidth(a)	sun_wcwidth(a)
-#     endif 
+#endif /* not sun */
-#endif /* not sun and not uxp */
 
 #define	MAXTABSIZE 100			/* max legal tabsize	*/
 
@@ -1390,7 +1375,7 @@ WidgetClass dtEditorWidgetClass = (WidgetClass) &dtEditorClassRec;
 static void
 ClassInitialize(void)
 {
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) && !defined(__uxp__)
+#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
   _DtEditor_blankClass = wctype(blankString);
 
   /*
@@ -5260,7 +5245,7 @@ lineBlank(
 	byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++)
     {
 	(void) mbtowc(&wc, &pLine[byteNum], mbCurMax);
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) && !defined(__uxp__)
+#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
 	if( !iswctype(wc, _DtEditor_blankClass) )
 	    return False;
 #else
@@ -5284,7 +5269,7 @@ findNonBlank(
 	byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++)
     {
 	(void) mbtowc(&wc, &pLine[byteNum], mbCurMax);
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) && !defined(__uxp__)
+#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
 	if( !iswctype(wc, _DtEditor_blankClass) )
             return &pLine[byteNum];
 #else
@@ -5341,7 +5326,7 @@ countBlanks(
 	        count++; /* multibyte control chars??? */
 	    continue;
 	}
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) && !defined(__uxp__)
+#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
 	if(!iswctype(wc, _DtEditor_blankClass))
             return count;
 #else

cde/lib/csa/agent.c

@@ -37,14 +37,14 @@
 #if !defined(linux) && !defined(CSRG_BASED)
 # include <poll.h>
 #endif
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 #include <netconfig.h>
 #include <netdir.h>
 #else
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
-#endif /* SunOS || USL || __uxp__ */
+#endif /* SunOS || USL */
 #include <X11/Intrinsic.h>
 
 #include "agent.h"
@@ -78,7 +78,7 @@ static int	mapped = 0;
 /******************************************************************************
  * forward declaration of static functions used within the file
  ******************************************************************************/
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 static u_long gettransient (u_long version);
 #else
 static u_long gettransient (int proto, u_long vers, int *sockp);
@@ -104,13 +104,13 @@ _DtCm_init_agent()
 {
 	int 		s = RPC_ANYSOCK;
 
-#if defined(SunOS) && SunOS < 55 || defined(USL) || defined(__uxp__)
+#if defined(SunOS) && SunOS < 55 || defined(USL)
 	extern boolean_t rpc_reg(const u_long, const u_long, const u_long,
 		const char *(*)(), const xdrproc_t, const xdrproc_t,
 		const char *);
 #endif
 
-#if defined(SunOS) || defined(USL)|| defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 	extern void (*sigset(int, void (*)(int)))(int);
 #else
 	extern void (*sigset())();
@@ -122,7 +122,7 @@ _DtCm_init_agent()
 
 	DP(("libdtcm: _DtCm_init_agent\n"));
 
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 	(void)rpcb_unset(_DtCm_transient, AGENTVERS, NULL);
 	if ((_DtCm_transient = gettransient((u_long)1)) == 0) {
 		_DtCm_print_errmsg("Cannot get transient program number\n");
@@ -168,7 +168,7 @@ _DtCm_init_agent()
 		_DtCm_print_errmsg("Callback cannot be enabled.\n");
 	}
 
-#endif /* SunOS || USL || __uxp__ */
+#endif /* SunOS || USL */
  
 	/* locking candidate for MT-safe purpose */
 	mapped = 1;
@@ -185,13 +185,13 @@ _DtCm_destroy_agent()
 
 	DP(("libdtcm: _DtCm_destroy_agent\n"));
 
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
         (void) rpcb_unset(_DtCm_transient, AGENTVERS, NULL);
         (void) rpcb_unset(_DtCm_transient, AGENTVERS_2, NULL);
 #else
         (void) pmap_unset(_DtCm_transient, AGENTVERS);
         (void) pmap_unset(_DtCm_transient, AGENTVERS_2);
-#endif /* SunOS || USL || __uxp__ */
+#endif /* SunOS || USL */
 
 	/* locking candidate for MT-safe purpose */
 	mapped = 0;
@@ -362,7 +362,7 @@ cmcb_update_callback_2_svc(cmcb_update_callback_args *args, struct svc_req *d)
 /*
  * get transient program number for callbacks.
  */
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 static u_long
 gettransient (u_long version)
 {
@@ -406,7 +406,7 @@ gettransient (u_long version)
 	return prognum;
 }
 
-#else /* SunOS || USL || __uxp__ */
+#else /* SunOS || USL */
 
 static u_long
 gettransient (int proto, u_long vers, int *sockp)
@@ -457,7 +457,7 @@ gettransient (int proto, u_long vers, int *sockp)
 	return (prognum-1);
 }
 
-#endif /* not SunOS || USL || __uxp__ */
+#endif /* not SunOS || USL */
 
 static void
 _DtCm_handle_callback()

cde/lib/csa/connection.c

@@ -113,7 +113,7 @@ _DtCm_create_udp_client(
 		return (CSA_SUCCESS);
 	}
 
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 	cl = clnt_create_vers(host, TABLEPROG, 
 		&vers_out, TABLEVERS_2, version, "udp");
 	if (cl==NULL) {
@@ -208,7 +208,7 @@ _DtCm_create_tcp_client(
 		return (CSA_SUCCESS);
 	} else {
 		/* create tcp connection */
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 		cl = clnt_create_vers(host, TABLEPROG, &vers_out,
 			TABLEVERS_2, version, "tcp");
 #else
@@ -438,7 +438,7 @@ extern CSA_return_code
 _DtCm_clntstat_to_csastat(enum clnt_stat clntstat)
 {
 	switch (clntstat) {
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 	case RPC_N2AXLATEFAILURE:
 #endif
 	case RPC_UNKNOWNHOST:
@@ -461,7 +461,7 @@ create_auth(CLIENT *cl)
 {
 	/* Always cache the Unix style credentials. */
 	if (unix_credential == NULL)
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 		unix_credential = authsys_create_default ();
 #else
 		unix_credential = authunix_create_default ();
@@ -732,7 +732,7 @@ get_new_client_handle(_DtCm_Connection *conn)
 	oldver = conn->ci->vers_out;
 
 	/* always get a udp client handle first */
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 	cl = clnt_create_vers(conn->ci->host, TABLEPROG, &(conn->ci->vers_out),
 			TABLEVERS_2, oldver, "udp");
 	if (cl == NULL) {
@@ -788,7 +788,7 @@ get_new_client_handle(_DtCm_Connection *conn)
 
 		/* get a tcp client handle */
 		oldver = conn->ci->vers_out;
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 		cl = clnt_create_vers(conn->ci->host, TABLEPROG,
 			&(conn->ci->vers_out), TABLEVERS_2, oldver, "tcp");
 		if (cl == NULL)

cde/lib/csa/lutil.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <unistd.h>
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 #include <netdb.h>
 #include <sys/systeminfo.h>
 #endif
@@ -81,11 +81,11 @@ _DtCmGetLocalHost()
 
 	if (host == NULL) {
 		host = (char *)malloc(MAXHOSTNAMELEN+1);
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 		(void)sysinfo(SI_HOSTNAME, host, MAXHOSTNAMELEN);
 #else
 		(void)gethostname(host, MAXHOSTNAMELEN);
-#endif /* sun || USL || __uxp__ */
+#endif /* sun || USL */
 	}
 
 	return (host);
@@ -100,11 +100,11 @@ _DtCmGetLocalDomain(char *hostname)
 
 	if (domain == NULL) {
 		domain = (char *)malloc(BUFSIZ);
-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 		sysinfo(SI_SRPC_DOMAIN, domain, BUFSIZ - 1);
 #else
 		getdomainname(domain, BUFSIZ - 1);
-#endif /* sun || USL || __uxp__ */
+#endif /* sun || USL */
 
 		/* check domain name */
 		/* this is a hack to find out the domain name that

cde/lib/tt/bin/shell/mover.C

@@ -38,7 +38,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__) && !defined(sun)
+#if !defined(USL) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif
@@ -49,7 +49,7 @@
 #define S_ISLNK(m)     (((m)&IFMT) == IFLNK)
 #endif
 #include <sys/stat.h>
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_USL)
 #define S_ISLNK(mode)     (((mode) & S_IFMT) == S_IFLNK)
 #endif
 #include <sys/wait.h>

cde/lib/tt/bin/shell/remover.C

@@ -38,7 +38,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__) && !defined(sun)
+#if !defined(USL) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif
@@ -49,7 +49,7 @@
 #define S_ISLNK(m)     (((m)&IFMT) == IFLNK)
 #endif
 #include <sys/stat.h>
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) 
+#if defined(OPT_BUG_USL)
 #define S_ISLNK(mode)     (((mode) & S_IFMT) == S_IFLNK)
 #endif
 #include <sys/wait.h>

cde/lib/tt/bin/tt_type_comp/mp_type_comp.C

@@ -45,9 +45,9 @@
 #if defined(sgi) || defined(CSRG_BASED)
 #include <getopt.h>
 #endif
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #include "tt_options.h"
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_USL)
 extern "C" int getopt(int, char *const *, const char *);
 #endif
 #endif

cde/lib/tt/bin/tt_type_comp/mp_types_table.C

@@ -50,11 +50,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#if defined(OPT_BUG_UW_2) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_UW_2)
 extern "C" {
-#ifndef __uxp__
 int   putenv(char *);
-#endif
 FILE *popen(const char *, const char *);
 FILE *fdopen(int, const char *);
 int   pclose(FILE *);

cde/lib/tt/bin/ttdbserverd/db_server_functions.C

@@ -80,7 +80,7 @@ char				**global_envp;
 // This is the PID or TID of the procedure that is
 // performing the garbage collection.
 //
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 int		_tt_garbage_id = 0;	// TID or PID.
 #else
 int		_tt_garbage_id = -1;	// TID or PID.
@@ -2737,7 +2737,7 @@ _tt_run_garbage_collect(int in_parallel)
 		//
 		// FORK and EXEC ourself '-G'.
 		//
-#if defined(OPT_BUG_AIX) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_AIX) || defined(OPT_BUG_USL)
 #define vfork fork
 #endif
 		switch (_tt_garbage_id = (int)vfork()) {

cde/lib/tt/bin/tttar/tttar.C

@@ -40,7 +40,7 @@
 #if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__) && !defined(sun)
+#if !defined(USL) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif
@@ -52,7 +52,7 @@
 #include "tt_options.h"
 #include "archiver.h"
 
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) 
+#if defined(OPT_BUG_USL)
 #include <unistd.h>
 #endif
 

cde/lib/tt/bin/tttar/tttar_file_utils.C

@@ -45,7 +45,7 @@
 #include <dirent.h>
 #include "tttar_utils.h"
 #include "tttar_file_utils.h"
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) 
+#if defined(OPT_BUG_USL)
 #define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
 #endif
 

cde/lib/tt/bin/tttar/tttar_spec.C

@@ -35,13 +35,13 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if defined (USL) || defined(__uxp__)
+#if defined (USL)
 #include "tt_options.h"
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_USL)
 #include <unistd.h>
 #else
 #include <osfcn.h>
-#endif /* if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) */
+#endif /* if defined(OPT_BUG_USL) */
 #else
 #include <osfcn.h>
 #endif

cde/lib/tt/lib/mp/mp_c_session.C

@@ -268,7 +268,7 @@ startup_ttsession(_Tt_string &start_ttcmd)
 #endif
 	SIG_PF istat, qstat, cstat;
 
-#if defined(_AIX) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(_AIX) || defined(OPT_BUG_USL)
 #define vfork fork
 #endif
 	if((pid = vfork()) == 0) {

cde/lib/tt/lib/mp/mp_rpc_client.C

@@ -310,7 +310,7 @@ call(int procnum, xdrproc_t inproc, char *in,
 		}
 	}
 
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_USL)
 	if (timeout <= 0)
 	{
 		outproc = (xdrproc_t) NULL;
@@ -328,7 +328,7 @@ call(int procnum, xdrproc_t inproc, char *in,
 #if defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_UW_1)
 	if ((SIG_TYP)curr_action.sa_handler == SIG_DFL)
 #else
-#if defined(OPT_BUG_UW_2) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_UW_2)
 	if ((void(*)(int))curr_action.sa_handler == SIG_DFL)
 #else
 	if (curr_action.sa_handler == SIG_DFL)
@@ -357,7 +357,7 @@ call(int procnum, xdrproc_t inproc, char *in,
 			           outproc, out,
 			           total_timeout);
 	}
-#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
+#if defined(OPT_BUG_USL)
 	if (timeout <= 0)
 	{
 		total_timeout.tv_sec = 10;