Date: Fri, 11 Dec 2009 01:48:38 +1000 From: "Dima Panov" <fluffy@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/141348: multimedia/vlc: Fix of usage USE_QT= macro. Message-ID: <1260460118.55110@Fluffy.Khv.RU> Resent-Message-ID: <200912101550.nBAFo6bO070398@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk> - -.if (${OSVERSION} < 701000) -CFLAGS+= -DHAVE_SYS_MOUNT_H -.endif +.include <bsd.port.options.mk> 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 <bsd.port.pre.mk> + +.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 <bsd.port.post.mk> --- vlc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1260460118.55110>