- Fix build after qt 4.4.1 update

This commit is contained in:
Martin Wilke 2008-08-04 23:33:44 +00:00
parent d56984b056
commit 16d82841ce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=218044
11 changed files with 56 additions and 45 deletions

View file

@ -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

View file

@ -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 \

View file

@ -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

View file

@ -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=""

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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" \

View file

@ -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

View file

@ -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>

View file

@ -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