From 97e3db93fea6bb469ab6cd30cfa82608cd58cc37 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 11 Nov 2000 12:13:00 +0000
Subject: PREFIX, etc. changes.

Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
---
 devel/libxalloc/files/patch-aa | 58 ++++++++++++++++++++++++++++++------------
 devel/libxalloc/pkg-descr      |  2 ++
 2 files changed, 44 insertions(+), 16 deletions(-)

(limited to 'devel')

diff --git a/devel/libxalloc/files/patch-aa b/devel/libxalloc/files/patch-aa
index ef7bfb08ce84..e22654250c5f 100644
--- a/devel/libxalloc/files/patch-aa
+++ b/devel/libxalloc/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Jul  5 12:15:59 1998
-+++ Makefile	Fri Apr  2 15:26:22 1999
-@@ -8,10 +8,10 @@
+--- Makefile.orig	Mon Jul  6 02:15:59 1998
++++ Makefile	Tue Jul  4 21:40:59 2000
+@@ -8,7 +8,7 @@
  ###########################################################################
  
  # Define SHARED as 1 for Linux shared ELF library
@@ -8,28 +8,54 @@
 +SHARED		= 1
  
  ifeq ($(SHARED),1)
--LIBTARGET	= lib$(DIST).so.$(VERSION)
-+LIBTARGET	= lib$(DIST).so.$(VERMAJ)
- LIBTARGETSO	= lib$(DIST).so
- LIBTARGETSOMAJ	= $(LIBTARGETSO).$(VERMAJ)
- CCSHRD		= -fPIC
-@@ -27,7 +27,7 @@
- INSTBASEDIR	= /usr/local
+ LIBTARGET	= lib$(DIST).so.$(VERSION)
+@@ -24,21 +24,21 @@
+ 
+ ###########################################################################
+ 
+-INSTBASEDIR	= /usr/local
++INSTBASEDIR	= ${PREFIX}
  INSTLIBDIR	= $(INSTBASEDIR)/lib
  INSTINCDIR	= $(INSTBASEDIR)/include
 -INSTALL		= install -m 644
-+INSTALL		= install -c -m 644
- MKDIRP		= install -d -m 755
+-MKDIRP		= install -d -m 755
++INSTALL		= ${BSD_INSTALL_DATA}
++MKDIRP		= install -d -m 755
  
  ###########################################################################
-@@ -66,9 +66,7 @@
- 	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+ 
+-CC		= gcc
++#CC		= gcc
+ OPTIM		= -O2
+ 
+ LIBDIR		= -L.
+ INCDIR		= -I.
+ 
+-CCOPT		= -Wall $(OPTIM) $(INCDIR)
++CCOPT		= $(INCDIR) $(CFLAGS)
+ LDOPT		= $(LIBDIR)
+ 
+ # Object files to store in the library
+@@ -50,7 +50,7 @@
+ 
+ $(LIBTARGET): $(LIBOBJS)
+ ifeq ($(SHARED),1)
+-	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
++	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
+ else
+ 	ar rcs $(LIBTARGET) $(LIBOBJS)
+ endif
+@@ -63,12 +63,10 @@
+ 
+ install: $(LIBTARGET)
+ 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+-	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
++	$(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR)
  	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
  ifeq ($(SHARED),1)
 -	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
--	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+ 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
 -	echo "If you use GNU/Linux, remember to run ldconfig"
-+	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
  endif
  
  clean:
diff --git a/devel/libxalloc/pkg-descr b/devel/libxalloc/pkg-descr
index 874dd540d4b8..d9a029e0486e 100644
--- a/devel/libxalloc/pkg-descr
+++ b/devel/libxalloc/pkg-descr
@@ -1,3 +1,5 @@
 xalloc is a memory allocation library with error checking.
 It contains wrappers including error checking for memory
 allocating C-functions.
+
+WWW: http://shh.thathost.com/pub-unix/#xalloc
-- 
cgit v1.2.3