diff options
| author | tron <tron> | 2006-08-08 09:50:33 +0000 |
|---|---|---|
| committer | tron <tron> | 2006-08-08 09:50:33 +0000 |
| commit | fddcf3fb381c13a6b66a529ec8ed3a255b01795a (patch) | |
| tree | 68ac7b12efabd9201afd45d25e706aef76df66d4 /lang/spidermonkey | |
| parent | 153e807ac16d12f90167cedddefdb3d4123aca24 (diff) | |
| download | pkgsrc-fddcf3fb381c13a6b66a529ec8ed3a255b01795a.tar.gz | |
Use correct share library suffix under Mac OS X (".dylib" instead of
".so") so that linking with the "libjs" shared library actually works.
Bump package revision because of this fix.
Diffstat (limited to 'lang/spidermonkey')
| -rw-r--r-- | lang/spidermonkey/Makefile | 13 | ||||
| -rw-r--r-- | lang/spidermonkey/PLIST | 4 | ||||
| -rw-r--r-- | lang/spidermonkey/distinfo | 4 | ||||
| -rw-r--r-- | lang/spidermonkey/patches/patch-aa | 18 |
4 files changed, 29 insertions, 10 deletions
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 47f515366cc..8e6f59d1d13 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2006/08/04 13:22:11 tron Exp $ +# $NetBSD: Makefile,v 1.6 2006/08/08 09:50:33 tron Exp $ DISTNAME= js-1.5 PKGNAME= ${DISTNAME:S/js/spidermonkey/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/js/ @@ -30,13 +30,20 @@ BUILDDIRPREFIX= pkgsrc BUILDDIRPREFIX= ${OPSYS} .endif +.if ${OPSYS} == "Darwin" +SO_SUFFIX=dylib +.else +SO_SUFFIX=so +.endif +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} + post-extract: ${CP} ${FILESDIR}/pkgsrc.mk ${WRKSRC}/config do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/js \ ${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/libjs.so \ + ${INSTALL_LIB} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/libjs.${SO_SUFFIX} \ ${PREFIX}/lib ${CP} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/jsautocfg.h ${WRKSRC} .for f in ${DIST_HEADERS} diff --git a/lang/spidermonkey/PLIST b/lang/spidermonkey/PLIST index 4803af519a0..b5dc4d2e7d7 100644 --- a/lang/spidermonkey/PLIST +++ b/lang/spidermonkey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/27 19:47:21 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/08/08 09:50:33 tron Exp $ bin/js include/jsapi.h include/jsautocfg.h @@ -8,4 +8,4 @@ include/jsosdep.h include/jsotypes.h include/jspubtd.h include/jstypes.h -lib/libjs.so +lib/libjs.${SO_SUFFIX} diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo index 7a9f4219fd7..7e988ff255f 100644 --- a/lang/spidermonkey/distinfo +++ b/lang/spidermonkey/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2006/08/04 13:22:11 tron Exp $ +$NetBSD: distinfo,v 1.4 2006/08/08 09:50:33 tron Exp $ SHA1 (js-1.5.tar.gz) = 707755be3a94207d5d10ccd1011ca00babe0a689 RMD160 (js-1.5.tar.gz) = a1f23d53c259a9fa354f29eecdc1c56472f4f626 Size (js-1.5.tar.gz) = 958135 bytes -SHA1 (patch-aa) = 06627df12b3e39a33164257beecff7d8bf89ed6f +SHA1 (patch-aa) = 25de332b3ec78da45727cedf33f695caee416519 SHA1 (patch-ab) = 9f78175b240add7ed2dc3d49c90367c9fa5d16ea SHA1 (patch-ac) = 2a9a4834dcc82dbab04d1bfc9a58c3e2b41f17dc diff --git a/lang/spidermonkey/patches/patch-aa b/lang/spidermonkey/patches/patch-aa index b477f431439..f34a91af6c8 100644 --- a/lang/spidermonkey/patches/patch-aa +++ b/lang/spidermonkey/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2006/02/26 20:36:58 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2006/08/08 09:50:33 tron Exp $ ---- config.mk.orig 2003-11-15 01:10:55.000000000 +0100 -+++ config.mk 2006-01-27 20:42:30.000000000 +0100 +--- config.mk.orig 2003-11-15 00:10:55.000000000 +0000 ++++ config.mk 2006-08-08 10:35:24.000000000 +0100 @@ -96,10 +96,26 @@ ifeq ($(OS_ARCH),Darwin) OS_CONFIG := Darwin @@ -29,3 +29,15 @@ $NetBSD: patch-aa,v 1.2 2006/02/26 20:36:58 joerg Exp $ ASFLAGS = DEFINES = +@@ -126,7 +142,11 @@ + OBJDIR_TAG = _DBG + endif + ++ifeq ($(OS_ARCH),Darwin) ++SO_SUFFIX = dylib ++else + SO_SUFFIX = so ++endif + + NS_USE_NATIVE = 1 + |