From 93d5d50b4c438f7af2712f9359c11b2e8d45b4a3 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 28 Oct 2000 23:22:16 +0000 Subject: Implement fix for configure scripts in regards to finding X libs on XFree86 4.0.1. Submitted by: PW (thanks) --- archivers/ark/Makefile | 6 +++--- audio/kdemultimedia2/Makefile | 6 +++--- audio/kdemultimedia3/Makefile | 6 +++--- comms/kremotecontrol/Makefile | 6 +++--- converters/kdesupport2/Makefile | 4 ++-- deskutils/kcharselect/Makefile | 6 +++--- editors/calligra/Makefile | 4 ++-- editors/koffice-kde3/Makefile | 4 ++-- editors/koffice-kde4/Makefile | 4 ++-- editors/koffice/Makefile | 4 ++-- games/kdegames2/Makefile | 4 ++-- games/kdegames3/Makefile | 4 ++-- games/kdegames4/Makefile | 4 ++-- graphics/kdegraphics2/Makefile | 6 +++--- graphics/kdegraphics3/Makefile | 6 +++--- graphics/kdegraphics4/Makefile | 6 +++--- math/kcalc/Makefile | 6 +++--- misc/kdeutils2/Makefile | 6 +++--- misc/kdeutils3/Makefile | 6 +++--- misc/kdeutils4/Makefile | 6 +++--- multimedia/kdemultimedia3/Makefile | 6 +++--- multimedia/kdemultimedia4/Makefile | 6 +++--- net/kdenetwork2/Makefile | 4 ++-- net/kdenetwork3/Makefile | 4 ++-- net/kdenetwork4/Makefile | 4 ++-- security/kgpg-kde4/Makefile | 6 +++--- security/kwallet/Makefile | 6 +++--- sysutils/kdf/Makefile | 6 +++--- sysutils/kfloppy/Makefile | 6 +++--- sysutils/sweeper/Makefile | 6 +++--- x11-clocks/kdetoys2/Makefile | 4 ++-- x11-clocks/kdetoys3/Makefile | 4 ++-- x11-clocks/kdetoys4/Makefile | 4 ++-- x11/kde4-baseapps/Makefile | 4 ++-- x11/kde4-runtime/Makefile | 4 ++-- x11/kde4-workspace/Makefile | 4 ++-- x11/kdebase2/Makefile | 4 ++-- x11/kdebase3/Makefile | 4 ++-- x11/kdebase4-runtime/Makefile | 4 ++-- x11/kdebase4-workspace/Makefile | 4 ++-- x11/kdebase4/Makefile | 4 ++-- x11/kdelibs2/Makefile | 2 +- x11/kdelibs3/Makefile | 2 +- x11/kdelibs4/Makefile | 2 +- 44 files changed, 104 insertions(+), 104 deletions(-) diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index ec04188e41de..70605df9efb0 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index ec04188e41de..70605df9efb0 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index 7cf84ed857cd..ea392d5bdbf3 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --without-odbc --without-audiofile \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes PLIST_SUB+= LIBVER="${SOMAJOR}" diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 0c68ad3c5f44..bc1c0406dcc1 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE/include}" \ + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 0c68ad3c5f44..bc1c0406dcc1 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE/include}" \ + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 0c68ad3c5f44..bc1c0406dcc1 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE/include}" \ + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index 0c68ad3c5f44..bc1c0406dcc1 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE/include}" \ + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 5421c9efc20d..4b8e7bfc1e53 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${X11BASE}/lib -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LIBS="-Wl,-export-dynamic -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes .include diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 5421c9efc20d..4b8e7bfc1e53 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${X11BASE}/lib -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LIBS="-Wl,-export-dynamic -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes .include diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 5421c9efc20d..4b8e7bfc1e53 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${X11BASE}/lib -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LIBS="-Wl,-export-dynamic -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes .include diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index 3c59475f4a48..afbd55cbfa6b 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -27,9 +27,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 3c59475f4a48..afbd55cbfa6b 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -27,9 +27,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 3c59475f4a48..afbd55cbfa6b 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -27,9 +27,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index ec04188e41de..70605df9efb0 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index ec04188e41de..70605df9efb0 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index ce0540846e6c..4d12a417c584 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ce0540846e6c..4d12a417c584 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index ce0540846e6c..4d12a417c584 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 7028ea9bcd80..f3570d644c69 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index 5a4a518ef73b..ff5e20b7f0de 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 5a4a518ef73b..ff5e20b7f0de 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 5a4a518ef73b..ff5e20b7f0de 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 6b1682cb669f..bb4257fcab89 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 155eb4e9c23b..2b81e2b1d186 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 155eb4e9c23b..2b81e2b1d186 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 155eb4e9c23b..2b81e2b1d186 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" -- cgit v1.2.3