Buildlinkify.

10 files changed, 44 insertions, 42 deletions

diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index e78569ff91d..fc3ecb094e2 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/09/27 23:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/28 04:49:01 jlam Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
@@ -14,35 +14,35 @@ ALL_TARGET=	dep all
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 #
-# This HACK circumvent a problem with the use of
-# yacc that breaks the building process of sdcc.
-# Use of bison fixes this problem for now.
+# XXX - This HACK circumvent a problem with the use of yacc that breaks the
+# XXX - building process of sdcc.  Use of bison fixes this problem for now.
 #
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-# we link to the static boehm-gc library so we only
-# need this at compile time
-BUILD_DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
 YACC=		bison
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=      yes
-USE_PERL5=	yes
-CONFIGURE_ARGS+=--datadir=${LOCALBASE}/share/sdcc
+USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
+USE_GMAKE=      	YES
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/sdcc
 
 # needed for some arch's.  -fdollars-in-identifiers is enabled
 # by default on some, not on others
-CPPFLAGS+=	-fdollars-in-identifiers
-CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+CPPFLAGS+=		-fdollars-in-identifiers
+CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-CPPFLAGS+=	-I${WRKDIR}/include -DYY_NEVER_INTERACTIVE
+CPPFLAGS+=		-DYY_NEVER_INTERACTIVE
 
 post-extract:
-	${MKDIR} ${WRKDIR}/include
-	${LN} -fs /usr/include/sys/endian.h ${WRKDIR}/include
 	${RM} -f ${WRKSRC}/as/mcs51/string.h ${WRKSRC}/as/z80/string.h
+
+pre-configure: sys-endian-buildlink
+
+sys-endian-buildlink:
+	${MKDIR} ${BUILDLINK_DIR}/include
+	${LN} -fs /usr/include/sys/endian.h ${BUILDLINK_DIR}/include
 .endif
 
 post-install:
@@ -56,4 +56,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/avr/avr_design.txt ${PREFIX}/share/doc/sdcc/avr
 	${INSTALL_DATA} ${WRKSRC}/doc/z80/README ${PREFIX}/share/doc/sdcc/z80
 
+.include "../../devel/boehm-gc/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/sdcc/distinfo b/devel/sdcc/distinfo
index af781e6752e..dc1ca0e1e8a 100644
--- a/devel/sdcc/distinfo
+++ b/devel/sdcc/distinfo
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.5 2001/05/03 22:03:31 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2001/11/28 04:49:01 jlam Exp $
 
 SHA1 (sdcc-2.2.1-src.tar.gz) = c0d448bbdc86620d87b781f62635c51ab44b2235
 Size (sdcc-2.2.1-src.tar.gz) = 2015592 bytes
-SHA1 (patch-aa) = 94c041b23f72f0bd51ef76625c450f4938811808
+SHA1 (patch-aa) = c71789e19fb6547c8307812cd1f71ec38096c02b
 SHA1 (patch-ab) = 41d6d664da79ba97061d74428dc9cd3d3329901c
 SHA1 (patch-ac) = f291412d2fd15052ff8dd86874a4f2e208cb31ff
 SHA1 (patch-ad) = 87e80d25073d3e225c2094145df64867c287ad30
-SHA1 (patch-ae) = 5f6414ea1c00524efbf95745532471035afbfd52
-SHA1 (patch-af) = eda3a2f04a7a929ba117abab5a15283a5c47ef12
+SHA1 (patch-ae) = 0192ffac7b1cd6aa7809c37e5d4e83edf7893696
+SHA1 (patch-af) = 46dacb8a7c12d64d3593ad98fdf881e583afec09
 SHA1 (patch-ag) = 966234636ef78fa4bc46bb959664f27ef386a01d
 SHA1 (patch-ah) = cd19f7fa5a3c684eaf8982a4866bb7691f368ffa
 SHA1 (patch-ai) = 35dac8265be56cc77c5547fa0bc1240d80801f72
 SHA1 (patch-aj) = 9f936132c94b4920df1a276dbebfc1f050ef7ac0
 SHA1 (patch-ak) = 412efd5a8ba3713d0efd7e7fa994deaae5e03507
-SHA1 (patch-al) = a1f8378bf7cf7a204743fdba44bdf5bd5f278a04
-SHA1 (patch-am) = d51ffefad32f11f96a6006596231aede183cb394
-SHA1 (patch-an) = 3fc879a9aa8aaf2ac9cac9e84d9c68d2be8747ef
-SHA1 (patch-ao) = 53aafbbe54ae7eb7b0ad0954352d4a0ad4650f4a
+SHA1 (patch-al) = 1f1b728bb2f7c95962b3acb6e400826e846f1156
+SHA1 (patch-am) = f1db89cf067c71a9fdf15e3a57456a9ce018e3e6
+SHA1 (patch-an) = d385cf5eaf442f4100281db60847f9ce74fad4bb
+SHA1 (patch-ao) = 48d2bd504f8c407069105c5dfbb397496035e8b2
 SHA1 (patch-ap) = 396c3de9496fe717dcccd9404472cfbe0654669e
 SHA1 (patch-aq) = ba2d4e09cb07990399c566f0b364497bdc438a37
 SHA1 (patch-ar) = 71dd271f7ad7a506a54b116d083eb77f34a23f2c
 SHA1 (patch-as) = 79a1234f35a8e072ba42e89e86989a7efe54d836
 SHA1 (patch-at) = 3a41e9e1fc8d26baa6cbef1b666481d9977a2f98
 SHA1 (patch-au) = 36e6e5470112ba8c813b98f6e2283accb9d4f115
-SHA1 (patch-av) = 21802d0892891719b116adfc5bfdab60fabd32c3
+SHA1 (patch-av) = 617d0b03b5b27124a1cff549189f73dc492bbd48
 SHA1 (patch-aw) = 8429c7adf50e82629c6638a0f722ffc08eccfd3c
 SHA1 (patch-ax) = 9729ccb4b42412ea189d55a916d0b6093fe6cba6
 SHA1 (patch-ay) = e48cff86a76fe9225e5461b29288f94e7a44f308
diff --git a/devel/sdcc/patches/patch-aa b/devel/sdcc/patches/patch-aa
index 745686f2ff3..067c461544c 100644
--- a/devel/sdcc/patches/patch-aa
+++ b/devel/sdcc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $ 
+$NetBSD: patch-aa,v 1.5 2001/11/28 04:49:02 jlam Exp $ 
 
 --- as/z80/Makefile.in.orig	Mon Apr  9 21:38:43 2001
 +++ as/z80/Makefile.in	Mon Apr  9 21:38:59 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $
  infodir         = ${prefix}/info
  
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR)
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(BUILDLINK_DIR)/include -Dunix
  CFLAGS		= @CFLAGS@ -Wall -DINDEXLIB -DMLH_MAP -DUNIX -DSDK -funsigned-char -ggdb
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@ -lm
diff --git a/devel/sdcc/patches/patch-ae b/devel/sdcc/patches/patch-ae
index 9ad0db71a21..1656eec2a24 100644
--- a/devel/sdcc/patches/patch-ae
+++ b/devel/sdcc/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.5 2001/11/28 04:49:02 jlam Exp $
 
 --- support/cpp/Makefile.in.orig	Thu May  6 20:29:32 1999
 +++ support/cpp/Makefile.in	Fri Aug 25 23:17:26 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/29 16:15:15 dmcmahill Exp $
  
  STD_INC		= @sdcc_include_dir@
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -D_FORASXXXX_
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(LOCALBASE)/include -D_FORASXXXX_ -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(BUILDLINK_DIR)/include -D_FORASXXXX_ -Dunix
  CFLAGS		= @CFLAGS@
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@
diff --git a/devel/sdcc/patches/patch-af b/devel/sdcc/patches/patch-af
index ce4e82dfeae..a871cec73f3 100644
--- a/devel/sdcc/patches/patch-af
+++ b/devel/sdcc/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-af,v 1.5 2001/11/28 04:49:02 jlam Exp $
 
 --- support/gc/Makefile.in.orig	Tue May 11 17:14:06 1999
 +++ support/gc/Makefile.in	Fri Aug 25 23:17:26 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.4 2001/04/29 16:15:16 dmcmahill Exp $
  #  it for the C compiler.
  
 -CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I /usr/local/include
-+CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I$(LOCALBASE)/include -Dunix
++CFLAGS= -O2 -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT -I$(BUILDLINK_DIR)/include -Dunix
  
  # For dynamic library builds, it may be necessary to add flags to generate
  # PIC code, e.g. -fPIC on Linux.
diff --git a/devel/sdcc/patches/patch-al b/devel/sdcc/patches/patch-al
index 6d75eb1d727..31ceaf8ab96 100644
--- a/devel/sdcc/patches/patch-al
+++ b/devel/sdcc/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-al,v 1.4 2001/11/28 04:49:02 jlam Exp $
 
 --- Makefile.common.in.orig	Mon Apr  9 21:47:27 2001
 +++ Makefile.common.in	Mon Apr  9 21:47:40 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
  HAVE_LIBGC	= @HAVE_LIBGC@
  DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 -CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR)
-+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
++CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(BUILDLINK_DIR)/include -Dunix
  ifeq ($(HAVE_LIBGC),1)
  else
  CPPFLAGS 	+= -I$(PRJDIR)/support
diff --git a/devel/sdcc/patches/patch-am b/devel/sdcc/patches/patch-am
index 7353a547731..444662ce5ad 100644
--- a/devel/sdcc/patches/patch-am
+++ b/devel/sdcc/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-am,v 1.4 2001/11/28 04:49:02 jlam Exp $
 
 --- device/include/Makefile.in.orig	Mon Apr  9 21:50:32 2001
 +++ device/include/Makefile.in	Mon Apr  9 21:50:47 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
  srcdir          = @srcdir@
  
 -CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR)
-+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(LOCALBASE)/include -Dunix
++CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(BUILDLINK_DIR)/include -Dunix
  
  
  # Compiling entire program or any subproject
diff --git a/devel/sdcc/patches/patch-an b/devel/sdcc/patches/patch-an
index f64c4aba76b..a4af67ff70f 100644
--- a/devel/sdcc/patches/patch-an
+++ b/devel/sdcc/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-an,v 1.4 2001/11/28 04:49:02 jlam Exp $
 
 --- device/lib/Makefile.in.orig	Mon Apr  9 21:52:41 2001
 +++ device/lib/Makefile.in	Mon Apr  9 21:53:06 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
  srcdir          = @srcdir@
  
 -CPPFLAGS        = -I$(INCDIR) 
-+CPPFLAGS        = -I$(INCDIR) -I$(LOCALBASE)/include -Dunix
++CPPFLAGS        = -I$(INCDIR) -I$(BUILDLINK_DIR)/include -Dunix
  CFLAGS		= 
  
  OBJECTS		= _atoi.rel _atol.rel _autobaud.rel _bp.rel _schar2fs.rel \
diff --git a/devel/sdcc/patches/patch-ao b/devel/sdcc/patches/patch-ao
index 914c1995be9..0115fc082a2 100644
--- a/devel/sdcc/patches/patch-ao
+++ b/devel/sdcc/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-ao,v 1.4 2001/11/28 04:49:02 jlam Exp $
 
 --- debugger/mcs51/Makefile.in.orig	Sat Apr 29 18:25:05 2000
 +++ debugger/mcs51/Makefile.in	Sun Apr 29 03:16:50 2001
@@ -6,13 +6,13 @@ $NetBSD: patch-ao,v 1.3 2001/04/29 16:15:16 dmcmahill Exp $
  
  STD_INC		= @sdcc_include_dir@
 -CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support
-+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support -I$(LOCALBASE)/include -Dunix
++CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support -I$(BUILDLINK_DIR)/include -Dunix
  CFLAGS		= @CFLAGS@
  M_OR_MM		= @M_OR_MM@
  LDFLAGS		= @LDFLAGS@
  LIBS            = -lgc @LIBS@
 -LIBDIRS         = -L$(PRJDIR)/support/gc
-+LIBDIRS         = -L$(LOCALBASE)/lib
++LIBDIRS         = -L$(BUILDLINK_DIR)/lib
  
  
 @@ -47,7 +47,4 @@
diff --git a/devel/sdcc/patches/patch-av b/devel/sdcc/patches/patch-av
index d29982744de..876c0766d80 100644
--- a/devel/sdcc/patches/patch-av
+++ b/devel/sdcc/patches/patch-av
@@ -1,10 +1,10 @@
-$NetBSD: patch-av,v 1.1 2001/04/29 16:15:16 dmcmahill Exp $
+$NetBSD: patch-av,v 1.2 2001/11/28 04:49:03 jlam Exp $
 
 --- src/Makefile.in.orig	Sat Sep 30 15:39:35 2000
 +++ src/Makefile.in	Sun Apr 29 04:03:44 2001
 @@ -14,4 +14,5 @@
  LIBS		= -lgc -lm @LIBS@
  ifeq ($(HAVE_LIBGC), 1)
-+LIBDIRS		= -L$(LOCALBASE)/lib
++LIBDIRS		= -L$(BUILDLINK_DIR)/lib
  else
  LIBDIRS		= -L$(PRJDIR)/support/gc