aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2002-06-17 04:27:51 +0800
committerwill <will@FreeBSD.org>2002-06-17 04:27:51 +0800
commit7171408c000dee2b92d078e977aa5e27aa553d59 (patch)
treeb9d04e86896e5ba2aaeedf75069af4c52fb72d88 /Mk
parente246879f4843f587d652d58deb401afba0efad4c (diff)
downloadfreebsd-ports-gnome-7171408c000dee2b92d078e977aa5e27aa553d59.tar.gz
freebsd-ports-gnome-7171408c000dee2b92d078e977aa5e27aa553d59.tar.zst
freebsd-ports-gnome-7171408c000dee2b92d078e977aa5e27aa553d59.zip
Get rid of old cruft that was inserted a long time ago to workaround
problems people were seeing with e.g. devel/pth and friends installed. They conflict with GCC3 and may not be an issue anymore. But if someone reports the issue again we'll address it with a finer comb next time.
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.kde.mk6
-rw-r--r--Mk/bsd.kde4.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index c35e97b8d69f..0bf1eb4a8f46 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -105,7 +105,7 @@ MOC?= ${QT_PREFIX}/bin/moc
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 \
+QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \
-I${QT_PREFIX}/include
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
-L${QT_PREFIX}/lib
@@ -126,8 +126,8 @@ LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
USE_NEWGCC= yes
QTNAME= qt2
MOC?= ${X11BASE}/bin/moc2
-QTCPPFLAGS+= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \
- -I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2
+QTCPPFLAGS+= -D_GETOPT_H -I${LOCALBASE}/include -I${PREFIX}/include \
+ -I${X11BASE}/include/qt2
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++
.if !defined(QT_NONSTANDARD)
CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index c35e97b8d69f..0bf1eb4a8f46 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -105,7 +105,7 @@ MOC?= ${QT_PREFIX}/bin/moc
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 \
+QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \
-I${QT_PREFIX}/include
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
-L${QT_PREFIX}/lib
@@ -126,8 +126,8 @@ LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
USE_NEWGCC= yes
QTNAME= qt2
MOC?= ${X11BASE}/bin/moc2
-QTCPPFLAGS+= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \
- -I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2
+QTCPPFLAGS+= -D_GETOPT_H -I${LOCALBASE}/include -I${PREFIX}/include \
+ -I${X11BASE}/include/qt2
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++
.if !defined(QT_NONSTANDARD)
CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \