Re: Pkgsrc patches

[Greg Troxel]

OK, I've sent all 5 pkgsrc patches, of which I think 4 should probably
be applied.  Please feel free to ask about any of them, although I'll
point out that I'm not the originator of some of these.

In addition to the patches, pkgsrc bashes the slib support, and avoids
the rpath addition on Darwin.  Below, note:

  post-patch: unconditional replacement of ice-9 slib file

  post-patch: target conditional on darwin
  



# $NetBSD: Makefile,v 1.80 2008/01/04 18:17:16 joerg Exp $

DISTNAME=               guile-1.8.3
CATEGORIES=             lang
MASTER_SITES=           ${MASTER_SITE_GNU:=guile/}

MAINTAINER=             address@hidden
HOMEPAGE=               http://www.gnu.org/software/guile/guile.html
COMMENT=                GNU's Ubiquitous Intelligent Language for Extension

CONFLICTS=              guile14<1.4.1nb1 guile-oops-[0-9]*

PKG_DESTDIR_SUPPORT=    user-destdir

GNU_CONFIGURE=          YES
USE_TOOLS+=             gmake makeinfo
USE_LIBTOOL=            YES
USE_GNU_READLINE=       YES
PTHREAD_AUTO_VARS=      YES
INFO_FILES=             YES

# XXX Make this conditional on the problematic systems.
# couldn't figure out how to work around an error on solaris-2.9/sparc with gcc 
when
# compiling ${WRKSRC}/libguile/filesys.c.  The warning is that readdir64_r was 
missing
# a prototype.
CONFIGURE_ARGS+=        --disable-error-on-warning

TEST_DIRS=              .
TEST_TARGET=            check

OWN_DIRS=               ${PREFIX}/share/guile/site

.include "../../mk/bsd.prefs.mk"

# scmconfig.h will be rebuilt first thing.  This hack is here because
# gen-scmconfig.c includes string.h (from /usr/include) which in turn
# tries to include /usr/include/strings.h but instead the compiler picks
# up ./strings.h which tries to include scmconfig.h which doesn't exist
# yet.  While not a clean fix, this seems to work around the problem.
#
#
# for info on the slib part, see
# http://lists.gnu.org/archive/html/guile-user/2006-11/msg00035.html
post-patch:
        ${TOUCH} ${WRKSRC}/libguile/scmconfig.h
        ${ECHO} "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm
        ${ECHO} "(load-from-path \"slib/guile.init\")" >> 
${WRKSRC}/ice-9/slib.scm

.if ${OPSYS} == "DragonFly"
CONFIGURE_ARGS+=        ac_cv_type_complex_double=no
.endif

.if ${OPSYS} == "Darwin"
CPPFLAGS+=              -Dmacosx

# Darwin does not use -rpath, so back out the patch that adds it.  It
# is not clear that guile works properly if directories with modules
# are not in LTDL_LIBRARY_PATH or LD_LIBRARY_PATH.  See the following
# PRs:
#   http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=33665
#   http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=36975
post-patch:
        ${MV} ${WRKSRC}/guile-config/guile-config.in.orig \
            ${WRKSRC}/guile-config/guile-config.in
.endif

.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"