diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-11-14 15:56:53 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-11-14 15:56:53 +0000 |
| commit | 74868616a9e75a5097d0d425ace456d8a23b924a (patch) | |
| tree | 394f26509f2db9c292b763a08c2101d5f54867d4 | |
| parent | Upgrade to OSSP lmtp2nntp 1.1.1 (diff) | |
(QT3/KDE3 only:) Use alternate dependency style; fix looking for qt
libraries. kdelibs from cvs building now in kde/freebsd repository.
| -rw-r--r-- | Mk/bsd.kde.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 013d75af4129..059bedae243f 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -111,7 +111,8 @@ QTCGFLIBS?= # Qt 3.x common stuff QT_PREFIX?= ${X11BASE}/qt MOC?= ${QT_PREFIX}/bin/moc -LIB_DEPENDS+= qt:${PORTSDIR}/x11-toolkits/qt-copy +BUILD_DEPENDS+= ${X11BASE}/qt/bin/moc:${PORTSDIR}/x11-toolkits/qt-copy +RUN_DEPENDS+= ${X11BASE}/qt/bin/moc:${PORTSDIR}/x11-toolkits/qt-copy USE_NEWGCC= yes QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include/qt @@ -119,7 +120,7 @@ QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ - --with-qt-libraries=${X11BASE}/lib \ + --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 013d75af4129..059bedae243f 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -111,7 +111,8 @@ QTCGFLIBS?= # Qt 3.x common stuff QT_PREFIX?= ${X11BASE}/qt MOC?= ${QT_PREFIX}/bin/moc -LIB_DEPENDS+= qt:${PORTSDIR}/x11-toolkits/qt-copy +BUILD_DEPENDS+= ${X11BASE}/qt/bin/moc:${PORTSDIR}/x11-toolkits/qt-copy +RUN_DEPENDS+= ${X11BASE}/qt/bin/moc:${PORTSDIR}/x11-toolkits/qt-copy USE_NEWGCC= yes QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include/qt @@ -119,7 +120,7 @@ QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ - --with-qt-libraries=${X11BASE}/lib \ + --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif |