From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 10 15:50:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A372E1065696 for ; Thu, 10 Dec 2009 15:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 658048FC21 for ; Thu, 10 Dec 2009 15:50:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBAFo6ru070399 for ; Thu, 10 Dec 2009 15:50:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBAFo6bO070398; Thu, 10 Dec 2009 15:50:06 GMT (envelope-from gnats) Resent-Date: Thu, 10 Dec 2009 15:50:06 GMT Resent-Message-Id: <200912101550.nBAFo6bO070398@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E91D9106566B for ; Thu, 10 Dec 2009 15:49:08 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 1AA0F8FC15 for ; Thu, 10 Dec 2009 15:49:07 +0000 (UTC) Received: from Fluffy.Khv.RU (85.9.168.188.retail.ttk.ru [188.168.9.85] (may be forged)) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id nBAFn2U3034201 for ; Fri, 11 Dec 2009 01:49:04 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id nBAFmcfj055111 for ; Fri, 11 Dec 2009 01:48:38 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Message-Id: <1260460118.55110@Fluffy.Khv.RU> Date: Fri, 11 Dec 2009 01:48:38 +1000 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/141348: multimedia/vlc: Fix of usage USE_QT= macro. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2009 15:50:06 -0000 >Number: 141348 >Category: ports >Synopsis: multimedia/vlc: Fix of usage USE_QT= macro. >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Dec 10 15:50:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 9.0-900002-CURRENT amd64 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 9.0-900002-CURRENT #0: Wed Dec 2 05:03:55 VLAT 2009 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: multimedia/vlc: Fix of usage USE_QT= macro. Current state of port is incorrect. Optional USE_QT should be decrared before including of bsd.port.pre.mk but after bsd.port.options.mk >How-To-Repeat: >Fix: --- vlc.diff begins here --- Index: multimedia/vlc/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/vlc/Makefile,v retrieving revision 1.204 diff -u -r1.204 Makefile --- multimedia/vlc/Makefile 2 Dec 2009 17:16:15 -0000 1.204 +++ multimedia/vlc/Makefile 10 Dec 2009 13:41:10 -0000 @@ -96,20 +97,12 @@ vlc-config.1 \ vlc-wrapper.1 -.include - -.if (${OSVERSION} < 701000) -CFLAGS+= -DHAVE_SYS_MOUNT_H -.endif +.include WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -.if ${PERL_LEVEL} < 500800 -BROKEN= Does not compile with perl ${PERL_VERSION} -.endif - .if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11) -USE_QT_VER+= 4 +USE_QT_VER= 4 QT_COMPONENTS+= gui corelib moc_build rcc_build uic_build CONFIGURE_ARGS+=--enable-qt4 .else @@ -602,5 +595,15 @@ CONFIGURE_ARGS+=--enable-x11 .endif +.include + +.if (${OSVERSION} < 701000) +CFLAGS+= -DHAVE_SYS_MOUNT_H +.endif + +.if ${PERL_LEVEL} < 500800 +BROKEN= Does not compile with perl ${PERL_VERSION} +.endif + .include "${.CURDIR}/Makefile.inc" .include --- vlc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: