diff options
| -rw-r--r-- | audio/qsynth/Makefile | 3 | ||||
| -rw-r--r-- | cad/klayout/Makefile | 5 | ||||
| -rw-r--r-- | deskutils/fbreader/Makefile | 1 | ||||
| -rw-r--r-- | devel/qscintilla2/Makefile | 1 | ||||
| -rw-r--r-- | devel/qscintilla2/pkg-plist | 66 | ||||
| -rw-r--r-- | games/hedgewars/Makefile | 4 | ||||
| -rw-r--r-- | german/tipp10/Makefile | 4 | ||||
| -rw-r--r-- | graphics/djview4/Makefile | 1 | ||||
| -rw-r--r-- | graphics/tulip/Makefile | 4 | ||||
| -rw-r--r-- | print/lyx15/Makefile | 8 | ||||
| -rw-r--r-- | security/xca/Makefile | 4 |
11 files changed, 56 insertions, 45 deletions
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile index 6b8f4fbc853b..e5d541455e7b 100644 --- a/audio/qsynth/Makefile +++ b/audio/qsynth/Makefile @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 4 QT_COMPONENTS= qmake moc uic rcc gui xml -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} +CFLAGS+= -I${QT_INCDIR} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} +LDFLAGS+= -L${QT_LIBDIR} 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 diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index 0884015568d1..288d4f7aad94 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -23,7 +23,10 @@ PLATFORMKEYWORD= freebsd-32-gcc-release do-build: cd ${WRKSRC} \ - && ${SH} build.sh -platform ${PLATFORMKEYWORD} -qt ${LOCALBASE} + && ${SH} build.sh -platform ${PLATFORMKEYWORD} \ + -qtbin ${QT_PREFIX}/bin \ + -qtinc ${QT_INCDIR} \ + -qtlib ${QT_LIBDIR} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin.${PLATFORMKEYWORD}/klayout \ diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index c7c0be7172c6..4c2c23846c39 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -26,6 +26,7 @@ USE_GNOME= gtk20 UI= qt4 USE_QT_VER= 4 QT_COMPONENTS= gui corelib moc +LDFLAGS+= -L${QT_LIBDIR} .endif USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index 22f72a32a5c1..c4c8bf408daf 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -31,6 +31,7 @@ OPTIONS= HEADERS "Install Qsci headers" on \ PLIST_SUB+= HEADERS="@comment " .else PLIST_SUB+= HEADERS="" +PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_REL} .endif .if defined(WITH_TRANSLATIONS) PLIST_SUB+= TRANSLATIONS="" diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index c0c7f2676b04..b88e4798aa22 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -167,38 +167,38 @@ share/qt4/qsci/api/python/Python-2.5.api %%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif %%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css -%%HEADERS%%include/Qsci/qsciapis.h -%%HEADERS%%include/Qsci/qscicommand.h -%%HEADERS%%include/Qsci/qscicommandset.h -%%HEADERS%%include/Qsci/qscidocument.h -%%HEADERS%%include/Qsci/qsciglobal.h -%%HEADERS%%include/Qsci/qscilexer.h -%%HEADERS%%include/Qsci/qscilexerbash.h -%%HEADERS%%include/Qsci/qscilexerbatch.h -%%HEADERS%%include/Qsci/qscilexercpp.h -%%HEADERS%%include/Qsci/qscilexercsharp.h -%%HEADERS%%include/Qsci/qscilexercmake.h -%%HEADERS%%include/Qsci/qscilexercss.h -%%HEADERS%%include/Qsci/qscilexerd.h -%%HEADERS%%include/Qsci/qscilexerdiff.h -%%HEADERS%%include/Qsci/qscilexerhtml.h -%%HEADERS%%include/Qsci/qscilexeridl.h -%%HEADERS%%include/Qsci/qscilexerjava.h -%%HEADERS%%include/Qsci/qscilexerjavascript.h -%%HEADERS%%include/Qsci/qscilexerlua.h -%%HEADERS%%include/Qsci/qscilexermakefile.h -%%HEADERS%%include/Qsci/qscilexerperl.h -%%HEADERS%%include/Qsci/qscilexerpov.h -%%HEADERS%%include/Qsci/qscilexerproperties.h -%%HEADERS%%include/Qsci/qscilexerpython.h -%%HEADERS%%include/Qsci/qscilexerruby.h -%%HEADERS%%include/Qsci/qscilexersql.h -%%HEADERS%%include/Qsci/qscilexertex.h -%%HEADERS%%include/Qsci/qscilexervhdl.h -%%HEADERS%%include/Qsci/qscimacro.h -%%HEADERS%%include/Qsci/qsciprinter.h -%%HEADERS%%include/Qsci/qsciscintilla.h -%%HEADERS%%include/Qsci/qsciscintillabase.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciapis.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommand.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommandset.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscidocument.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciglobal.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexer.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercss.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerd.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexersql.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexertex.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscimacro.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciprinter.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h +%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/copy.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/cut.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/new.png @@ -222,5 +222,5 @@ share/qt4/qsci/api/python/Python-2.5.api %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%HEADERS%%@dirrm include/Qsci +%%HEADERS%%@dirrm %%QT_INCDIR_REL%%/Qsci %%TRANSLATIONS%%@dirrmtry share/qt4/translations diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index c0406860ac29..c9aa652855fb 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -22,4 +22,8 @@ USE_FPC= opengl USE_QT_VER= 4 QT_COMPONENTS= corelib gui moc_build network qmake_build rcc_build svg xml +post-patch: + ${ECHO} "include_directories(${LOCALBASE}/include)" >> \ + ${WRKSRC}/QTfrontend/CMakeLists.txt + .include <bsd.port.mk> diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile index b3aa7a392884..bef005aa18e9 100644 --- a/german/tipp10/Makefile +++ b/german/tipp10/Makefile @@ -15,8 +15,8 @@ DISTNAME= tipp10_source_v2-0-1 MAINTAINER= h.eichmann@gmx.de COMMENT= A 10 finger touch typing learning program -RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin +RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ + ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin USE_ZIP= yes USE_QT_VER= 4 diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index cf0511b02142..a8ab126ebb90 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -21,6 +21,7 @@ GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnometarget USE_QT_VER= 4 QT_COMPONENTS= gui network rcc uic moc qmake +QT_NONSTANDARD= yes CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \ QMAKESPEC="${QMAKESPEC}" \ CFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 125ba8adf42f..73ea89f0a845 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -24,8 +24,8 @@ LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \ USE_BZIP2= yes USE_QT_VER= 4 -QT_COMPONENTS= corelib moc uic rcc gui opengl xml network \ - designer assistant +QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network \ + designer assistant assistantclient USE_GL= glut USE_GMAKE= yes USE_GNOME= libxml2 diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index e6a63c89abbf..75025521baa3 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -124,9 +124,9 @@ PLIST_SUB+= NLS="@comment " .endif # includes of qt4 must be found earlier than those of qt3 -CONFIGURE_ENV+= QT4_CORE_CFLAGS="-DQT_SHARED -I${LOCALBASE}/include/QtCore \ - -I${LOCALBASE}/include" \ - QT4_FRONTEND_CFLAGS="-DQT_SHARED -I${LOCALBASE}/include/QtCore \ - -I${LOCALBASE}/include/QtGui -I${LOCALBASE}/include" +CONFIGURE_ENV+= QT4_CORE_CFLAGS="-DQT_SHARED -I${QT_INCDIR}/QtCore \ + -I${QT_INCDIR}" \ + QT4_FRONTEND_CFLAGS="-DQT_SHARED -I${QT_INCDIR}/QtCore \ + -I${QT_INCDIR}/QtGui -I${QT_INCDIR}" .include <bsd.port.post.mk> diff --git a/security/xca/Makefile b/security/xca/Makefile index eb710256826d..e2edb0122275 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -26,9 +26,9 @@ MANCOMPRESSED= yes .include <bsd.port.pre.mk> post-patch: - @echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_PREFIX}/include/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak + @echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak @echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak - @echo "LDFLAGS= ${LDFLAGS} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak + @echo "LDFLAGS= ${LDFLAGS} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak @echo "LIBS= -lQtGui ${PTHREAD_LIBS} -lcrypto" >> ${WRKSRC}/Local.mak @echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak @echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak |