diff --git a/devel/lclint/Makefile b/devel/lclint/Makefile
index 51adb6388c9..538dd20ada9 100644
--- a/devel/lclint/Makefile
+++ b/devel/lclint/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2001/03/22 22:06:36 brad Exp $
+# $OpenBSD: Makefile,v 1.23 2001/03/23 15:56:04 brad Exp $
 
 DISTNAME=	lclint-2.5q
 CATEGORIES=	devel
-NEED_VERSION=	1.305
+NEED_VERSION=	1.336
 MASTER_SITES=	http://lclint.cs.virginia.edu/
 MASTER_SITES0=	http://lclint.cs.virginia.edu/guide/
 
@@ -16,7 +16,6 @@ MAINTAINER=	Marc Espie <espie@openbsd.org>
 # guide.tar.gz can be redistributed freely provided its contents are not
 # altered.
 
-LICENSE_TYPE=		GPL NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -34,7 +33,7 @@ CONFIGURE_STYLE=gnu dest
 DOCDIR=	${PREFIX}/share/doc/${DISTNAME}
 
 post-patch:
-	@cd ${WRKSRC}/src && gmake up
+	@cd ${WRKSRC}/src && ${MAKE_PROGRAM} up
 
 LIBSRC=${WRKSRC}/lib
 LCLINT=${WRKBUILD}/bin/lclint
@@ -50,6 +49,6 @@ post-install:
 	cd ${DOCDIR} && tar -zxv -s ,lclint-guide/,, -f ${FULLDISTDIR}/${GUIDE} 
 
 test: install
-	@cd ${WRKSRC} && gmake test
+	@cd ${WRKSRC} && ${MAKE_PROGRAM} test
 	
 .include <bsd.port.mk>
diff --git a/misc/cdrecord/Makefile b/misc/cdrecord/Makefile
index 2b11926c706..4352dd016c5 100644
--- a/misc/cdrecord/Makefile
+++ b/misc/cdrecord/Makefile
@@ -1,7 +1,12 @@
-# $OpenBSD: Makefile,v 1.15 2000/10/22 14:03:31 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2001/03/23 15:56:04 brad Exp $
+
+# It's pretty easy to add other architectures,
+# mail me if you miss a particular one.
+ONLY_FOR_ARCHS=	alpha amiga arc i386 mac68k mvme68k powerpc sparc sun3
 
 DISTNAME=	cdrecord-1.9
 CATEGORIES=	misc
+NEED_VERSION=	1.336
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
 
 MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>
@@ -11,24 +16,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-# It's pretty easy to add other architectures,
-# mail me if you miss a particular one.
-ONLY_FOR_ARCHS=	alpha amiga arc i386 mac68k mvme68k powerpc sparc sun3
-
 USE_GMAKE=	Yes
-MAKE_ENV=	MAKEPROG=gmake
+MAKE_ENV=	MAKEPROG="${MAKE_PROGRAM}"
 
 # Cdrecord's standard install rule installs some unnecessary stuff,
 # we instead explicitly install what we want.
 OBJDIR=		OBJ/${MACHINE}-openbsd-$(CC)
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdrecord
 	${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/${OBJDIR}/cdrecord ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cdrecord
-# We ship mkisofs since OpenBSD 2.3, uncomment these lines if you are on an
-# older system.
-#	${INSTALL_PROGRAM} ${WRKSRC}/mkisofs-1.11/${OBJDIR}/mkisofs ${PREFIX}/bin
-#	${INSTALL_MAN} ${WRKSRC}/mkisofs-1.11/mkisofs.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index fdb155789fd..1e144aeb71b 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2000/09/23 12:38:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2001/03/23 15:56:04 brad Exp $
 
 DISTNAME=	sdd-1.22
 CATEGORIES=	sysutils
-NEED_VERSION=	1.319
+NEED_VERSION=	1.336
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/sdd/
 
 USE_GMAKE=	Yes
-MAKE_ENV=	MAKEPROG=gmake CCOM=${CC}
+MAKE_ENV=	MAKEPROG="${MAKE_PROGRAM}" CCOM="${CC}"
 
 do-configure:
 	@cd ${WRKSRC}/RULES; \