From 270d6e7b0992388f099fff40cc1d7e018bd50c15 Mon Sep 17 00:00:00 2001 From: jmc Date: Wed, 6 Mar 2002 06:48:15 +0000 Subject: Add functionality so the module .so's get built and installed as well. Bump to nb2 for version --- lang/RScheme/Makefile | 4 ++-- lang/RScheme/PLIST | 7 ++++++- lang/RScheme/distinfo | 5 ++++- lang/RScheme/patches/patch-ae | 13 +++++++++++++ lang/RScheme/patches/patch-af | 17 +++++++++++++++++ lang/RScheme/patches/patch-ag | 17 +++++++++++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 lang/RScheme/patches/patch-ae create mode 100644 lang/RScheme/patches/patch-af create mode 100644 lang/RScheme/patches/patch-ag diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile index c0851add8e9..92b902e079c 100644 --- a/lang/RScheme/Makefile +++ b/lang/RScheme/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2002/03/05 13:15:04 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/06 06:48:15 jmc Exp $ DISTNAME= rs-0.7.3.1 PKGNAME= RScheme-0.7.3.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ftp://ftp.rscheme.org/pub/rscheme/ diff --git a/lang/RScheme/PLIST b/lang/RScheme/PLIST index 3222323a6fb..736f78fa40f 100644 --- a/lang/RScheme/PLIST +++ b/lang/RScheme/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:43 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/06 06:48:15 jmc Exp $ bin/RScheme lib/RScheme/bin/lssctl lib/RScheme/bin/rs @@ -194,6 +194,11 @@ lib/RScheme/resource/modules/threads.mx lib/RScheme/resource/modules/unixm.mif lib/RScheme/resource/modules/unixm.mx lib/RScheme/resource/system.img +lib/RScheme/resource/modules/libsyscalls.so +lib/RScheme/resource/modules/libunixm.so +lib/RScheme/resource/modules/libfasl.so +lib/RScheme/resource/modules/librs_sys_threads_manager.so +lib/RScheme/resource/modules/libdb.so share/doc/RScheme/COPYING share/doc/RScheme/README @dirrm share/doc/RScheme diff --git a/lang/RScheme/distinfo b/lang/RScheme/distinfo index 6f53858a367..e67601ac4f8 100644 --- a/lang/RScheme/distinfo +++ b/lang/RScheme/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/03/05 08:45:33 jmc Exp $ +$NetBSD: distinfo,v 1.4 2002/03/06 06:48:15 jmc Exp $ SHA1 (rs-0.7.3.1.tar.gz) = 31f8b515e394e3e467e0f445335a3fdf22fcdb63 Size (rs-0.7.3.1.tar.gz) = 1872020 bytes @@ -6,3 +6,6 @@ SHA1 (patch-aa) = c7021af105513a71b3ddbeddd15865c1e197b1a4 SHA1 (patch-ab) = 29f4eb38c21631dc92bb5ff086fecc56d35ed366 SHA1 (patch-ac) = 3b4924d62afa5fc7c4a4973fe48eead719e1d7a4 SHA1 (patch-ad) = b4387026fb26f2a75af49eed113708ff218ae04a +SHA1 (patch-ae) = 3e47bf75f359e480293cf21f14ef4e0c9115fedd +SHA1 (patch-af) = 5ffd5d2a3afd76edd1b4de7bacd07389bad27ee8 +SHA1 (patch-ag) = 11f32cedb3e2ab4879676d55b4ecf886ee89164b diff --git a/lang/RScheme/patches/patch-ae b/lang/RScheme/patches/patch-ae new file mode 100644 index 00000000000..7ced8770061 --- /dev/null +++ b/lang/RScheme/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2002/03/06 06:48:16 jmc Exp $ + +--- packages/pkg-bld.orig Tue Jan 12 22:03:47 1999 ++++ packages/pkg-bld Wed Mar 6 05:48:19 2002 +@@ -41,7 +41,7 @@ + + if test -d src/pkg/$PKG + then cd src/pkg/$PKG +- make INSTALL_DIR=$INSTALL_DIR install ++ make INSTALL_DIR=$INSTALL_DIR install install.so + else cp -p src/pkg/modules/$P.mif $INSTALL_DIR/resource/modules + cp -p src/pkg/modules/$P.mx $INSTALL_DIR/resource/modules + fi diff --git a/lang/RScheme/patches/patch-af b/lang/RScheme/patches/patch-af new file mode 100644 index 00000000000..6e453d6a9c8 --- /dev/null +++ b/lang/RScheme/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.1 2002/03/06 06:48:16 jmc Exp $ + +--- stage0/configure.orig Mon Nov 27 02:03:11 2000 ++++ stage0/configure Wed Mar 6 06:24:01 2002 +@@ -2762,8 +2762,10 @@ + $(SO_PRODUCT): $(SOFILES) + $(CC) -shared $(SOFILES) -o $(SO_PRODUCT) $(XLFLAGS) + +-%.so: %.c +- $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $^ ++.SUFFIXES: .so ++ ++.c.so: ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o ${.TARGET} ${.IMPSRC} + + install.so: $(SO_PRODUCT) + cp $(SO_PRODUCT) $(INSTALL_DIR)/resource/modules diff --git a/lang/RScheme/patches/patch-ag b/lang/RScheme/patches/patch-ag new file mode 100644 index 00000000000..f7e292c2876 --- /dev/null +++ b/lang/RScheme/patches/patch-ag @@ -0,0 +1,17 @@ +$NetBSD: patch-ag,v 1.1 2002/03/06 06:48:17 jmc Exp $ + +--- handc/configure.orig Mon Nov 27 02:03:11 2000 ++++ handc/configure Wed Mar 6 06:23:50 2002 +@@ -2762,8 +2762,10 @@ + $(SO_PRODUCT): $(SOFILES) + $(CC) -shared $(SOFILES) -o $(SO_PRODUCT) $(XLFLAGS) + +-%.so: %.c +- $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $^ ++.SUFFIXES: .so ++ ++.c.so: ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o ${.TARGET} ${.IMPSRC} + + install.so: $(SO_PRODUCT) + cp $(SO_PRODUCT) $(INSTALL_DIR)/resource/modules -- cgit v1.2.3