diff options
| author | miwi <miwi@FreeBSD.org> | 2008-08-10 04:51:20 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-08-10 04:51:20 +0800 |
| commit | aeb3c2f71cc1507af2e164687e5dc29b041a60b3 (patch) | |
| tree | 4574ae4f2d1426450f602a75570199e05d14e254 | |
| parent | b495065596c659bb12fdc613a77856b785550017 (diff) | |
| download | freebsd-ports-gnome-aeb3c2f71cc1507af2e164687e5dc29b041a60b3.tar.gz freebsd-ports-gnome-aeb3c2f71cc1507af2e164687e5dc29b041a60b3.tar.zst freebsd-ports-gnome-aeb3c2f71cc1507af2e164687e5dc29b041a60b3.zip | |
- Fix build after qt 4.4.1 update
- Bump PORTREVISION
Submitted by: Max Brazhnikov
Approved by: maintainer implicit
| -rw-r--r-- | devel/py-qt4-qscintilla2/Makefile | 6 | ||||
| -rw-r--r-- | devel/py-qt4-qscintilla2/files/Makefile.in | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index e2a60da6e7ec..f749e613d1a6 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -6,7 +6,7 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel @@ -26,6 +26,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ +USE_QT_VER= 4 +QT_COMPONENTS= gui OPTIONS= API "Install binding API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ @@ -73,6 +75,8 @@ do-configure: post-configure: ${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile &&\ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g'\ + -e 's|%%QT_INCDIR%%|${QT_INCDIR}|g'\ + -e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g'\ -e 's|%%PYVER%%|${PYVER}|g'\ -e 's|CC = cc|CC = ${CC}|'\ -e 's|CXX = c++|CXX = ${CXX}|'\ diff --git a/devel/py-qt4-qscintilla2/files/Makefile.in b/devel/py-qt4-qscintilla2/files/Makefile.in index 09a79f24b290..803ee3682314 100644 --- a/devel/py-qt4-qscintilla2/files/Makefile.in +++ b/devel/py-qt4-qscintilla2/files/Makefile.in @@ -8,13 +8,14 @@ LINK = c++ CPPFLAGS = -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB\ -I%%LOCALBASE%%/include/python%%PYVER%%\ -I%%LOCALBASE%%/share/qt4/mkspecs/freebsd-g++\ - -I%%LOCALBASE%%/include/QtCore\ - -I%%LOCALBASE%%/include/QtGui\ + -I%%QT_INCDIR%%/QtCore\ + -I%%QT_INCDIR%%/QtGui\ + -I%%QT_INCDIR%%\ -I. -I%%LOCALBASE%%/include CFLAGS = -pipe -fPIC -O2 -fno-strict-aliasing -Wall -W CXXFLAGS = -pipe -fPIC -O2 -fno-strict-aliasing -Wall -W LFLAGS = -shared -pthread -Wl,-rpath,%%LOCALBASE%%/lib -LIBS = -L%%LOCALBASE%%/lib -lqscintilla2 -lQtCore -lz -lm -pthread\ +LIBS = -L%%QT_LIBDIR%% -L%%LOCALBASE%%/lib -lqscintilla2 -lQtCore -lz -lm -pthread\ -lgthread-2.0 -lglib-2.0 -liconv -lQtGui -lXt -lpng -lSM -lICE\ -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype\ -lfontconfig -lXext -lX11 |