diff options
| author | will <will@FreeBSD.org> | 2002-05-12 04:01:09 +0800 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2002-05-12 04:01:09 +0800 |
| commit | 773585df596e33384537cfd22b2e8858b4d3ef85 (patch) | |
| tree | 695335715994fb953b827a4d5da60065fdf26e6a | |
| parent | fa8bf262876a4641a68ee06f7b39d68132b451cb (diff) | |
| download | freebsd-ports-gnome-773585df596e33384537cfd22b2e8858b4d3ef85.tar.gz freebsd-ports-gnome-773585df596e33384537cfd22b2e8858b4d3ef85.tar.zst freebsd-ports-gnome-773585df596e33384537cfd22b2e8858b4d3ef85.zip | |
Minor cleanups/fixes:
[1] Warn people about Qt1, remove warning about Qt3, and fix something I
forgot to fix before committing the Qt3/KDE3 stuff.
[2] Programs that were using USE_QT_VER=3 were looking in the wrong
place for the headers if they relied solely on QTCPPFLAGS to give
it to them.
Reported by: [2] Frank Laszlo <laszlof@earthlink.net>
| -rw-r--r-- | Mk/bsd.kde.mk | 6 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 9bed9e774bd2..c35e97b8d69f 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -24,8 +24,8 @@ KDE_MAINTAINER= will@FreeBSD.org # # WARNING! ACHTUNG! DANGER WILL ROBINSON! -# DO NOT USE USE_[QT,KDELIBS,KDEBASE}_VER=3 UNLESS YOU ARE INVOLVED IN THE -# KDE/FREEBSD PROJECT AND/OR YOU KNOW WHAT YOU ARE DOING! +# DO NOT USE USE_QT_VER=1 UNLESS YOU WILL NOT BE NEEDING ANY ASSISTANCE +# WHATSOEVER FROM THE MAINTAINER OF THIS FILE! # # Compat shims. @@ -106,7 +106,7 @@ BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt30 RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt30 USE_NEWGCC= yes QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \ - -I${QT_PREFIX}/include/qt + -I${QT_PREFIX}/include QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if !defined(QT_NONSTANDARD) diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 9bed9e774bd2..c35e97b8d69f 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -24,8 +24,8 @@ KDE_MAINTAINER= will@FreeBSD.org # # WARNING! ACHTUNG! DANGER WILL ROBINSON! -# DO NOT USE USE_[QT,KDELIBS,KDEBASE}_VER=3 UNLESS YOU ARE INVOLVED IN THE -# KDE/FREEBSD PROJECT AND/OR YOU KNOW WHAT YOU ARE DOING! +# DO NOT USE USE_QT_VER=1 UNLESS YOU WILL NOT BE NEEDING ANY ASSISTANCE +# WHATSOEVER FROM THE MAINTAINER OF THIS FILE! # # Compat shims. @@ -106,7 +106,7 @@ BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt30 RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt30 USE_NEWGCC= yes QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \ - -I${QT_PREFIX}/include/qt + -I${QT_PREFIX}/include QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if !defined(QT_NONSTANDARD) |