From owner-freebsd-multimedia@FreeBSD.ORG Sun Feb 4 18:01:37 2007 Return-Path: X-Original-To: multimedia@freebsd.org Delivered-To: freebsd-multimedia@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 30E9116A408; Sun, 4 Feb 2007 18:01:37 +0000 (UTC) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.freebsd.org (Postfix) with ESMTP id B2E3F13C4A3; Sun, 4 Feb 2007 18:01:36 +0000 (UTC) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from bbeng-laptop.acs.internap.com (c-24-99-227-6.hsd1.ga.comcast.net [24.99.227.6]) (authenticated bits=0) by gizmo.2hip.net (8.13.8/8.13.8) with ESMTP id l14HRWbG020749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 4 Feb 2007 12:27:33 -0500 (EST) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from bbeng-laptop.acs.internap.com (localhost.acs.internap.com [127.0.0.1]) by bbeng-laptop.acs.internap.com (8.13.8/8.13.8) with ESMTP id l14HRO0k021437; Sun, 4 Feb 2007 12:27:25 -0500 (EST) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: (from rnoland@localhost) by bbeng-laptop.acs.internap.com (8.13.8/8.13.8/Submit) id l14HROD8021436; Sun, 4 Feb 2007 12:27:24 -0500 (EST) (envelope-from rnoland) Date: Sun, 4 Feb 2007 12:27:24 -0500 (EST) Message-Id: <200702041727.l14HROD8021436@bbeng-laptop.acs.internap.com> To: FreeBSD-gnats-submit@freebsd.org From: "Robert C. Noland III" X-send-pr-version: 3.113 X-GNATS-Notify: X-Spam-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, UPPERCASE_25_50 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on gizmo.2hip.net Cc: multimedia@freebsd.org Subject: [PATCH] multimedia/iriverter: Update to support newer swt X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Feb 2007 18:01:37 -0000 >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@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 +OPTIONS= SWTDEVEL "Use SWT Development port" off + +CONFIGURE_ARGS= --with-swt="${JAVALIBDIR}/${SWT_JAR}" + +.include + +.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 --- iriverter-0.16_1.patch ends here ---