Instead of trying to workaround the possible conflict between grub's

internal term.h and ncurses' term.h, just rename grub's to grubterm.h
and avoid the potential problems altogether.

4 files changed, 19 insertions, 34 deletions

diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 48d581dc16b..6a23b47ca32 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/08/21 15:08:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/09/24 00:15:03 jlam Exp $
 #
 
 DISTNAME=	grub-0.97
@@ -25,6 +25,9 @@ BUILD_DEFS+=		GRUB_NETWORK_CARDS
 BUILD_DEFS+=		GRUB_PRESET_COMMAND
 BUILD_DEFS+=		GRUB_SCAN_ARGS
 
+.include "../../devel/binutils/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+
 .if defined(GRUB_NETWORK_CARDS)
 CONFIGURE_ARGS+=	--enable-diskless
 PLIST_SUBST+=		NETBOOT=
@@ -33,7 +36,8 @@ PLIST_SUBST+=		NETBOOT=
 CONFIGURE_ARGS+=	--enable-${GRUB_NETWORK_CARD}
 .endfor
 
-post-install:
+post-install: grub-netboot-install
+grub-netboot-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub
 	${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
 		${PREFIX}/share/doc/grub
@@ -44,7 +48,8 @@ PLIST_SUBST+=		NETBOOT="@comment "
 .if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND)
 CONFIGURE_ARGS+=	--enable-preset-menu=${WRKSRC}/presetmenu
 
-post-extract:
+post-extract: grub-presetmenu
+grub-presetmenu:
 	${ECHO} ${GRUB_PRESET_COMMAND} > ${WRKSRC}/presetmenu
 .endif
 
@@ -52,6 +57,14 @@ post-extract:
 CONFIGURE_ARGS+=	${GRUB_SCAN_ARGS}
 .endif
 
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+SUBST_CLASSES+=		grubterm
+SUBST_STAGE.grubterm=	post-patch
+SUBST_MESSAGE.grubterm=	"Changing references to <term.h> to <grubterm.h>"
+SUBST_FILES.grubterm=	grub/*.c stage2/Makefile.in stage2/*.c
+SUBST_SED.grubterm=	-e "s,<term.h>,<grubterm.h>,g"			\
+			-e "s, term.h , grubterm.h ,g"
+
+post-extract:
+	${MV} ${WRKSRC}/stage2/term.h ${WRKSRC}/stage2/grubterm.h
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index 55c34dd69ae..c092fb11a31 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.15 2005/08/21 15:08:46 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2005/09/24 00:15:03 jlam Exp $
 
 SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb
 RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0
 Size (grub-0.97.tar.gz) = 971783 bytes
-SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
-SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
 SHA1 (patch-ac) = c2c657af9b4ed15991d642a1359cb65d61662df6
 SHA1 (patch-ad) = b4977c8dad4535b6e878e51a155a2ac0cfaa893d
 SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144
diff --git a/sysutils/grub/patches/patch-aa b/sysutils/grub/patches/patch-aa
deleted file mode 100644
index c4698f6951f..00000000000
--- a/sysutils/grub/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/01/24 23:49:55 jmmv Exp $
-
---- grub/main.c.orig	Mon Jun 10 18:20:38 2002
-+++ grub/main.c
-@@ -31,7 +31,7 @@ int grub_stage2 (void);
- 
- #define WITHOUT_LIBC_STUBS 1
- #include <shared.h>
--#include <term.h>
-+#include "../stage2/term.h"
- 
- char *program_name = 0;
- int use_config_file = 1;
diff --git a/sysutils/grub/patches/patch-ab b/sysutils/grub/patches/patch-ab
deleted file mode 100644
index bfc82e72f6c..00000000000
--- a/sysutils/grub/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/24 23:49:55 jmmv Exp $
-
---- grub/asmstub.c.orig	Tue Dec  3 00:20:45 2002
-+++ grub/asmstub.c
-@@ -61,7 +61,7 @@ int grub_stage2 (void);
- #include <shared.h>
- #include <device.h>
- #include <serial.h>
--#include <term.h>
-+#include "../stage2/term.h"
- 
- /* Simulated memory sizes. */
- #define EXTENDED_MEMSIZE (3 * 1024 * 1024)	/* 3MB */