Index: databases/py-pyPgSQL/Makefile
===================================================================
--- databases/py-pyPgSQL/Makefile	(revision 309969)
+++ databases/py-pyPgSQL/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   py-pypgsql
-# Date created:                        01 Nov 2001
-# Whom:                                Gerhard Haering <gerhard.haering@gmx.de>
-#
+# Created by: Gerhard Haering <gerhard.haering@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	pyPgSQL
 PORTVERSION=	2.5.1
@@ -26,12 +22,16 @@
 
 DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
 
-OPTIONS=	BYTEA_CONN      "Apply Bytea connection patch" On
+OPTIONS_DEFINE=	BYTEA_CONN EXAMPLES DOCS
+OPTIONS_DEFAULT=	BYTEA_CONN
+BYTEA_CONN_DESC=	Apply Bytea connection patch
 
 # bypass infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-.if !defined(WITH_BYTEA_CONN)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBYTEA_CONN}
 PATCH_SITES=	http://sourceforge.net/tracker/download.php?group_id=16528&atid=316528&file_id=273956&aid=1939119/
 PATCHFILES=	pyPgSQL-patch_byteaconn
 .endif
@@ -40,13 +40,13 @@
 EXAMPLESDIR=	${PREFIX}/share/examples/py-pyPgSQL
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
Index: x11-toolkits/py-gui/Makefile
===================================================================
--- x11-toolkits/py-gui/Makefile	(revision 309969)
+++ x11-toolkits/py-gui/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	py-gui
-# Date created:			21 June 2004
-# Whom:				Hye-Shik Chang
-#
+# Created by: Hye-Shik Chang
 # $FreeBSD$
 
 PORTNAME=	gui
@@ -32,11 +29,12 @@
 
 WRKSRC=		${WRKDIR}/PyGUI-${PORTVERSION}
 
-OPTIONS=	GL "Enable GL support" off
+OPTIONS_DEFINE=	OPENGL DOCS
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GL)
+.if ${PORT_OPTIONS:MOPENGL}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
 .endif
 
@@ -49,7 +47,7 @@
 	${REINPLACE_CMD} -e 's/"GUI.Cocoa",//g' ${WRKSRC}/setup.py
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/${DOCSDIR}
 	${TAR} -C ${WRKSRC}/Doc -cf - . | ${TAR} -C ${PREFIX}/${DOCSDIR} -xf -
 	${MKDIR} ${PREFIX}/${EXAMPLESDIR}
@@ -59,4 +57,4 @@
 		${TAR} -C ${PREFIX}/${EXAMPLESDIR} -xf -
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>