[pkgsrc/trunk]: pkgsrc/lang/spidermonkey use pkg-config to locate nspr

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3701da761de2
branches:  trunk
changeset: 569496:3701da761de2
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Jan 16 15:04:32 2010 +0000

description:
use pkg-config to locate nspr

diffstat:

 lang/spidermonkey/Makefile         |  6 +++---
 lang/spidermonkey/distinfo         |  4 ++--
 lang/spidermonkey/files/pkgsrc.mk  |  2 +-
 lang/spidermonkey/patches/patch-ae |  6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r bcf8dbb16abe -r 3701da761de2 lang/spidermonkey/Makefile
--- a/lang/spidermonkey/Makefile        Sat Jan 16 15:04:08 2010 +0000
+++ b/lang/spidermonkey/Makefile        Sat Jan 16 15:04:32 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/05/20 00:58:20 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/16 15:04:32 tnn Exp $
 
 DISTNAME=      js-1.60
 PKGNAME=       ${DISTNAME:S/js/spidermonkey/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=js/}
 
@@ -17,7 +17,7 @@
 MAKE_JOBS_SAFE=        no
 
 NO_CONFIGURE=  yes
-USE_TOOLS+=    gmake
+USE_TOOLS+=    gmake pkg-config
 MAKE_FILE=     Makefile.ref
 CFLAGS+=       -DJS_USE_FDLIBM_MATH=0
 
diff -r bcf8dbb16abe -r 3701da761de2 lang/spidermonkey/distinfo
--- a/lang/spidermonkey/distinfo        Sat Jan 16 15:04:08 2010 +0000
+++ b/lang/spidermonkey/distinfo        Sat Jan 16 15:04:32 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/08/12 03:04:32 wiz Exp $
+$NetBSD: distinfo,v 1.10 2010/01/16 15:04:32 tnn Exp $
 
 SHA1 (js-1.60.tar.gz) = db1457c28d2a55080520d7565a2c271eb1599064
 RMD160 (js-1.60.tar.gz) = 630e0f5606d9cc398daa41e71ca3f98c04e3aed2
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = 1ea712aa7a8d2d48acf4980db3df74f70e616252
 SHA1 (patch-ac) = 75ccc29f5075d95b087b28dba25fb8ee78cee706
 SHA1 (patch-ad) = ca651bfc31b5ad06e45010d40309121c7300807a
-SHA1 (patch-ae) = 928b2f441fe026538f3d1281a725dd362d1c11ed
+SHA1 (patch-ae) = 5ac0c7013fe4290fc770c91bc2db438f17481f5e
 SHA1 (patch-af) = 353a2b119f56974cc1ae0c2a646d014c075eb5fd
 SHA1 (patch-ah) = a8a486353bc164cff0ba57efc6ad4e82ff339e3e
 SHA1 (patch-ai) = 5835ce03309d45f607a1613062b609e39cc1b974
diff -r bcf8dbb16abe -r 3701da761de2 lang/spidermonkey/files/pkgsrc.mk
--- a/lang/spidermonkey/files/pkgsrc.mk Sat Jan 16 15:04:08 2010 +0000
+++ b/lang/spidermonkey/files/pkgsrc.mk Sat Jan 16 15:04:32 2010 +0000
@@ -48,7 +48,7 @@
 OS_CFLAGS+=    -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE # -DHAVE_LOCALTIME_R
 
 RANLIB = echo
-MKSHLIB = $(LD) -lm -lplds4 -lplc4 -lnspr4 -shared $(LDFLAGS) $(XMKSHLIBOPTS)
+MKSHLIB = $(LD) -lm `pkg-config --libs nspr` -shared $(LDFLAGS) $(XMKSHLIBOPTS)
 
 #.c.o:
 #      $(CC) -c -MD $*.d $(CFLAGS) $<
diff -r bcf8dbb16abe -r 3701da761de2 lang/spidermonkey/patches/patch-ae
--- a/lang/spidermonkey/patches/patch-ae        Sat Jan 16 15:04:08 2010 +0000
+++ b/lang/spidermonkey/patches/patch-ae        Sat Jan 16 15:04:32 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2007/08/12 03:04:33 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2010/01/16 15:04:32 tnn Exp $
 
---- Makefile.ref.orig  2006-08-21 14:58:45.000000000 -0400
+--- Makefile.ref.orig  2006-08-21 18:58:45.000000000 +0000
 +++ Makefile.ref
 @@ -55,8 +55,6 @@ include config.mk
  
@@ -17,7 +17,7 @@
  #
 -CFLAGS          += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
 +CFLAGS          += -L$(PREFIX)/lib $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) \
-+                      $(INCLUDES) $(XCFLAGS)
++                      $(INCLUDES) $(XCFLAGS) `pkg-config --cflags nspr`
  
  LDFLAGS               = $(XLDFLAGS)