diff --git a/misc/dates/Makefile b/misc/dates/Makefile
index c09bd868e9f..e3171574d84 100644
--- a/misc/dates/Makefile
+++ b/misc/dates/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/05 08:24:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/11 11:16:03 espie Exp $
 
 BROKEN=			needs to stop using deprecated functions from e-d-s
 
@@ -34,7 +34,7 @@ MODULES=		devel/gettext \
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 LIB_DEPENDS=		::databases/evolution-data-server
 RUN_DEPENDS=		::devel/desktop-file-utils
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 78c19bc11a6..70dab549e40 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,44 +1,44 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/05 08:24:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/11 11:18:31 espie Exp $
 
-COMMENT=	redhat package manager
+COMMENT =	redhat package manager
 
-DISTNAME=	rpm-3.0.6
-REVISION=	4
-SHARED_LIBS=	rpm		0.1 \
+DISTNAME =	rpm-3.0.6
+REVISION =	4
+SHARED_LIBS =	rpm		0.1 \
 		rpmbuild	0.0
-CATEGORIES=	misc archivers emulators
+CATEGORIES =	misc archivers emulators
 
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_DISTFILES_FTP =	Yes
+PERMIT_DISTFILES_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += bz2 c popt z
 
-MAINTAINER=	Marc Espie <espie@openbsd.org>
+MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-HOMEPAGE=	http://www.rpm.org/
-MASTER_SITES=	ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
+HOMEPAGE =	http://www.rpm.org/
+MASTER_SITES =	ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
 		ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
 
-MODULES=	devel/gettext
-LIB_DEPENDS+=	::archivers/bzip2 \
+MODULES =	devel/gettext
+WANTLIB += 	bz2 c popt z
+LIB_DEPENDS +=	::archivers/bzip2 \
 		::devel/popt
 
-USE_LIBTOOL=	Yes
-USE_GROFF =	Yes
-CONFIGURE_STYLE=	gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/popt
+USE_LIBTOOL =		Yes
+USE_GROFF =		Yes
+CONFIGURE_STYLE =	gnu
+MODGNU_CONFIG_GUESS_DIRS =	${WRKSRC} ${WRKSRC}/popt
 
-RPM_INTEL=	RPMS/i386
-SUBST_VARS=	RPM_INTEL
+RPM_INTEL =		RPMS/i386
+SUBST_VARS =		RPM_INTEL
 
 # Enforce check for pgp, so no build-time depend is needed
-CONFIGURE_ENV=		PGPBIN=$(LOCALBASE)/bin/pgp
-CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib -liconv"
-CONFIGURE_ENV+=		varprefix=/var
+CONFIGURE_ENV =		PGPBIN=$(LOCALBASE)/bin/pgp
+CONFIGURE_ENV +=	CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV +=	LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV +=	varprefix=/var
 
-SEPARATE_BUILD=		simple
+SEPARATE_BUILD =	simple
 
 .include <bsd.port.mk>