CVS commit: pkgsrc/sysutils/grub2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Sep 16 15:07:54 UTC 2018

Modified Files:
        pkgsrc/sysutils/grub2: Makefile

Log Message:
grub2: some cosmetics

* remove util/grub-install.in: file not longer exists (fix SUBST warning)
* change ABI= to .under ABI (fix pkglint warning)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/grub2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/grub2/Makefile
diff -u pkgsrc/sysutils/grub2/Makefile:1.15 pkgsrc/sysutils/grub2/Makefile:1.16
--- pkgsrc/sysutils/grub2/Makefile:1.15 Sun Sep 16 14:37:08 2018
+++ pkgsrc/sysutils/grub2/Makefile      Sun Sep 16 15:07:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/09/16 14:37:08 triaxx Exp $
+# $NetBSD: Makefile,v 1.16 2018/09/16 15:07:54 triaxx Exp $
 
 DISTNAME=              grub-2.02
 PKGNAME=               ${DISTNAME:S/grub/grub2/}
@@ -65,7 +65,7 @@ PLIST_SUBST+=         GRUB_PLATFORM=${GRUB_PLAT
 # Unset ABI to prevent pkgsrc's gcc wrapper from messing with -m flags.
 #
 .if defined(ABI) && !empty(ABI)
-ABI=
+.undef ABI
 .endif
 
 #
@@ -113,7 +113,7 @@ SUBST_SED.fix-os-conf=              -e 's,^@COND_HOS
 SUBST_CLASSES+=                        fix-paths-1
 SUBST_STAGE.fix-paths-1=       pre-configure
 SUBST_MESSAGE.fix-paths-1=     Fixing configuration paths in scripts.
-SUBST_FILES.fix-paths-1=       util/grub-install.in util/grub-mkconfig.in
+SUBST_FILES.fix-paths-1=       util/grub-mkconfig.in
 SUBST_SED.fix-paths-1=         -e 's,\(\$${sysconfdir}"\{0\,1\}\)/grub.d,\1,g'
 SUBST_SED.fix-paths-1+=                -e 's,\(\$${sysconfdir}"\{0\,1\}\)/default/grub,\1/default.conf,g'