From 0148c10742f71155484f6f89753669288df8a89a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 25 Jun 2001 20:19:52 +0000
Subject: Pass LDFLAGS to the compiler when linking the library to get correct
 rpath settings.  Also move the inclusion of the buildlink.mk file below the
 GNU_CONFIGURE setting.

---
 japanese/vflib-lib/Makefile.common  |  6 +++---
 japanese/vflib-lib/distinfo         |  4 ++--
 japanese/vflib-lib/patches/patch-ac | 13 +++++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'japanese')

diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index 226f3007c04..adcba40e1dc 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2001/06/11 02:05:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2001/06/25 20:19:52 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -15,11 +15,10 @@ VFLIB_VERSION=		2.24.2
 PLIST_SUBST+=		VFLIB_VERSION=${VFLIB_VERSION}
 PLIST_SUBST+=		VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
 
+USE_BUILDLINK_ONLY=	# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../graphics/freetype-lib/buildlink.mk"
-
 FT_LIB=			ttf -lintl
 FT_INCLUDEDIR=		${BUILDLINK_DIR}/include/freetype
 FT_LIBDIR=		${BUILDLINK_DIR}/lib
@@ -35,4 +34,5 @@ PATCHDIR=		${.CURDIR}/../../japanese/vflib-lib/patches
 
 EXTRACT_ONLY=		${VFLIB_SRC}
 
+.include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/distinfo b/japanese/vflib-lib/distinfo
index 989796e78bf..63b245c2f6e 100644
--- a/japanese/vflib-lib/distinfo
+++ b/japanese/vflib-lib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/05/28 03:24:29 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/06/25 20:19:53 jlam Exp $
 
 SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5
 Size (VFlib2-2.24.2.tar.gz) = 540093 bytes
 SHA1 (patch-aa) = c78284c8126b8a2f1ccf43360b9f2e0f0468c2e1
 SHA1 (patch-ab) = 1654d8a602097eed3a8fb4c146287eadbae0c3be
-SHA1 (patch-ac) = 72d5c5b58d48afe2a22e4e96c898fb992707a7a2
+SHA1 (patch-ac) = 6a8b1b8565ca4ce689fc5b873faf15ea6268da01
 SHA1 (patch-ad) = 329c265785f4e3134b67f37c1e1d1f7f6aa60337
 SHA1 (patch-ae) = 6b2512548bc122b915c15067791aeecfcb2ef8a6
 SHA1 (patch-af) = daae96f7c5218eb9fd22d297121a93f5bd266bed
diff --git a/japanese/vflib-lib/patches/patch-ac b/japanese/vflib-lib/patches/patch-ac
index aec6da1d195..9868452055a 100644
--- a/japanese/vflib-lib/patches/patch-ac
+++ b/japanese/vflib-lib/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/06/25 20:19:53 jlam Exp $
 
 --- src/Makefile.in.orig	Tue Oct 27 02:33:17 1998
-+++ src/Makefile.in	Mon May  1 04:37:48 2000
++++ src/Makefile.in
+@@ -61,7 +61,7 @@
+ # VFlib
+ $(VFLIB):  $(CORE_OBJ) $(DRV_OBJ)
+ 	$(LIBTOOL) --mode=link \
+-		$(CC) -o $(VFLIB) $(CORE_OBJ) $(DRV_OBJ) \
++		$(CC) $(LDFLAGS) -o $(VFLIB) $(CORE_OBJ) $(DRV_OBJ) \
+ 		  -version-info @version_info@ -rpath $(libdir) \
+ 		  $(EXT_LIBRARY) 
+ 
 @@ -183,13 +183,13 @@
  
  # Installing
-- 
cgit v1.2.3