1 files changed, 16 insertions, 15 deletions

diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 91793f3955e3..e42ee6d2869f 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -16,10 +16,13 @@ COMMENT=	Sun Grid Engine, a batch queueing system
 DEPRECATED=	Ancient and unsupported release
 EXPIRATION_DATE=2013-03-01
 
-OPTIONS=	BDB "Use DB based spooler" on \
-		JAVA "Support Java DRMAA API" on \
-		X11 "Qmon X11 GUI" on \
-		QSH "Enable qsh (requires xterm on exec hosts)" on
+OPTIONS_DEFINE=	BDB JAVA X11 QSH
+OPTIONS_DEFAULT=	BDB JAVA X11 QSH
+JAVA_DESC=	Support Java DRMAA API
+X11_DESC=	Qmon X11 GUI
+QSH_DESC=	qsh (requires xterm on exec hosts)
+
+.include <bsd.port.options.mk>
 
 CONFLICTS=	sge-6.[1-9]* sge-5* sgeee-[0-9]* sge-0.*
 
@@ -82,9 +85,7 @@ MANPREFIX=	${SGE_ROOT}
 .include "${.CURDIR}/Makefile.man"
 EXCEPTFILES=	arc_depend_irix.asc arc_depend_solaris.asc man testsuite
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 LIB_DEPENDS=	db-4.2:${PORTSDIR}/databases/db42
 PLIST_SUB+=	BDB_SPOOL=
 .else
@@ -92,7 +93,7 @@ AIMK_ARGS+=	-spool-classic
 PLIST_SUB+=	BDB_SPOOL="@comment "
 .endif
 
-.if defined(WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
@@ -108,7 +109,7 @@ AIMK_ARGS+=	-no-java -no-jni
 PLIST_SUB+=	DRMAA="@comment "
 .endif
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_MOTIF=	yes
 PLIST_SUB+=	QMON=
 QMON=		qmon
@@ -160,7 +161,7 @@ post-patch:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
 	    ${FILESDIR}/distinst.private > ${WRKSRC}/distinst.private
-.if !defined(WITH_X11)
+.if ! ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e 's/qmon//' ${WRKSRC}/dist/util/setfileperm.sh
 .endif
 
@@ -174,14 +175,14 @@ do-build:
 	@${MKDIR} ${TMP_SGE_ROOT}
 	@cd ${WRKSRC} && ${SETENV} SGE_ROOT=${TMP_SGE_ROOT} \
 	    ./scripts/distinst -local -libs ${SGE_ARCH} -- ${INST_PROGS}
-.if defined(WITHOUT_QSH)
+.if ! ${PORT_OPTIONS:MQSH}
 	@${RM} ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qlogin
 	@${RM} ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qrsh
 	@${MV} ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qsh ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qrsh
 	@${LN} -s qrsh ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qlogin
 	@${INSTALL_SCRIPT} ${FILESDIR}/qsh-disabled.sh ${TMP_SGE_ROOT}/bin/${SGE_ARCH}/qsh
 .endif
-.if !defined(WITH_X11)
+.if ! ${PORT_OPTIONS:MX11}
 	@${RM} ${TMP_SGE_ROOT}/catman/cat/cat1/qmon.1
 	@${RM} -r ${TMP_SGE_ROOT}/3rd_party/qmon
 .endif
@@ -191,7 +192,7 @@ do-install:
 	@cd ${TMP_SGE_ROOT} && \
 	    ${FIND} . | ${TAR} cTf - - | ${TAR} xUCf ${SGE_ROOT} -
 	@cd ${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} util/setfileperm.sh -auto ${SGE_ROOT}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/../doc && ${FIND} * \( -name CVS \
 	    ${EXCEPTFILES:S/^/-o -name /} \) -a -prune -o -type f -print \
@@ -217,7 +218,7 @@ release-tar: build
 
 # Build a pkg-plist and Makefile.man
 build-plist: build
-#.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_X11)
+#.if ! ${PORT_OPTIONS:MBDB} || ! ${PORT_OPTIONS:MJAVA} || ! ${PORT_OPTIONS:MX11}
 #	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
 #.endif
 	@${FIND} ${TMP_SGE_ROOT}/* -name man -prune -o \
@@ -260,4 +261,4 @@ build-plist: build
 	    ${SED} -e 's|.*man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' \
 	    >> ${.CURDIR}/Makefile.man
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>