From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 10 11:42:20 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8575AA49;
 Wed, 10 Jul 2013 11:42:20 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7903417C5;
 Wed, 10 Jul 2013 11:42:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ABgKoJ013992;
 Wed, 10 Jul 2013 11:42:20 GMT (envelope-from se@svn.freebsd.org)
Received: (from se@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6ABgKOj013987;
 Wed, 10 Jul 2013 11:42:20 GMT (envelope-from se@svn.freebsd.org)
Message-Id: <201307101142.r6ABgKOj013987@svn.freebsd.org>
From: Stefan Esser <se@FreeBSD.org>
Date: Wed, 10 Jul 2013 11:42:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322664 - head/multimedia/dvbcut
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 11:42:20 -0000

Author: se (src committer)
Date: Wed Jul 10 11:42:20 2013
New Revision: 322664
URL: http://svnweb.freebsd.org/changeset/ports/322664

Log:
  Remove option to build with QT3, since the QT3 port is no longer supported.
  USE_GCC=any since testing with CLANG caused a compilation error on amd64
  (possibly a compiler bug) and I did not have time to investigate ...

Modified:
  head/multimedia/dvbcut/Makefile

Modified: head/multimedia/dvbcut/Makefile
==============================================================================
--- head/multimedia/dvbcut/Makefile	Wed Jul 10 11:42:07 2013	(r322663)
+++ head/multimedia/dvbcut/Makefile	Wed Jul 10 11:42:20 2013	(r322664)
@@ -24,46 +24,22 @@ LIB_DEPENDS=	a52:${PORTSDIR}/audio/liba5
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS_DEFINE=	QT4
-OPTIONS_DEFAULT=QT4
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-WITH_QT_VER=	4
-.else
-PKGNAMESUFFIX=	-qt3
-WITH_QT_VER=	3
-.endif
-
-.if ${WITH_QT_VER} == 3
-BUILD_DEPENDS+=	moc:${PORTSDIR}/x11-toolkits/qt33
-LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ffmpeg=${LOCALBASE}
-MAKEFILE=	makefile
-QTCPPFLAGS+=	${PTHREAD_CFLAGS}
-QTCFGLIBS+=	${PTHREAD_LIBS}
-.else
+USE_GCC=	any
 USES=		cmake
 USE_QT4=  gui qt3support xml  moc_build qmake_build rcc_build uic_build
 CXXFLAGS+=	-I${PREFIX}/include \
 		-I${PREFIX}/include/libavcodec \
 		-I${PREFIX}/include/libavformat \
 		-I${PREFIX}/include/libswscale
-.endif
 
 MAN1=		dvbcut.1
 PLIST_FILES=	bin/dvbcut
 
-.if ${WITH_QT_VER} == 4
 #post-extract:
 #		${RM} ${WRKSRC}/src/mplayererrorbase.h
 
 pre-patch:
 		cd ${WRKSRC} && ${BZCAT} ${FILESDIR}/use-qt4.diff.bz2 | ${PATCH} -p2
-.endif
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/dvbcut ${PREFIX}/bin