Index: head/multimedia/iriverter/Makefile
===================================================================
--- head/multimedia/iriverter/Makefile	(revision 513410)
+++ head/multimedia/iriverter/Makefile	(revision 513411)
@@ -1,40 +1,23 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	iriverter
 PORTVERSION=	0.16
 PORTREVISION=	10
 CATEGORIES=	multimedia java
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-platform frontend to mencoder
 
-RUN_DEPENDS=	mencoder:multimedia/mencoder
+BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
+RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt \
+		mencoder:multimedia/mencoder
 
 USE_JAVA=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake tar:bzip2
 
-OPTIONS_DEFINE=	SWTDEVEL
-SWTDEVEL_DESC=	Use SWT Development port
-
-CONFIGURE_ARGS=	--with-swt="${JAVALIBDIR}/${SWT_JAR}"
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSWTDEVEL}
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
-SWT_JAR=	swt-devel.jar
-.else
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:x11-toolkits/swt
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:x11-toolkits/swt
-SWT_JAR=	swt.jar
-.endif
+CONFIGURE_ARGS=	--with-swt="${JAVALIBDIR}/swt.jar"
 
 .include <bsd.port.mk>