From 33c11413f4421892ae9cb831369cbb1cdf4ca42e Mon Sep 17 00:00:00 2001
From: Andrey Zakhvatov <andy@FreeBSD.org>
Date: Fri, 24 Sep 1999 13:54:42 +0000
Subject: Update to version 1.1.5

---
 devel/libshhopt/files/patch-aa | 113 +++++++++++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 37 deletions(-)

(limited to 'devel/libshhopt/files/patch-aa')

diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
index 963686074ff3..e29df246d860 100644
--- a/devel/libshhopt/files/patch-aa
+++ b/devel/libshhopt/files/patch-aa
@@ -1,37 +1,76 @@
---- Makefile.orig	Sun Jul  5 12:08:59 1998
-+++ Makefile	Fri Apr  2 15:15:59 1999
-@@ -6,10 +6,10 @@
- VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
- 
- # Define SHARED as 1 for Linux shared ELF library
--#SHARED		= 1
-+SHARED		= 1
- 
- ifeq ($(SHARED),1)
--LIBTARGET	= lib$(DIST).so.$(VERSION)
-+LIBTARGET	= lib$(DIST).so.$(VERMAJ)
- LIBTARGETSO	= lib$(DIST).so
- LIBTARGETSOMAJ	= $(LIBTARGETSO).$(VERMAJ)
- CCSHRD		= -fPIC
-@@ -23,8 +23,8 @@
- INSTBASEDIR	= /usr/local
- INSTLIBDIR	= $(INSTBASEDIR)/lib
- INSTINCDIR	= $(INSTBASEDIR)/include
--INSTALL		= install -m 644
--INSTALLPROG	= install -m 755
-+INSTALL		= install -c -m 644
-+INSTALLPROG	= install -c -m 755
- MKDIRP		= install -d -m 755
- 
- CC		= gcc
-@@ -67,9 +67,7 @@
- 	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
- 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
- ifeq ($(SHARED),1)
--	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
--	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
--	echo "If you use GNU/Linux, remember to run ldconfig"
-+	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
- endif
- 
- clean:
+*** Makefile	Fri Sep 10 23:19:48 1999
+--- /home/andy/tmp/wrk/Makefile	Fri Sep 24 17:47:46 1999
+***************
+*** 6,15 ****
+  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
+  
+  # Define SHARED as 1 for Linux shared ELF library
+! #SHARED		= 1
+  
+  ifeq ($(SHARED),1)
+! LIBTARGET	= lib$(DIST).so.$(VERSION)
+  LIBTARGETSO	= lib$(DIST).so
+  LIBTARGETSOMAJ	= $(LIBTARGETSO).$(VERMAJ)
+  CCSHRD		= -fPIC
+--- 6,15 ----
+  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
+  
+  # Define SHARED as 1 for Linux shared ELF library
+! SHARED		= 1
+  
+  ifeq ($(SHARED),1)
+! LIBTARGET	= lib$(DIST).so.$(VERMAJ)
+  LIBTARGETSO	= lib$(DIST).so
+  LIBTARGETSOMAJ	= $(LIBTARGETSO).$(VERMAJ)
+  CCSHRD		= -fPIC
+***************
+*** 20,33 ****
+  LIBHEAD		= $(DIST).h
+  TARGETS		= $(LIBTARGET)
+  
+! INSTBASEDIR	= /usr/local
+  INSTLIBDIR	= $(INSTBASEDIR)/lib
+  INSTINCDIR	= $(INSTBASEDIR)/include
+! INSTALL		= install -m 644
+! INSTALLPROG	= install -m 755
+  MKDIRP		= install -d -m 755
+  
+! CC		= gcc
+  OPTIM		= -O2
+  
+  INCDIR		= -I.
+--- 20,34 ----
+  LIBHEAD		= $(DIST).h
+  TARGETS		= $(LIBTARGET)
+  
+! PREFIX		?= /usr/local
+! INSTBASEDIR	= $(PREFIX)
+  INSTLIBDIR	= $(INSTBASEDIR)/lib
+  INSTINCDIR	= $(INSTBASEDIR)/include
+! INSTALL		= install -c -m 644
+! INSTALLPROG	= install -c -m 755
+  MKDIRP		= install -d -m 755
+  
+! CC		?= gcc
+  OPTIM		= -O2
+  
+  INCDIR		= -I.
+***************
+*** 67,75 ****
+  	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+  	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+  ifeq ($(SHARED),1)
+! 	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+! 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+! 	echo "If you use GNU/Linux, remember to run ldconfig"
+  endif
+  
+  clean:
+--- 68,74 ----
+  	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+  	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+  ifeq ($(SHARED),1)
+! 	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
+  endif
+  
+  clean:
-- 
cgit v1.2.3