Replace incomplete buildlinkization (-I${LOCALBASE}/include in the patches!)

with complete buildlink2ization.
Fixes pkg/18160.

6 files changed, 10 insertions, 61 deletions

diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 7df7507b4b4..a3069d3d8e6 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/05/29 14:45:57 yyamano Exp $
+# $NetBSD: Makefile,v 1.27 2002/09/03 22:40:37 wiz Exp $
 #
 
 DISTNAME=       siag-3.1.20
@@ -12,20 +12,20 @@ COMMENT=	Poor man's office suite with spreadsheet, word processor, etc
 
 DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=	guile>=1.3:../../lang/guile
 
 CONFIGURE_ARGS=	--with-x --with-guile --includedir=${BUILDLINK_DIR}/include
 GNU_CONFIGURE=  YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
+USE_X11=	YES
 
 CFLAGS+=	-Dunix
 _STRIPFLAG_INSTALL=
 
 XAW_TYPE?=	3d
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
-.include "../../mk/xaw.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../lang/guile/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/distinfo b/misc/siag/distinfo
index 0297cee6594..521663e3acd 100644
--- a/misc/siag/distinfo
+++ b/misc/siag/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/09/03 22:40:37 wiz Exp $
 
 SHA1 (siag-3.1.20.tar.gz) = 9c05e18e89aa226f31ddda7e3fdb5e7dff2e5cdc
 Size (siag-3.1.20.tar.gz) = 1178500 bytes
-SHA1 (patch-aa) = 5e622c2bf11f437d7406858e938ff4c3583598e7
-SHA1 (patch-ab) = 2f4d4b859ec3640a4f3400ee91a106e3c97ab143
-SHA1 (patch-ac) = e992b49ee27fd8b7baed479287d1b37bd98ad73d
-SHA1 (patch-ad) = 990df25f5a988318ee2d32fe0ff4ec51171eb63e
+SHA1 (patch-aa) = 108f69f4374bfb4eca9e0d5a59b9be23e1fa271f
 SHA1 (patch-ae) = 179e1e76347b3191c7378dd8018cbeef227d4c39
 SHA1 (patch-af) = 4042d65d92ceb36ce984ece9338484971df19fd8
 SHA1 (patch-ag) = 107fde05207928fdf3eeb61c0df63ae68c21924b
diff --git a/misc/siag/patches/patch-aa b/misc/siag/patches/patch-aa
index b5d8f0dc4b3..c441636a764 100644
--- a/misc/siag/patches/patch-aa
+++ b/misc/siag/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1999/10/27 09:51:32 agc Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/03 22:40:38 wiz Exp $
 
 --- siag/Makefile.in.orig	Tue Jul  6 02:09:00 1999
 +++ siag/Makefile.in	Thu Oct 21 16:07:11 1999
-@@ -58,7 +58,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- AWK = @AWK@
--CC = @CC@
-+CC = @CC@ -I${LOCALBASE}/include
- GUILE = @GUILE@
- LIBCURSES = @LIBCURSES@
- LIBDL = @LIBDL@
 @@ -423,12 +423,12 @@
  
  install-data-local:
diff --git a/misc/siag/patches/patch-ab b/misc/siag/patches/patch-ab
deleted file mode 100644
index 9ee1871deb2..00000000000
--- a/misc/siag/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/03/05 01:52:32 hubertf Exp $
-
---- tsiag/Makefile.in.BAK	Fri Mar  5 02:08:21 1999
-+++ tsiag/Makefile.in	Fri Mar  5 02:08:54 1999
-@@ -58,7 +58,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- AWK = @AWK@
--CC = @CC@
-+CC = @CC@ -I${LOCALBASE}/include
- GUILE = @GUILE@
- LIBCURSES = @LIBCURSES@
- LIBDL = @LIBDL@
diff --git a/misc/siag/patches/patch-ac b/misc/siag/patches/patch-ac
deleted file mode 100644
index 7f445fca86d..00000000000
--- a/misc/siag/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/03/05 01:52:32 hubertf Exp $
-
---- pw/Makefile.in.BAK	Fri Mar  5 02:10:45 1999
-+++ pw/Makefile.in	Fri Mar  5 02:11:26 1999
-@@ -58,7 +58,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- AWK = @AWK@
--CC = @CC@
-+CC = @CC@ -I${LOCALBASE}/include
- GUILE = @GUILE@
- LIBCURSES = @LIBCURSES@
- LIBDL = @LIBDL@
diff --git a/misc/siag/patches/patch-ad b/misc/siag/patches/patch-ad
deleted file mode 100644
index cf88062c513..00000000000
--- a/misc/siag/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/03/05 01:52:32 hubertf Exp $
-
---- egon/Makefile.in.BAK	Fri Mar  5 02:13:20 1999
-+++ egon/Makefile.in	Fri Mar  5 02:13:29 1999
-@@ -58,7 +58,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- AWK = @AWK@
--CC = @CC@
-+CC = @CC@ -I${LOCALBASE}/include
- GUILE = @GUILE@
- LIBCURSES = @LIBCURSES@
- LIBDL = @LIBDL@