ports/123362: adjust dependencies for a bundle of qt4 ports

Max Brazhnikov makc at issp.ac.ru
Sat May 3 10:20:01 UTC 2008


>Number:         123362
>Category:       ports
>Synopsis:       adjust dependencies for a bundle of qt4 ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 03 10:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Apr 17 12:14:46 MSD 2008     makc at luna.dio.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
A lot of qt4 ports have runtime dependency on build tools (qmake-qt4, uic-qt4, moc-qt4, rcc). Free them from redundant dependencies.

Affected ports:

astro/stellarium
audio/esperanza
audio/qjackctl
audio/qsynth
cad/klayout
databases/py-qt4-sql
deskutils/fbreader
deskutils/qrfcview
deskutils/qtm
devel/py-qt4-assistant
devel/py-qt4-core
devel/py-qt4-dbus
devel/py-qt4-designer
devel/py-qt4-designerplugin
devel/py-qt4-script
devel/py-qt4-test
devel/qdevelop
devel/qprog
devel/qscintilla2
devel/qscintilla2-designerplugin
editors/lfhex
editors/texmaker
games/anki
games/qnetwalk
german/tipp10
graphics/autoq3d
graphics/djview4
graphics/py-qt4-svg
graphics/qcomicbook
graphics/structuresynth
math/freemat
math/qwtplot3d-qt4
misc/qbrew
multimedia/manencode
multimedia/mimms
multimedia/vlc-devel
net-im/decibel
net-im/tapioca-qt
net-im/telepathy-qt
net-mgmt/vidalia
net/py-qt4-network
print/lyx15
security/xca
sysutils/bacula-bat
textproc/py-qt4-xml
www/aria2fe
x11-toolkits/py-qt4-gui
x11/py-qt4-opengl

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- astro/stellarium/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ astro/stellarium/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui rcc uic opengl
+QT_COMPONENTS=	qmake_build moc_build gui rcc_build uic_build opengl
 USE_GETTEXT=	yes
 USE_GL=		yes
 USE_SDL=	sdl mixer
--- audio/esperanza/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ audio/esperanza/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -17,7 +17,7 @@
 RUN_DEPENDS=	${LOCALBASE}/lib/libxmmsclient++.so.2:${PORTSDIR}/audio/cpp-xmms2
 
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake rcc uic xml network imageformats
+QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build xml network imageformats
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
--- audio/qjackctl/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ audio/qjackctl/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -20,7 +20,7 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic rcc gui xml
+QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build gui xml
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=ac_cv_path_ac_moc=${LOCALBASE}/bin/moc-qt4 ac_cv_path_ac_uic=${LOCALBASE}/bin/uic-qt4 \
 		ac_cv_path_ac_qmake=${LOCALBASE}/bin/qmake-qt4
--- audio/qsynth/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ audio/qsynth/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -19,7 +19,7 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic rcc gui xml
+QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build gui xml
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=ac_cv_path_ac_moc=${LOCALBASE}/bin/moc-qt4 ac_cv_path_ac_uic=${LOCALBASE}/bin/uic-qt4 \
 		ac_cv_path_ac_qmake=${LOCALBASE}/bin/qmake-qt4
--- cad/klayout/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ cad/klayout/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -15,7 +15,7 @@
 
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network moc sql uic rcc qt3support xml
+QT_COMPONENTS=	corelib gui network moc_build sql uic_build rcc_build qt3support xml
 PLIST_FILES=	bin/klayout
 
 PLATFORMKEYWORD=	freebsd-32-gcc-release
--- databases/py-qt4-sql/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ databases/py-qt4-sql/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	sql qmake
+QT_COMPONENTS=	sql qmake_build
 
 OPTIONS=	API		"Install QtSql API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- deskutils/fbreader/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ deskutils/fbreader/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -24,7 +24,7 @@
 .else
 UI=	qt4
 USE_QT_VER=	4
-QT_COMPONENTS=	gui corelib moc
+QT_COMPONENTS=	gui corelib moc_build
 .endif
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
--- deskutils/qrfcview/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ deskutils/qrfcview/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 COMMENT=	Graphical RFC viewer
 
 USE_QT_VER=	4
-QT_COMPONENTS=	gui network corelib designer qmake uic moc rcc
+QT_COMPONENTS=	gui network corelib designer qmake_build uic_build moc_build rcc_build
 PLIST_FILES=	bin/qRFCView
 
 pre-build:
--- deskutils/qtm/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ deskutils/qtm/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui rcc network xml moc_build qmake_build uic_build
+QT_COMPONENTS=	corelib gui rcc_build network xml moc_build qmake_build uic_build
 
 MAN1=		qtm.1
 PORTDOCS=	Changelog INSTALL README
--- devel/py-qt4-assistant/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-assistant/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -23,7 +23,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	assistantclient qmake
+QT_COMPONENTS=	assistantclient qmake_build
 
 OPTIONS=	API		"Install QtAssistant API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- devel/py-qt4-core/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-core/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake
+QT_COMPONENTS=	corelib qmake_build
 
 OPTIONS=	API		"Install QtCore API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- devel/py-qt4-dbus/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-dbus/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -24,7 +24,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake moc
+QT_COMPONENTS=	corelib qmake_build moc_build
 USE_XORG=	x11 xext
 
 OPTIONS=	DEBUG	"Enable debugging in generated code" off \
--- devel/py-qt4-designer/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-designer/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -24,7 +24,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	designer moc gui xml qmake
+QT_COMPONENTS=	designer moc_build gui xml qmake_build
 
 OPTIONS=	API		"Install QtDesigner API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- devel/py-qt4-designerplugin/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-designerplugin/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	designer moc gui xml qmake
+QT_COMPONENTS=	designer moc_build gui xml qmake_build
 
 OPTIONS=	DEBUG		"Enable debugging in generated code" off \
 		TRACING		"Enable tracing in generated code" off
--- devel/py-qt4-script/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-script/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	script qmake
+QT_COMPONENTS=	script qmake_build
 
 OPTIONS=	API		"Install QtScript API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- devel/py-qt4-test/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/py-qt4-test/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	qtestlib qmake
+QT_COMPONENTS=	qtestlib qmake_build
 
 OPTIONS=	API		"Install QtTest API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- devel/qdevelop/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/qdevelop/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -30,7 +30,7 @@
 
 USE_ZIP=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic rcc sql network xml gui corelib assistant linguist designer
+QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build sql network xml gui corelib assistant linguist designer
 
 DESKTOP_ENTRIES=	"QDevelop" \
 			"A development environment entirely dedicated to Qt4" \
--- devel/qprog/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/qprog/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -15,7 +15,7 @@
 COMMENT=	Cross-platform software for the DIY line of PIC programmers
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui network
+QT_COMPONENTS=	qmake_build moc_build gui network
 
 WRKSRC=		${WRKDIR}/QProg
 
--- devel/qscintilla2/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/qscintilla2/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -17,7 +17,7 @@
 COMMENT=	Qt4 port of the Scintilla C++ editor class
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui xml designer
+QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
--- devel/qscintilla2-designerplugin/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ devel/qscintilla2-designerplugin/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -21,7 +21,7 @@
 LIB_DEPENDS=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui xml designer
+QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4/plugins/designer
 
--- editors/lfhex/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ editors/lfhex/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 COMMENT=	Large file hex editor
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc
+QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build
 USE_BISON=	build
 
 PORTDOCS=	README
--- editors/texmaker/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ editors/texmaker/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake rcc uic
+QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
--- games/anki/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ games/anki/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -26,7 +26,7 @@
 USE_PYDISTUTILS=easy_install
 USE_PYTHON=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	moc
+QT_COMPONENTS=	moc_build
 PYDISTUTILS_PKGNAME=	ankiqt
 PORT_VERBS=	ankiqt
 
--- games/qnetwalk/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ games/qnetwalk/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -14,7 +14,7 @@
 COMMENT=	Qt-version of the NetWalk game
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake corelib gui moc rcc
+QT_COMPONENTS=	qmake_build corelib gui moc_build rcc_build
 
 MAN6=		qnetwalk.6
 
--- german/tipp10/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ german/tipp10/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -19,7 +19,7 @@
 
 USE_ZIP=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake sql corelib network script qtestlib rcc uic moc gui
+QT_COMPONENTS=	qmake_build sql corelib network script qtestlib rcc_build uic_build moc_build gui
 WRKSRC=		${WRKDIR}/source
 
 do-configure:
--- graphics/autoq3d/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ graphics/autoq3d/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 
 USE_ZIP=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake corelib moc gui opengl
+QT_COMPONENTS=	qmake_build corelib moc_build gui opengl
 
 PORTDOCS=	3DQformat.txt ChangeLog.txt Install.txt license.txt
 
--- graphics/djview4/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ graphics/djview4/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -20,7 +20,7 @@
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig gnometarget
 USE_QT_VER=	4
-QT_COMPONENTS=	gui network rcc uic moc qmake
+QT_COMPONENTS=	gui network rcc_build uic_build moc_build qmake_build
 CONFIGURE_ENV=	QMAKE="${LOCALBASE}/bin/qmake-qt4" \
 		QMAKESPEC="${QMAKESPEC}" \
 		CFLAGS="-I${LOCALBASE}/include" \
--- graphics/py-qt4-svg/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ graphics/py-qt4-svg/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	svg qmake
+QT_COMPONENTS=	svg qmake_build
 
 OPTIONS=	API		"Install QtSvg API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- graphics/qcomicbook/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ graphics/qcomicbook/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -18,7 +18,7 @@
 		unrar:${PORTSDIR}/archivers/unrar
 
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc
+QT_COMPONENTS=	gui moc_build
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 USE_EFL=	imlib2
--- graphics/structuresynth/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ graphics/structuresynth/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 
 USE_ZIP=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake corelib gui opengl moc rcc
+QT_COMPONENTS=	qmake_build corelib gui opengl moc_build rcc_build
 
 WRKSRC=		${WRKDIR}/source/trunk
 
--- math/freemat/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ math/freemat/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -31,7 +31,7 @@
 USE_GL=			yes
 USE_QT_VER=		4
 USE_GMAKE=		yes
-QT_COMPONENTS=		gui network opengl moc rcc uic xml svg
+QT_COMPONENTS=		gui network opengl moc_build rcc_build uic_build xml svg
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-blas="${BLAS}" --without-llvm
--- math/qwtplot3d-qt4/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ math/qwtplot3d-qt4/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -16,7 +16,7 @@
 COMMENT=	3D plotting widgets for scientific data and math expressions
 
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake opengl
+QT_COMPONENTS=	gui moc_build qmake_build opengl
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 USE_DOS2UNIX=	yes
--- misc/qbrew/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ misc/qbrew/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -14,7 +14,7 @@
 COMMENT=	A homebrewer's recipe calculator
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic rcc xml gui
+QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build xml gui
 PORTDOCS=	*
 HAS_CONFIGURE=	yes
 
--- multimedia/manencode/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ multimedia/manencode/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -18,7 +18,7 @@
 
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc rcc uic qmake corelib
+QT_COMPONENTS=	gui moc_build rcc_build uic_build qmake_build corelib
 
 MANENCODEDIR=	${PREFIX}/share/${PORTNAME}
 TRANSLATION=	_en
--- multimedia/mimms/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ multimedia/mimms/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -20,7 +20,7 @@
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake corelib moc uic
+QT_COMPONENTS=	qmake_build corelib moc_build uic_build
 
 PLIST_FILES=	bin/mimms
 
--- multimedia/vlc-devel/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ multimedia/vlc-devel/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -168,7 +168,7 @@
 
 .if !defined(WITHOUT_QT4)
 USE_QT_VER+=	4
-QT_COMPONENTS+=	gui corelib moc rcc uic
+QT_COMPONENTS+=	gui corelib moc_build rcc_build uic_build
 CONFIGURE_ARGS+=--enable-qt4
 .else
 CONFIGURE_ARGS+=--disable-qt4
--- net-im/decibel/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ net-im/decibel/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -17,7 +17,7 @@
 LIB_DEPENDS=	QtTapioca.0:${PORTSDIR}/net-im/tapioca-qt
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib xml dbus moc uic rcc qtestlib
+QT_COMPONENTS=	corelib xml dbus moc_build uic_build rcc_build qtestlib
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
--- net-im/tapioca-qt/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ net-im/tapioca-qt/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -25,7 +25,7 @@
 		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
 		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake uic moc rcc
+QT_COMPONENTS=	corelib qmake_build uic_build moc_build rcc_build
 USE_LDCONFIG=	yes
 
 post-extract:
--- net-im/telepathy-qt/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ net-im/telepathy-qt/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -24,7 +24,7 @@
 		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
 		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake uic moc rcc xml dbus
+QT_COMPONENTS=	corelib qmake_build uic_build moc_build rcc_build xml dbus
 USE_LDCONFIG=	yes
 
 post-extract:
--- net-mgmt/vidalia/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ net-mgmt/vidalia/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -21,7 +21,7 @@
 
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc qmake rcc uic network xml linguist
+QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build network xml linguist
 
 HAVE_TOR!=	if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
 
--- net/py-qt4-network/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ net/py-qt4-network/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	network qmake
+QT_COMPONENTS=	network qmake_build
 
 OPTIONS=	API		"Install QtNetwork API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- print/lyx15/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ print/lyx15/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -42,7 +42,7 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui corelib moc uic
+QT_COMPONENTS=	gui corelib moc_build uic_build
 
 CONFLICTS=	lyx-1.4.*
 
--- security/xca/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ security/xca/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -17,7 +17,7 @@
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc uic qmake rcc linguist
+QT_COMPONENTS=	gui moc_build uic_build qmake_build rcc_build linguist
 CC?=		gcc
 CXX?=		g++
 
--- sysutils/bacula-bat/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ sysutils/bacula-bat/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -13,7 +13,7 @@
 LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake uic moc rcc
+QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build
 WITH_BAT=	yes
 
 MAN1=		bat.1
--- textproc/py-qt4-xml/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ textproc/py-qt4-xml/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	xml qmake
+QT_COMPONENTS=	xml qmake_build
 
 OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- www/aria2fe/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ www/aria2fe/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -18,7 +18,7 @@
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake uic moc rcc
+QT_COMPONENTS=	gui qmake_build uic_build moc_build rcc_build
 PLIST_FILES=	bin/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 
--- x11-toolkits/py-qt4-gui/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ x11-toolkits/py-qt4-gui/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats inputmethods iconengines qmake
+QT_COMPONENTS=	gui imageformats inputmethods iconengines qmake_build
 
 OPTIONS=	API		"Install QtGui API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- x11/py-qt4-opengl/Makefile.orig	2008-05-03 13:25:41.000000000 +0400
+++ x11/py-qt4-opengl/Makefile	2008-05-03 13:27:44.000000000 +0400
@@ -22,7 +22,7 @@
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl qmake
+QT_COMPONENTS=	opengl qmake_build
 
 OPTIONS=	API		"Install QtOpenGL API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list