svn commit: r322664 - head/multimedia/dvbcut

[Stefan Esser]

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