Date: Sun, 4 Feb 2007 12:27:24 -0500 (EST) From: "Robert C. Noland III" <rnoland@2hip.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: multimedia@FreeBSD.org Subject: ports/108770: [PATCH] multimedia/iriverter: Update to support newer swt Message-ID: <200702041727.l14HROD8021436@bbeng-laptop.acs.internap.com> Resent-Message-ID: <200702041810.l14IAJtL042645@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108770
>Category: ports
>Synopsis: [PATCH] multimedia/iriverter: Update to support newer swt
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 04 18:10:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Robert C. Noland III
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>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@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@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 ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702041727.l14HROD8021436>