Fix libraries on ELF.

Shut up compilation warnings.

4 files changed, 39 insertions, 16 deletions

diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 7c5960606f3..2a7f2420e09 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/10/15 12:06:35 rh Exp $
+# $NetBSD: Makefile,v 1.12 2000/12/08 01:33:41 wiz Exp $
 
 DISTNAME=		ClanLib-0.2.2
 CATEGORIES=		graphics games devel x11
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+=	--disable-ggi
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"# CC='cc ${CFLAGS} ${LDFLAGS}'
 MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=		X11BASE="${X11BASE}"
 
 post-patch:
 	${CHMOD} +x ${WRKSRC}/configure
diff --git a/graphics/clanlib/files/patch-sum b/graphics/clanlib/files/patch-sum
index 1f701ba8962..bc1aafd4695 100644
--- a/graphics/clanlib/files/patch-sum
+++ b/graphics/clanlib/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/09/02 19:22:40 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/08 01:33:42 wiz Exp $
 
 MD5 (patch-aa) = bdd68da18224d22e69bf14f4524f17cc
 MD5 (patch-ab) = d3147151b40a0d3cff75065819cdb2e5
@@ -7,8 +7,8 @@ MD5 (patch-ad) = 035dd0798ad8cf382dc5202a0c4c3985
 MD5 (patch-ae) = d5d450a7ff806e375df3678947a86bdb
 MD5 (patch-af) = 14a7d0dff76d48e556d79d6cd25a75b3
 MD5 (patch-ag) = 38186794a82a102c7cdaba0d7e09f2b2
-MD5 (patch-ah) = b5b0b6c581ce3725f7f8376ca3982e1c
+MD5 (patch-ah) = c3006dfc20e2ce16dd09bf0de59d9a39
 MD5 (patch-ai) = fb7080c36cf90dea10b4856fc61b1622
 MD5 (patch-aj) = da715da3beff1da0199dfb2b709f065d
 MD5 (patch-ak) = 5ef731e7b8f81c1ccd7448036293fc1a
-MD5 (patch-al) = 2b32fbee7e17f8912b8b83a626e12ae7
+MD5 (patch-al) = fef639f8b62fe7a3eae3010b13cc689d
diff --git a/graphics/clanlib/patches/patch-ah b/graphics/clanlib/patches/patch-ah
index 41393fb9306..b5b5e04f8eb 100644
--- a/graphics/clanlib/patches/patch-ah
+++ b/graphics/clanlib/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 1999/11/30 13:24:47 rh Exp $
+$NetBSD: patch-ah,v 1.3 2000/12/08 01:33:42 wiz Exp $
 
 --- Common/clanstring.h.orig	Sun Jul 11 13:14:05 1999
-+++ Common/clanstring.h	Tue Nov 30 10:28:01 1999
++++ Common/clanstring.h
 @@ -65,6 +65,8 @@
  
  #ifndef WIN32
@@ -11,21 +11,25 @@ $NetBSD: patch-ah,v 1.2 1999/11/30 13:24:47 rh Exp $
  #endif
  
  #ifdef __BEOS__
-@@ -148,6 +150,9 @@
- 
- 		float float_number = _float_number;
+@@ -141,9 +143,12 @@
+ 	{
+ 		char buf[25];
+ 		buf[0]=0;
++		int precision=4;
  
 +#if (defined(BSD) && BSD >= 199306)
 +		snprintf(buf, sizeof buf, "%.*f", precision, (double)_float_number);
 +#else
- 		const char *_float_buffer = fcvt(
- 			float_number,
- 			precision,
-@@ -172,6 +177,7 @@
+ 		int decimal, sign;
+-		int precision=4;
+ 		char temp;
  
- 		strcat(buf, ".");
+ 		float float_number = _float_number;
+@@ -174,6 +179,7 @@
  		strcat(buf, &float_buffer[decimal]);
-+#endif
  
  	copy_strings:
++#endif
  		int len=0;
+ 		if (prefix!=NULL) len=strlen(prefix);
+ 
diff --git a/graphics/clanlib/patches/patch-al b/graphics/clanlib/patches/patch-al
index c9102422031..e0e80863839 100644
--- a/graphics/clanlib/patches/patch-al
+++ b/graphics/clanlib/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2000/09/02 19:22:41 wiz Exp $
+$NetBSD: patch-al,v 1.2 2000/12/08 01:33:42 wiz Exp $
 
 --- Makefile.in.orig	Sun Sep 26 18:44:16 1999
 +++ Makefile.in
@@ -11,3 +11,21 @@ $NetBSD: patch-al,v 1.1 2000/09/02 19:22:41 wiz Exp $
  	@ln -s -f libclanlayer1.so.$(D_VERSION_MINOR) libclanlayer1.so.$(D_VERSION_MAJOR)
  	@ln -s -f libclanlayer1.so.$(D_VERSION_MAJOR) libclanlayer1.so
  
+@@ -408,7 +408,7 @@
+ 
+ libclan-display-x11.so: $(OBJF_DISP_X11)
+ 	@echo "Building dynamic library (libclan-display-x11.so)"
+-	@$(LINK_COMMAND) @x_libraries@ -o libclan-display-x11.so.$(D_VERSION_MINOR) $(OBJF_DISP_X11)
++	@$(LINK_COMMAND) -Wl,-R$(X11BASE)/lib @x_libraries@ -o libclan-display-x11.so.$(D_VERSION_MINOR) $(OBJF_DISP_X11)
+ 
+ libclan-display-ptc.so: $(OBJF_DISP_PTC) libclan-display-x11.so
+ 	@echo "Building dynamic library (libclan-display-ptc.so)"
+@@ -416,7 +416,7 @@
+ 
+ libclan-display-glx.so: $(OBJF_DISP_GLX) libclan-display-x11.so
+ 	@echo "Building dynamic library (libclan-display-glx.so)"
+-	@$(LINK_COMMAND) -L . -Wl,-rpath,$(TARGET_PREFIX) libclan-display-x11.so.$(D_VERSION_MINOR) @x_libraries@ -lGL -lGLU -o libclan-display-glx.so.$(D_VERSION_MINOR) $(OBJF_DISP_GLX)
++	@$(LINK_COMMAND) -L . -Wl,-R$(X11BASE)/lib libclan-display-x11.so.$(D_VERSION_MINOR) @x_libraries@ -lGL -lGLU -o libclan-display-glx.so.$(D_VERSION_MINOR) $(OBJF_DISP_GLX)
+ 
+ libclan-display-ggi.so: $(OBJF_DISP_GGI)
+ 	@echo "Building dynamic library (libclan-display-ggi.so)"