Get rid of the trivial patch and dependent REINPLACE_CMD call when MAKE_ARGS

can do this job better and yet be more readable and straightforward.

Verified by:	comparing build logs
Feature safe:	yes

2 files changed, 1 insertions, 21 deletions

diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index f84a263fb921..e8a974e8cec2 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -21,6 +21,7 @@ ONLY_FOR_ARCHS=	i386
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=	yes
+MAKE_ARGS=	OS=${OPSYS:U} KERNEL=${OSREL:S/.//g}
 
 # This will play merry hell with portlint(1)
 BINS=		bonus/asmutils basename cal cat chmod chown chroot cmp cp \
@@ -45,7 +46,6 @@ PLIST_DIRS=	bin/asmutils lib/asmutils
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%%KERNEL%%,${OSREL:S/.//g},g' ${WRKSRC}/MCONFIG
 	@${REINPLACE_CMD} -e 's,^static ,,' ${WRKSRC}/lib/libm.c
 
 # Stripping binaries will break installation
diff --git a/devel/asmutils/files/patch-MCONFIG b/devel/asmutils/files/patch-MCONFIG
deleted file mode 100644
index 4dbe0c311963..000000000000
--- a/devel/asmutils/files/patch-MCONFIG
+++ /dev/null
@@ -1,20 +0,0 @@
---- MCONFIG.orig	Fri Mar 15 01:42:46 2002
-+++ MCONFIG	Sun Feb  8 01:06:18 2004
-@@ -13,7 +13,7 @@
- # Target operating system. Valid values are:
- # LINUX FREEBSD OPENBSD NETBSD SOLARIS UNIXWARE BEOS ATHEOS
- 
--OS = LINUX
-+OS = FREEBSD
- 
- # Kernel version of target OS (1.2 = 12, 2.4 = 24, 3.6 = 36, etc)
- 
-@@ -25,7 +25,7 @@
- # in executable even if it is not present in object file.
- # So, if your ld always adds .bss - you can just forget about it.
- 
--KERNEL = 24
-+KERNEL = %%KERNEL%%
- 
- # Optimization method (SIZE/SPEED)
-