1 files changed, 52 insertions, 76 deletions

diff --git a/devel/libslang/files/patch-aa b/devel/libslang/files/patch-aa
index d62fab8b6cac..39b1e6c48d5f 100644
--- a/devel/libslang/files/patch-aa
+++ b/devel/libslang/files/patch-aa
@@ -1,76 +1,52 @@
-*** src/Makefile.in.orig	Tue Jan 21 20:21:34 1997
---- src/Makefile.in	Mon Jan 27 23:49:32 1997
-***************
-*** 2,16 ****
-  #---------------------------------------------------------------------------
-  # ANSI C compiler
-  #---------------------------------------------------------------------------
-! CC              = @CC@
-! CFLAGS 		= @CFLAGS@
-  LDFLAGS		= @LDFLAGS@
-  #---------------------------------------------------------------------------
-  # ELF specific (Linux)
-  #---------------------------------------------------------------------------
-! ELF_CC 		= gcc
-! ELF_CFLAGS	= -O2 -fno-strength-reduce -fPIC
-! ELF_LINK        = gcc -shared -Wl,-lm,-t,-soname#
-  #---------------------------------------------------------------------------
-  # Set these values to ABSOLUTE path names
-  #---------------------------------------------------------------------------
---- 2,16 ----
-  #---------------------------------------------------------------------------
-  # ANSI C compiler
-  #---------------------------------------------------------------------------
-! #CC              = @CC@
-! #CFLAGS          = @CFLAGS@
-  LDFLAGS		= @LDFLAGS@
-  #---------------------------------------------------------------------------
-  # ELF specific (Linux)
-  #---------------------------------------------------------------------------
-! ELF_CC          = $(CC)
-! ELF_CFLAGS      = $(CFLAGS) -DPIC -fpic
-! ELF_LINK        = ld -Bshareable
-  #---------------------------------------------------------------------------
-  # Set these values to ABSOLUTE path names
-  #---------------------------------------------------------------------------
-***************
-*** 93,103 ****
-  #	cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-  $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS)
-  	-$(RM) $(ELFDIR_ELF_LIB)
-! 	cd $(ELFDIR); $(ELF_LINK),$(ELFLIB_MAJOR) -o $(ELFLIB_MAJOR_MINOR) $(OFILES)
-! 	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
-- 	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
-  	@echo ""
-  $(OBJDIR) :
-  	-$(MKDIR) $(OBJDIR)
---- 93,101 ----
-  #	cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-  $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS)
-  	-$(RM) $(ELFDIR_ELF_LIB)
-! 	cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
-  	@echo ""
-  $(OBJDIR) :
-  	-$(MKDIR) $(OBJDIR)
-***************
-*** 124,138 ****
-  install-elf: install elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB)
-  	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
-  	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
-- 	-$(RM) $(install_lib_dir)/$(ELFLIB)
-- 	-$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
-  	@echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
-  	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
-- 	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
-- 	-cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
-- 	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
-  	@echo ""
-  install-links:
-  	-$(RM) $(install_lib_dir)/$(ELFLIB)
---- 122,131 ----
+--- src/Makefile.in.orig	Wed Jan 22 01:21:34 1997
++++ src/Makefile.in	Fri Dec 19 00:09:11 1997
+@@ -2,15 +2,15 @@
+ #---------------------------------------------------------------------------
+ # ANSI C compiler
+ #---------------------------------------------------------------------------
+-CC              = @CC@
+-CFLAGS 		= @CFLAGS@
++#CC              = @CC@
++#CFLAGS          = @CFLAGS@
+ LDFLAGS		= @LDFLAGS@
+ #---------------------------------------------------------------------------
+ # ELF specific (Linux)
+ #---------------------------------------------------------------------------
+-ELF_CC 		= gcc
+-ELF_CFLAGS	= -O2 -fno-strength-reduce -fPIC
+-ELF_LINK        = gcc -shared -Wl,-lm,-t,-soname#
++ELF_CC          = $(CC)
++ELF_CFLAGS      = $(CFLAGS) -DPIC -fpic
++ELF_LINK        = ld -Bshareable
+ #---------------------------------------------------------------------------
+ # Set these values to ABSOLUTE path names
+ #---------------------------------------------------------------------------
+@@ -93,11 +93,9 @@
+ #	cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
+ $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS)
+ 	-$(RM) $(ELFDIR_ELF_LIB)
+-	cd $(ELFDIR); $(ELF_LINK),$(ELFLIB_MAJOR) -o $(ELFLIB_MAJOR_MINOR) $(OFILES)
+-	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
++	cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(TCAPLIB)
+ 	@echo ""
+ 	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
+-	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
+ 	@echo ""
+ $(OBJDIR) :
+ 	-$(MKDIR) $(OBJDIR)
+@@ -124,15 +122,10 @@
+ install-elf: install elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB)
+ 	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
+ 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
+-	-$(RM) $(install_lib_dir)/$(ELFLIB)
+-	-$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
+ 	@echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
+ 	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
+-	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
+-	-cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+ 	@echo ""
+ 	@echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
+-	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
+ 	@echo ""
+ install-links:
+ 	-$(RM) $(install_lib_dir)/$(ELFLIB)