grub: move to usr/bin.

srcpkgs/grub/template

@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.00
-revision=20
+revision=21
 hostmakedepends="flex"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
@@ -29,7 +29,8 @@ do_configure() {
 	CFLAGS="$CFLAGS -fno-stack-protector"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
-		--enable-grub-mkfont --enable-grub-mount --disable-werror "
+		--enable-grub-mkfont --enable-grub-mount --disable-werror
+		--sbindir=/usr/bin"
 
 	# fix unifont.bdf location so grub-mkfont can create *.pf2 files
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
@@ -63,11 +64,14 @@ do_build() {
 }
 
 do_install() {
+	# XXX remove the strip wrapper
+	rm ${XBPS_WRAPPERDIR}/strip
+
 	if [ -n "${_GRUBX64}" ]; then
 		cd $wrksrc/efi_build
 		make DESTDIR=$DESTDIR/efi install
 		# Remove non-platform specific files
-		rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin,sbin}}
+		rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin}}
 		rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/x86_64-*
 		rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/*.{module,image}
 		mv ${DESTDIR}/efi/* ${DESTDIR}
@@ -89,16 +93,16 @@ do_install() {
 
 	# update-grub for noobs.
 	printf "#!/bin/sh\ngrub-mkconfig -o /boot/grub/grub.cfg\nexit \$?\n" >> \
-		${DESTDIR}/usr/sbin/update-grub
-	chmod 755 ${DESTDIR}/usr/sbin/update-grub
+		${DESTDIR}/usr/bin/update-grub
+	chmod 755 ${DESTDIR}/usr/bin/update-grub
 
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/grub \
 		${DESTDIR}/usr/share/bash-completion/completions
 
 	# Remove useless tools
-	rm ${DESTDIR}/usr/sbin/grub-ofpathname
-	rm ${DESTDIR}/usr/sbin/grub-sparc64-setup
+	rm ${DESTDIR}/usr/bin/grub-ofpathname
+	rm ${DESTDIR}/usr/bin/grub-sparc64-setup
 }
 
 grub-utils_package() {