Update to version 1.3

PR: 22815
Submitted by: Ports Fury

1 files changed, 76 insertions, 84 deletions

diff --git a/www/ashe/files/patch-ac b/www/ashe/files/patch-ac
index 72be72b9633d..f00185261c97 100644
--- a/www/ashe/files/patch-ac
+++ b/www/ashe/files/patch-ac
@@ -1,86 +1,78 @@
-*** src/Imakefile	Tue Oct 17 10:26:22 1995
---- src/Imakefile	Tue Oct 17 10:48:34 1995
-***************
-*** 36,96 ****
-  /* The object files that will be generated */
-  OBJS =  $(SRCS:.c=.o)
-   
-- /*
--  * Specify this line if you want the program to be compiled with Debugging.	* 
--  *
--  */
-- 
-- CDEBUGFLAGS = -g -Wall 
-- 
-- CC = gcc
-- 
-- /*
--  * Change the name of the compiler here. The default version is 
--  * 'gcc'. (the Motif libraries needed to be built with it.)
--  * If you are changing the compiler to 'cc', you may also need to 
--  * redefine the EXTRA_LOAD_FLAGS envariable
--  *
--  * Uncomment this section if GCC is not the compiler.
--  *
--  * CC=gcc 
--  *
--  *  EXTRA_LOAD_FLAGS=
--  * 
--  */
-- 
-- /*
--  * This section tells it which Client library to use.
--  * Use 'XawClientLibs' and 'XawClientDepLibs' for the Athena Widget set.
--  * Use 'XmClientLibs'  and 'XmClientDepLibs'  for the Motif  widget set.
--  * LCL_LIB = XawClientLibs 
--  * DEPLIBS = XawClientDepLibs 
--  */
-- 
-- 
-  /* 
-   * This is the Directory of the HTML Widget Library. (Please change it)
-   * and CCI library
-   */
-! LCL_LIB = -L/fs5/grads12/puninj/HTML/libhtmlw \
-! 	 -L/fs5/grads12/puninj/HTML/CCI/libcci
-  /* 
-   * This is the Directory of the HTML Widget Include Files (Please change it)
-   * and CCI library
-   */
-! INCLUDES = -I/fs5/grads12/puninj/HTML/libhtmlw \
-! 	-I/fs5/grads12/puninj/HTML/CCI/libcci
+--- src/Imakefile.orig	Wed Feb 28 13:19:10 1996
++++ src/Imakefile	Sun Nov 12 17:30:04 2000
+@@ -41,67 +41,30 @@
+ /* The object files that will be generated */
+ OBJS =  $(SRCS:.c=.o) 
   
+-/*
+- * Specify this line if you want the program to be compiled with Debugging.	* 
+- *
+- */
+-
+-CDEBUGFLAGS = -g -Wall 
+-
+-CC = gcc
+-
+-/*
+- * Change the name of the compiler here. The default version is 
+- * 'gcc'. (the Motif libraries needed to be built with it.)
+- * If you are changing the compiler to 'cc', you may also need to 
+- * redefine the EXTRA_LOAD_FLAGS envariable
+- *
+- * Uncomment this section if GCC is not the compiler.
+- *
+- * CC=gcc 
+- *
+- *  EXTRA_LOAD_FLAGS=
+- * 
+- */
+-
+-/*
+- * This section tells it which Client library to use.
+- * Use 'XawClientLibs' and 'XawClientDepLibs' for the Athena Widget set.
+- * Use 'XmClientLibs'  and 'XmClientDepLibs'  for the Motif  widget set.
+- * LCL_LIB = XawClientLibs 
+- * DEPLIBS = XawClientDepLibs 
+- */
+-
+-
+ /* 
+  * This is the Directory of the HTML Widget Library. (Please change it)
+  *
+  */
+-LCL_LIB = -L/fs5/grads12/puninj/HTML/libhtmlw-2.7b3 \
+-	 -L/fs5/grads12/puninj/HTML/CCI/libcci
++LCL_LIB = -L../libhtmlw-2.7b3 \
++	 -L../libcci
+ 
+ 	
+ /* 
+  * This is the Directory of the HTML Widget Include Files (Please change it)
+  *
+  */
+-INCLUDES = -I/fs5/grads12/puninj/HTML/libhtmlw-2.7b3 \
+-	-I/fs5/grads12/puninj/HTML/CCI/libcci
++INCLUDES = -I../libhtmlw-2.7b3 \
++	-I../libcci
+ 
+ 
+ # These libraries are necessary for Solaris :  
+ #                      -lsocket -lresolv -L/usr/ucblib -lucb -lnsl
+ 
+-EXTRA_LIBRARIES = -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11 -lXpm -lm
+-
++EXTRA_LIBRARIES = $(LCL_LIB) -lcci -lhtmlw ${MOTIFLIB} XawClientLibs
+ 
+-#
+-# This is what is built when you say 'make all'
+-AllTarget($(TARGETS))
 - 
-- #EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXt -lXext -lX11
-- EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
-  
-! #
-! # This is what is built when you say 'make all'
-! AllTarget($(TARGETS))
-!  
-! NormalProgramTarget( $(TARGETS), $(OBJS), $(DEPLIBS), $(LCL_LIB), $(SYS_LIB))
-!  
-! DependTarget()
-! 
-! 
---- 36,55 ----
-  /* The object files that will be generated */
-  OBJS =  $(SRCS:.c=.o)
-   
-  /* 
-   * This is the Directory of the HTML Widget Library. (Please change it)
-   * and CCI library
-   */
-! LOCAL_LDFLAGS = -L../libhtmlw-src -L../libcci
-! 
-  /* 
-   * This is the Directory of the HTML Widget Include Files (Please change it)
-   * and CCI library
-   */
-! INCLUDES = -I../libhtmlw-src -I../libcci
-  
-+ EXTRA_LIBRARIES =  -lcci -lhtmlw ${MOTIFLIB} XawClientLibs
-  
-! ComplexProgramTarget(xhtml)
-! InstallNonExecFile(help.html,$(LIBDIR)/xhtml)
-! InstallNonExecFile(XHTML.ad,$(XAPPLOADDIR))
+-NormalProgramTarget( $(TARGETS), $(OBJS), $(DEPLIBS), $(LCL_LIB), $(SYS_LIB))
+- 
+-DependTarget()
++ComplexProgramTarget(xhtml)
++InstallAppDefaults(XHTML)
++InstallNonExecFile(help.html,$(LIBDIR)/xhtml)
+ 
+ 
+