Index: rpm5/Makefile
===================================================================
--- rpm5/Makefile	(revision 305486)
+++ rpm5/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	rpm
-# Date created:				6 May 2003
-# Whom:					Greg Lewis <glewis@FreeBSD.org>
-#
+# Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	rpm
@@ -13,13 +10,13 @@
 MAINTAINER=	afb@rpm5.org
 COMMENT=	The RPM Package Manager
 
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		popt.0:${PORTSDIR}/devel/popt \
-		beecrypt.7:${PORTSDIR}/security/beecrypt \
-		neon.27:${PORTSDIR}/www/neon29 \
+LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
+		popt:${PORTSDIR}/devel/popt \
+		beecrypt:${PORTSDIR}/security/beecrypt \
+		neon:${PORTSDIR}/www/neon29 \
 		magic:${PORTSDIR}/sysutils/file \
 		xar:${PORTSDIR}/archivers/xar \
-		pcre.1:${PORTSDIR}/devel/pcre
+		pcre:${PORTSDIR}/devel/pcre
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
 		${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid \
 		bash:${PORTSDIR}/shells/bash
@@ -31,8 +28,8 @@
 
 SH=		${LOCALBASE}/bin/bash
 
-OPTIONS=	PERL "Build Perl RPM module" Off \
-		PYTHON "Build Python RPM module" On
+OPTIONS_DEFINE=	PERL PYTHON
+OPTIONS_DEFAULT=	PYTHON
 
 DB_VERSION?=	47
 USE_BDB=	${DB_VERSION}
@@ -60,7 +57,7 @@
 		--without-syck
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=--with-perl
 CONFIGURE_ENV+=	__PERL=${PERL}
 USE_PERL5=	yes
@@ -70,7 +67,7 @@
 PLIST_SUB+=	PERL="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=--with-python=${PYTHON_VER}
 CONFIGURE_ENV+=	__PYTHON=${PYTHON_CMD}
 USE_PYTHON=	yes