From 8a3f1526802671aa1197be0c58f1198c9bdc95d3 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sun, 29 Oct 2000 03:09:49 +0000 Subject: [PATCH] Oops, forgot to remove -lqt2 along with -L${X11BASE}/lib, to allow people to compile on X4.0.1. Submitted by: Andrzej Tobola --- archivers/ark/Makefile | 4 ++-- audio/kdemultimedia2/Makefile | 4 ++-- audio/kdemultimedia3/Makefile | 4 ++-- comms/kremotecontrol/Makefile | 4 ++-- converters/kdesupport2/Makefile | 2 +- deskutils/kcharselect/Makefile | 4 ++-- editors/calligra/Makefile | 2 +- editors/koffice-kde3/Makefile | 2 +- editors/koffice-kde4/Makefile | 2 +- editors/koffice/Makefile | 2 +- games/kdegames2/Makefile | 2 +- games/kdegames3/Makefile | 2 +- games/kdegames4/Makefile | 2 +- graphics/kdegraphics2/Makefile | 4 ++-- graphics/kdegraphics3/Makefile | 4 ++-- graphics/kdegraphics4/Makefile | 4 ++-- math/kcalc/Makefile | 4 ++-- misc/kdeutils2/Makefile | 4 ++-- misc/kdeutils3/Makefile | 4 ++-- misc/kdeutils4/Makefile | 4 ++-- multimedia/kdemultimedia3/Makefile | 4 ++-- multimedia/kdemultimedia4/Makefile | 4 ++-- net/kdenetwork2/Makefile | 2 +- net/kdenetwork3/Makefile | 2 +- net/kdenetwork4/Makefile | 2 +- security/kgpg-kde4/Makefile | 4 ++-- security/kwallet/Makefile | 4 ++-- sysutils/kdf/Makefile | 4 ++-- sysutils/kfloppy/Makefile | 4 ++-- sysutils/sweeper/Makefile | 4 ++-- x11-clocks/kdetoys2/Makefile | 2 +- x11-clocks/kdetoys3/Makefile | 2 +- x11-clocks/kdetoys4/Makefile | 2 +- x11/kde4-baseapps/Makefile | 2 +- x11/kde4-runtime/Makefile | 2 +- x11/kde4-workspace/Makefile | 2 +- x11/kdebase2/Makefile | 2 +- x11/kdebase3/Makefile | 2 +- x11/kdebase4-runtime/Makefile | 2 +- x11/kdebase4-workspace/Makefile | 2 +- x11/kdebase4/Makefile | 2 +- x11/kdelibs2/Makefile | 2 +- x11/kdelibs3/Makefile | 2 +- x11/kdelibs4/Makefile | 2 +- 44 files changed, 63 insertions(+), 63 deletions(-) diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 70605df9efb0..5f07a31ae08c 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 70605df9efb0..5f07a31ae08c 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index ea392d5bdbf3..19412a295ba7 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes PLIST_SUB+= LIBVER="${SOMAJOR}" diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index bc1c0406dcc1..fbfe12df3c11 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE/include}" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index bc1c0406dcc1..fbfe12df3c11 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE/include}" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index bc1c0406dcc1..fbfe12df3c11 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE/include}" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index bc1c0406dcc1..fbfe12df3c11 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE/include}" \ - LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 4b8e7bfc1e53..8df416c55a24 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -25,7 +25,7 @@ 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 -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 4b8e7bfc1e53..8df416c55a24 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -25,7 +25,7 @@ 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 -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 4b8e7bfc1e53..8df416c55a24 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -25,7 +25,7 @@ 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 -lqt2 -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index afbd55cbfa6b..35a260f48b8c 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -28,8 +28,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index afbd55cbfa6b..35a260f48b8c 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -28,8 +28,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index afbd55cbfa6b..35a260f48b8c 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -28,8 +28,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 70605df9efb0..5f07a31ae08c 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 70605df9efb0..5f07a31ae08c 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 4d12a417c584..e0c0041dc78a 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 4d12a417c584..e0c0041dc78a 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 4d12a417c584..e0c0041dc78a 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index f3570d644c69..567b79b6ef1a 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ 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" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ + USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index ff5e20b7f0de..493437344df3 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index ff5e20b7f0de..493437344df3 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index ff5e20b7f0de..493437344df3 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index bb4257fcab89..acc9e329e092 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 7714136d830e..c44a03721594 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -34,7 +34,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 -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -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 7714136d830e..c44a03721594 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -34,7 +34,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 -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -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 7714136d830e..c44a03721594 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -34,7 +34,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 -lqt2 -ljpeg -lgcc -lstdc++" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}"