- Update to 0.97

svn path=/head/; revision=135535

sysutils/grub/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grub
-PORTVERSION=	0.95
+PORTVERSION=	0.97
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
@@ -18,6 +18,7 @@ USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
 ONLY_FOR_ARCHS=		i386
 
 GRUB_DIR=	${DATADIR:C|^${PREFIX}/||}/i386-freebsd
@@ -27,7 +28,9 @@ MAN8=		grub.8 grub-install.8 grub-md5-crypt.8 grub-terminfo.8
 INFO=		grub multiboot
 PLIST_DIRS=	${GRUB_DIR} ${DATADIR:C|^${PREFIX}/||}
 PLIST_FILES=	bin/mbchk sbin/grub sbin/grub-install sbin/grub-md5-crypt \
-		sbin/grub-terminfo ${GRUB_DIR}/stage1 ${GRUB_DIR}/stage2
+		sbin/grub-terminfo sbin/grub-set-default \
+		${GRUB_DIR}/stage1 ${GRUB_DIR}/stage2
+
 .for f in e2fs fat ffs iso9660 jfs minix reiserfs ufs2 vstafs xfs
 PLIST_FILES+=	${GRUB_DIR}/${f}_stage1_5
 .endfor

sysutils/grub/distinfo

@@ -1,2 +1,2 @@
-MD5 (grub-0.95.tar.gz) = 4ca8e4363d5f1980f2c63b7f5cdbe0d1
-SIZE (grub-0.95.tar.gz) = 976017
+MD5 (grub-0.97.tar.gz) = cd3f3eb54446be6003156158d51f4884
+SIZE (grub-0.97.tar.gz) = 971783

sysutils/grub/files/patch-grub-install

@@ -4,8 +4,8 @@
      gnu*)
  	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
  	tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
--    freebsd*)
-+    freebsd[234]*)
+-    freebsd* | kfreebsd*-gnu)
++    freebsd[234]* | kfreebsd*-gnu)
  	tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \
  			    | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'`
 +	tmp_part=`echo "$1" \

sysutils/grub/files/patch-stage2::ufs2.h

@@ -1,17 +0,0 @@
---- stage2/ufs2.h.orig	Tue Jun 15 09:22:12 2004
-+++ stage2/ufs2.h	Tue Jun 15 09:28:20 2004
-@@ -68,12 +68,12 @@
-  * __uint* constants already defined in
-  * FreeBSD's /usr/include/machine/_types.h
-  */
--#ifndef _MACHINE__TYPES_H_
-+#if !defined(_MACHINE__TYPES_H_) && !defined(_MACHINE_ANSI_H_)
- typedef uint8_t                __uint8_t;
- typedef uint16_t               __uint16_t;
- typedef uint32_t               __uint32_t;
- typedef uint64_t               __uint64_t;
--#endif /* _MACHINE__TYPES_H_ */
-+#endif /* !_MACHINE__TYPES_H_ && !_MACHINE_ANSI_H_ */
- 
- #define i_size di_size
-