From 6c1697a655dfa5ac31f89c59a094d33af3e1c7c2 Mon Sep 17 00:00:00 2001 From: kei Date: Tue, 15 Oct 2002 11:27:11 +0000 Subject: fixed some build and installation issue. tested on 1.6D/i386. - use buildlink2 - it needs MesaLib - added missing entries into PLIST - /usr/local, /usr/pkg --> ${PREFIX} - modified the way of handling LDFLAGS - and some minor stuff --- lang/drscheme/Makefile | 11 +++++++---- lang/drscheme/PLIST | 11 ++++++++++- lang/drscheme/distinfo | 9 +++++---- lang/drscheme/patches/patch-ah | 4 ++-- lang/drscheme/patches/patch-al | 8 ++++---- lang/drscheme/patches/patch-an | 4 ++-- lang/drscheme/patches/patch-ao | 13 +++++++++++++ 7 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 lang/drscheme/patches/patch-ao (limited to 'lang') diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 842efd37e50..99113b62110 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/09/01 16:33:31 jschauma Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/15 11:27:11 kei Exp $ # DISTNAME= plt.src.x @@ -17,11 +17,11 @@ COMMENT= R4RS-compilant and nearly R5RS-compliant scheme tailored for teaching CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme +USE_BUILDLINK2= yes +USE_X11= yes USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes -LDFLAGS= -L${LOCALBASE}/lib -CFLAGS= -I${LOCALBASE}/include ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-* @@ -32,7 +32,9 @@ post-patch: ${WRKDIR}/plt/bin/background-help-desk \ ${WRKDIR}/plt/bin/drscheme \ ${WRKDIR}/plt/bin/help-desk \ + ${WRKDIR}/plt/bin/mred \ ${WRKDIR}/plt/bin/mzc \ + ${WRKDIR}/plt/bin/mzscheme \ ${WRKDIR}/plt/bin/setup-plt \ ${WRKDIR}/plt/bin/tex2page \ ${WRKDIR}/plt/man/man1/mzscheme.1 \ @@ -47,7 +49,7 @@ post-patch: @${MV} -f ${WRKSRC}/mred/Makefile.in ${WRKSRC}/foo @${SED} -e 's|@X11PREFIX@|${X11PREFIX}|' < ${WRKSRC}/foo > ${WRKSRC}/mred/Makefile.in @${RM} -f ${WRKSRC}/foo - @${RM} -f ${WRKSRC}/../bin/*.orig + @${FIND} ${WRKDIR} -name '*.orig' | ${XARGS} ${RM} -f do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/plt/collects @@ -70,4 +72,5 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/../install ${PREFIX}/lib/plt @cd ${PREFIX}/lib/plt && ${ECHO} y | ${SH} install +.include "../../graphics/MesaLib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/drscheme/PLIST b/lang/drscheme/PLIST index 16bd937cc8c..c36aaf9f1bc 100644 --- a/lang/drscheme/PLIST +++ b/lang/drscheme/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/31 20:27:48 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/10/15 11:27:11 kei Exp $ bin/background-help-desk bin/drscheme bin/help-desk @@ -3346,18 +3346,27 @@ lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/monit lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/plt-logo.gif lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/servlet-examples.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/servlet.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/password-refresh-message.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-access-message.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-host-root.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-htdocs.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-log.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-message-root.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-not-found-message.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-password.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-protocol-message.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-servlet-message.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/path-servlet.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/port.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/realm-name.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/realm-pattern.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/servlet-refresh-message.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-default-servlet.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-file-base.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-file-per-byte.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-initial.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-password.html +lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/time-servlet-connection.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/terms/waiting.html lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/web-server.gif lib/plt/collects/web-server/default-web-root/htdocs/Defaults/index.html diff --git a/lang/drscheme/distinfo b/lang/drscheme/distinfo index b13c6dacb33..101d8688713 100644 --- a/lang/drscheme/distinfo +++ b/lang/drscheme/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/09/24 22:04:44 jschauma Exp $ +$NetBSD: distinfo,v 1.7 2002/10/15 11:27:11 kei Exp $ SHA1 (drscheme/202/plt.src.x.tar.gz) = bb06b6e3f8214db71ebb12e95e744f996622ee06 Size (drscheme/202/plt.src.x.tar.gz) = 6133563 bytes @@ -9,10 +9,11 @@ SHA1 (patch-ad) = 99002a77b1402149f9d646c2ffdf9ee3e71a88b0 SHA1 (patch-ae) = 1148c4cc8ea49ae67b1ba89539bcb2782a04461a SHA1 (patch-af) = d0e8182ce4850bbc9886de0770d45e0e4b857be4 SHA1 (patch-ag) = 4670f21302de022e299be0aeaa9d6c22abadd1ee -SHA1 (patch-ah) = 3e576b4b1d95447009193541d00db4641632bbc4 +SHA1 (patch-ah) = 4c6fa4ca44ae951b67ea4ebc1f8df841ccabdf10 SHA1 (patch-ai) = cdab7bed524279a287845f03c642c7aafead7dc6 SHA1 (patch-aj) = 03703c150d860d5bc0f21892f0ef38df7c6f9455 SHA1 (patch-ak) = 10aea7a3186df281056c79f0d6a040c959c838d0 -SHA1 (patch-al) = 1c9944a161e88a21b6f986762883f26d02546e8d +SHA1 (patch-al) = 8ce4ee20d21048bfea9eb74815b259aa690a4631 SHA1 (patch-am) = afeb2c469b55f1b9fdadf4e064928b59bf28d794 -SHA1 (patch-an) = 43ced123a60b7541920104f64f88bfbf7ef16808 +SHA1 (patch-an) = bca5a79edd48a2670d02496b6da3799c13c0aed6 +SHA1 (patch-ao) = 667593d28a695fd7caee210deb8ee06e72019c40 diff --git a/lang/drscheme/patches/patch-ah b/lang/drscheme/patches/patch-ah index eca3d89f81e..b3c16e6e72f 100644 --- a/lang/drscheme/patches/patch-ah +++ b/lang/drscheme/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2002/08/31 20:27:49 jschauma Exp $ +$NetBSD: patch-ah,v 1.4 2002/10/15 11:27:11 kei Exp $ --- /dev/null Sat Aug 31 13:43:48 2002 +++ ../bin/mred Sat Aug 31 13:49:51 2002 @@ -7,7 +7,7 @@ $NetBSD: patch-ah,v 1.3 2002/08/31 20:27:49 jschauma Exp $ +# This script was created by make-mzscheme-launcher + +if [ "$PLTHOME" = '' ] ; then -+ PLTHOME="/usr/pkg/lib/plt" ++ PLTHOME="@PREFIX@/lib/plt" + export PLTHOME +fi + diff --git a/lang/drscheme/patches/patch-al b/lang/drscheme/patches/patch-al index 44c9c069271..6dd7c2bad87 100644 --- a/lang/drscheme/patches/patch-al +++ b/lang/drscheme/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.3 2002/08/31 20:27:49 jschauma Exp $ +$NetBSD: patch-al,v 1.4 2002/10/15 11:27:11 kei Exp $ ---- mred/Makefile.in.orig Wed Aug 28 18:59:54 2002 -+++ mred/Makefile.in Wed Aug 28 19:00:19 2002 +--- mred/Makefile.in.orig Fri Jul 12 17:01:01 2002 ++++ mred/Makefile.in Tue Oct 15 01:26:39 2002 @@ -35,7 +35,7 @@ CXXFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -D$(WXVARIANT) $(COMPFLAGS) CPPFLAGS = $(CXXFLAGS) CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -D$(WXVARIANT) $(COMPFLAGS) -LDFLAGS = $(XLIB) -+LDFLAGS = $(XLIB) -Wl,-R@X11PREFIX@/lib ++LDFLAGS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -L$(PREFIX)/lib -Wl,-R$(X11PREFIX)/lib $(XLIB) ########################### MREDLINKER = @MREDLINKER@ diff --git a/lang/drscheme/patches/patch-an b/lang/drscheme/patches/patch-an index e59f3fde520..f8a60810266 100644 --- a/lang/drscheme/patches/patch-an +++ b/lang/drscheme/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.1 2002/08/31 20:27:49 jschauma Exp $ +$NetBSD: patch-an,v 1.2 2002/10/15 11:27:12 kei Exp $ --- /dev/null Fri Aug 30 18:51:55 2002 +++ ../bin/mzscheme Fri Aug 30 19:06:01 2002 @@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.1 2002/08/31 20:27:49 jschauma Exp $ +# This script was created by make-mzscheme-launcher + +if [ "$PLTHOME" = '' ] ; then -+ PLTHOME="/usr/pkg/lib/plt" ++ PLTHOME="@PREFIX@/lib/plt" + export PLTHOME +fi + diff --git a/lang/drscheme/patches/patch-ao b/lang/drscheme/patches/patch-ao new file mode 100644 index 00000000000..9f5aaa422c6 --- /dev/null +++ b/lang/drscheme/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1 2002/10/15 11:27:12 kei Exp $ + +--- ../collects/slibinit/init.ss.orig Tue Oct 15 00:30:35 2002 ++++ ../collects/slibinit/init.ss Tue Oct 15 00:30:54 2002 +@@ -55,7 +55,7 @@ + [(base name dir?) (split-path base)]) + (and (string? base) base)))) + (case (system-type) +- ((unix macosx) "/usr/local/lib/plt") ++ ((unix macosx) "@PREFIX@/lib/plt") + ((windows) "C:\\Program Files\\PLT") + ((macos) "My Disk:plt:")))]) + (lambda () path))) -- cgit v1.2.3