Update to version 3.1.15.

PR:		52662
Submitted by:	Ports Fury

3 files changed, 34 insertions, 113 deletions

diff --git a/cad/xcircuit/files/patch-Makefile.in b/cad/xcircuit/files/patch-Makefile.in
new file mode 100644
index 000000000000..95ba6b0b0eae
--- /dev/null
+++ b/cad/xcircuit/files/patch-Makefile.in
@@ -0,0 +1,34 @@
+--- Makefile.in.orig	Tue May 20 00:54:39 2003
++++ Makefile.in	Mon May 26 21:57:18 2003
+@@ -108,7 +108,7 @@
+ tmpdir = /tmp
+ 
+ # Directory for app-defaults file
+-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
++appdefaultsdir = $(libdir)/X11/app-defaults
+ 
+ PATHNAMES = -DPROG_VERSION=$(VERSION) \
+ 	-DCAD_DIR=\"$(prefix)\" \
+@@ -143,7 +143,7 @@
+ LDDL_FLAGS = @LDDL_FLAGS@
+ 
+ # Library directory and files
+-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
++librarydir = $(libdir)/X11/$(PACKAGE)
+ USER_RC_FILE = .xcircuitrc
+ PROLOGUE_FILE = xcircps2.pro
+ BUILTINS_DEP1 = generic.lps
+@@ -572,11 +572,11 @@
+ 
+ lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
+ 	$(RM) lib/xcircuit${SHDLIB_EXT}
+-	$(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
++	$(LD) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
+ 		${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
+ 
+ tcl:	lib/tcl/xcircuit${SHDLIB_EXT}
+-	make lib/tcl/xcircuit${SHDLIB_EXT}
++	$(MAKE) lib/tcl/xcircuit${SHDLIB_EXT}
+ 
+ help.c: menudep.h
+ menucalls.c: menudep.h
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
deleted file mode 100644
index d1e79fe82883..000000000000
--- a/cad/xcircuit/files/patch-aa
+++ /dev/null
@@ -1,86 +0,0 @@
-*** Imakefile.orig	Fri Sep  7 03:31:47 2001
---- Imakefile	Fri Sep  7 03:44:46 2001
-***************
-*** 28,50 ****
-  #CCOPTIONS = -O2
-  #
-  # for debugging purposes uncomment the following line:
-! CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
-  
-  # The "m4" macro processor is used to generate the man page such that
-  # the man page reflects the configured options.
-! M4 = m4
-  
-  #------------------------------------------------------------------------
-  # Installation directories:
-  # Change the following as desired to suit your environment:
-  #------------------------------------------------------------------------
-  #
-! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3
-! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
-  XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-  
-  #------------------------------------------------------------------------
---- 28,51 ----
-  #CCOPTIONS = -O2
-  #
-  # for debugging purposes uncomment the following line:
-! # CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I$(INCDIR)/X11
-! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
-  
-  # The "m4" macro processor is used to generate the man page such that
-  # the man page reflects the configured options.
-! M4 = gm4
-  
-  #------------------------------------------------------------------------
-  # Installation directories:
-  # Change the following as desired to suit your environment:
-  #------------------------------------------------------------------------
-  #
-! # PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
-! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
-! XCIRCUIT_BIN_DIR = $(BINDIR)
-! XCIRCUIT_MAN_DIR = $(MANDIR)
-  XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-  
-  #------------------------------------------------------------------------
-***************
-*** 63,69 ****
-  # Support for background rendering through ghostscript.  Change this
-  # to the path where gs can be found.
-  # GS_EXEC= /usr/local/src/gs5.50/obj/gs
-! GS_EXEC= /usr/bin/gs
-  
-  #------------------------------------------------------------------------
-  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
---- 64,70 ----
-  # Support for background rendering through ghostscript.  Change this
-  # to the path where gs can be found.
-  # GS_EXEC= /usr/local/src/gs5.50/obj/gs
-! GS_EXEC=${LOCALBASE}/bin/gs
-  
-  #------------------------------------------------------------------------
-  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
-***************
-*** 91,97 ****
-  # Support for embedded Python interpreter
-  # (requires libpython${PYTHON_VERSION}.a)
-  #
-! #define HAVE_PYTHON
-  
-  PYTHON_VERSION=2.1
-  PYTHON_LIB_DIR=/usr/local/lib
---- 92,98 ----
-  # Support for embedded Python interpreter
-  # (requires libpython${PYTHON_VERSION}.a)
-  #
-! /* #define HAVE_PYTHON */
-  
-  PYTHON_VERSION=2.1
-  PYTHON_LIB_DIR=/usr/local/lib
diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab
deleted file mode 100644
index fffcdea367fd..000000000000
--- a/cad/xcircuit/files/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-*** xcircuit.c.orig	Tue Jun 26 22:34:15 2001
---- xcircuit.c	Sat Jun 30 12:53:00 2001
-***************
-*** 21,26 ****
---- 21,29 ----
-  #include <limits.h>
-  #include <locale.h>
-  #include <unistd.h>   /* for unlink() */
-+ #ifdef __FreeBSD__
-+ #include <machine/floatingpoint.h>
-+ #endif
-  
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
-***************
-*** 1685,1690 ****
---- 1688,1697 ----
-     char		*argv0;		/* find root of argv[0] */
-     short initargc = argc;	/* because XtInitialize() absorbs the     */
-     				/* -schem flag and renumbers argc! (bug?) */
-+ 
-+ #ifdef __FreeBSD__
-+    fpsetmask(0);
-+ #endif
-  
-     /*-----------------------------------------------------------*/
-     /* Find the root of the command called from the command line */