pkg/36471: lang/scm build fails in current pkgsrc

[Aleksej Saushev <asau%hotbox.ru@localhost>]

>Number:         36471
>Category:       pkg
>Synopsis:       lang/scm build fails in current pkgsrc
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 11 17:15:00 +0000 2007
>Originator:     Aleksej Saushev <asau%hotbox.ru@localhost>
>Release:        NetBSD 4.99.20
>Organization:
>Environment:
System: NetBSD asau.local 4.99.20 NetBSD 4.99.20 (KERN) #26: Wed Jun 6 00:48:33 
MSD 2007 root%asau.local@localhost:/usr/obj/sys/arch/i386/compile/KERN i386
Architecture: i386
Machine: i386
>Description:
        lang/scm build fails in current pkgsrc, also the package
        needs to be updated.
>How-To-Repeat:
        cd lang/scm && make
>Fix:

Change Makefile, PLIST, patches/patch-aa, patches/patch-ab as follows.

Patch Makefile:
-------------------------------8<-------------------------------
--- Makefile.orig       2007-03-01 13:58:51.000000000 +0300
+++ Makefile    2007-06-11 20:18:35.000000000 +0400
@@ -6,8 +6,8 @@
 #
 # Do not forget to update InitXXX.scm in files/buildscm.scm
 
-DISTNAME=      scm5e1
-PKGNAME=       scm-5.5.1
+DISTNAME=      scm5e3
+PKGNAME=       scm-5.5.3
 PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://swissnet.ai.mit.edu/ftpdir/scm/
@@ -19,7 +19,7 @@
 
 DEPENDS+=      slib>=3.1.1:../../devel/slib
 
-USE_TOOLS+=    gmake
+#USE_TOOLS+=   gmake
 
 WRKSRC=                ${WRKDIR}/scm
 EVAL_PREFIX+=  SLIB_PREFIX=slib
-------------------------------8<-------------------------------

Patch PLIST:
-------------------------------8<-------------------------------
--- PLIST.orig  2006-08-21 17:12:01.000000000 +0400
+++ PLIST       2007-06-11 21:05:55.000000000 +0400
@@ -14,7 +14,7 @@
 share/scm/COPYING
 share/scm/Idiffer.scm
 share/scm/Iedline.scm
-share/scm/Init5e1.scm
+share/scm/Init5e3.scm
 share/scm/Link.scm
 share/scm/Macexp.scm
 share/scm/Macro.scm
@@ -28,8 +28,10 @@
 share/scm/mkimpcat.scm
 share/scm/r4rstest.scm
 share/scm/require.scm
+share/scm/rwb-isam.scm
 share/scm/scmhob.scm
 share/scm/slibcat
+share/scm/wbtab.scm
 share/scm/x11.scm
 share/scm/xatoms.scm
 share/scm/xevent.scm
-------------------------------8<-------------------------------

Replace patches/patch-aa:
-------------------------------8<-------------------------------
$NetBSD$

--- Makefile.orig       2007-06-11 20:40:19.000000000 +0400
+++ Makefile    2007-06-11 20:40:53.000000000 +0400
@@ -44,7 +44,7 @@
 SHELL = /bin/sh
 #CC = gcc
 #CFLAGS = -g
-#LIBS =
+LIBS = -lm
 #LD = $(CC) -g
 LD = $(CC)
 SCMLIT = ./scmlit
@@ -86,7 +86,7 @@
        echo "srcdir=`pwd`/" >> srcdir.mk
 #srcdir=$(HOME)/scm/
 #srcdir=/usr/local/src/scm/
-include srcdir.mk
+#include srcdir.mk
 
 # directory where COPYING and InitXXX.scm reside.
 #IMPLPATH = /usr/local/src/scm/
@@ -110,7 +110,9 @@
 # continue-ia64.o
 ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \
        Tscript.scm compile.scm Iedline.scm Idiffer.scm
-hobfiles = hobbit.scm scmhob.scm scmhob.h
+hobsrcs = hobbit.scm scmhob.scm
+hobincs = scmhob.h
+hobfiles = $(hobsrcs) $(hobincs)
 turfiles = turtlegr.c turtle grtest.scm
 xafiles = xatoms.scm x11.scm xevent.scm keysymdef.scm
 xfiles = x.c x.h xgen.scm xevent.h inc2scm $(xafiles)
@@ -249,7 +251,7 @@
        echo "-F engineering-notation" >> libscm.opt
        echo "-F dynamic-linking" >> libscm.opt
 mylib: libscm.a
-libscm.a:      libscm.opt
+libscm.a:      libscm.opt scmlit
        $(BUILD) -t lib -f libscm.opt
 libtest:       libscm.a libtest.c
        $(LD) -o libtest libtest.c libscm.a -ldl -lm -lc
@@ -420,12 +422,12 @@
 
 rpm_prefix=$(HOME)/rpmbuild/
 
-prefix = /usr/local/
+prefix = $(PREFIX)/
 exec_prefix = $(prefix)
 # directory where `make install' will put executable.
 bindir = $(exec_prefix)bin/
 libdir = $(exec_prefix)lib/
-libscmdir = $(libdir)scm/
+libscmdir = $(prefix)share/scm/
 # directory where `make install' will put manual page.
 mandir = $(prefix)man/
 man1dir = $(mandir)man1/
@@ -477,7 +479,7 @@
 $(infodir)hobbit.info.gz:      $(infodir)hobbit.info
        gzip -f $(infodir)hobbit.info
 
-install:       scm.1 db.so wbtab.scm rwb-isam.scm
+install:
        test -d $(bindir) || mkdir $(bindir)
        test -d $(mandir) || mkdir $(mandir)
        test -d $(man1dir) || mkdir $(man1dir)
@@ -486,16 +488,16 @@
        -cp scm.1 $(man1dir)
        test -d $(libdir) || mkdir $(libdir)
        test -d $(libscmdir) || mkdir $(libscmdir)
-       -cp $(ifiles) $(hobfiles) COPYING r4rstest.scm $(libscmdir)
+       -cp $(ifiles) $(hobsrcs) COPYING r4rstest.scm $(libscmdir)
        test -f $(libscmdir)require.scm || \
                cp requires.scm $(libscmdir)require.scm
-       -cp build build.scm mkimpcat.scm Iedline.scm $(SHOBJS) patchlvl.h\
+       -cp build build.scm mkimpcat.scm Iedline.scm $(SHOBJS) \
                $(xafiles) $(libscmdir)
        -cp db.so wbtab.scm rwb-isam.scm $(libscmdir)
 
 installlib:
        test -d $(includedir) || mkdir $(includedir)
-       cp scm.h scmfig.h scmflags.h $(includedir)
+       cp scm.h scmfig.h scmflags.h patchlvl.h $(hobincs) $(includedir)
        test -d $(libdir) || mkdir $(libdir)
        cp libscm.a $(libdir)libscm.a
 
-------------------------------8<-------------------------------


Replace patches/patch-ab:
-------------------------------8<-------------------------------
$NetBSD$

--- socket.c.orig       2006-01-07 05:17:38.000000000 +0300
+++ socket.c    2007-06-11 20:47:23.000000000 +0400
@@ -149,7 +149,7 @@
   struct in_addr inad;
   const char **argv;
   int i = 0;
-# ifndef linux
+#if !(defined(linux) || defined(__NetBSD__))
   if (UNBNDP(name)) {
     DEFER_INTS;
     SYSCALL(entry = gethostent(););
-------------------------------8<-------------------------------