1 files changed, 48 insertions, 76 deletions
diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
index e29df246d860..842646df3318 100644
--- a/devel/libshhopt/files/patch-aa
+++ b/devel/libshhopt/files/patch-aa
@@ -1,76 +1,48 @@
-*** 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:
+--- Makefile	Fri Mar 10 11:45:19 2000
++++ /home/andy/tmp/wrk/Makefile	Sun Mar 19 16:34:15 2000
+@@ -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
+@@ -20,15 +20,16 @@
+ LIBHEAD		= $(DIST).h
+ TARGETS		= $(LIBTARGET)
+ 
+-INSTBASEDIR	= /usr/local
++PREFIX		?= /usr/local
++INSTBASEDIR	= $(PREFIX)
+ 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
+-OPTIM		= -O2
++CC		?= gcc
++OPTIM		= $(CFLAGS)
+ 
+ INCDIR		= -I.
+ 
+@@ -67,9 +68,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: