[PATCH] multimedia/iriverter: Update to support newer swt

[Robert C. Noland III]

>Submitter-Id:	current-users
>Originator:	Robert C. Noland III
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] multimedia/iriverter: Update to support newer swt
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.0-CURRENT i386
>Environment:
System: FreeBSD bbeng-laptop.2hip.net 7.0-CURRENT FreeBSD 7.0-CURRENT #89: Wed Jan 24 20:16:18 EST 2007
>Description:
Change to support x11-toolkits/swt or x11-toolkits/swt-devel via options.

This is the last functional port relying on swt31.  We should be able to
deprecate it once this is in.

Port maintainer (multimedia at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- iriverter-0.16_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/iriverter/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	6 Sep 2006 22:24:40 -0000	1.1
+++ Makefile	4 Feb 2007 17:22:26 -0000
@@ -7,22 +7,38 @@
 
 PORTNAME=	iriverter
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	multimedia java
 MASTER_SITES=	SOURCEFORGE
 
 MAINTAINER=	multimedia at FreeBSD.org
 COMMENT=	Cross-platform frontend to mencoder
 
-BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \
-		${LOCALBASE}/lib/libswt-gnome-gtk-3139.so:${PORTSDIR}/x11-toolkits/swt31
-RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \
-		${LOCALBASE}/lib/libswt-gnome-gtk-3139.so:${PORTSDIR}/x11-toolkits/swt31 \
-		mencoder:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer
 
 USE_JAVA=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-swt="${JAVALIBDIR}/swt.jar"
 
-.include <bsd.port.mk>
+OPTIONS=	SWTDEVEL "Use SWT Development port" off
+
+CONFIGURE_ARGS=	--with-swt="${JAVALIBDIR}/${SWT_JAR}"
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SWTDEVEL)
+BUILD_DEPENDS+=	\
+		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+=	\
+		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+SWT_JAR=	swt-devel.jar
+.else
+BUILD_DEPENDS+=	\
+		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+=	\
+		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+SWT_JAR=	swt.jar
+.endif
+
+.include <bsd.port.post.mk>
--- iriverter-0.16_1.patch ends here ---