summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2000-10-28 23:22:16 +0000
committerWill Andrews <will@FreeBSD.org>2000-10-28 23:22:16 +0000
commit93d5d50b4c438f7af2712f9359c11b2e8d45b4a3 (patch)
tree492f0ef3d84eb48e616352a3240bffbba364a119 /x11
parentFix KDE2 PLISTs and build for kdelibs. (diff)
Implement fix for configure scripts in regards to finding X libs on
XFree86 4.0.1. Submitted by: PW (thanks)
Notes
Notes: svn path=/head/; revision=34376
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile4
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kde4-workspace/Makefile4
-rw-r--r--x11/kdebase2/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase4-runtime/Makefile4
-rw-r--r--x11/kdebase4-workspace/Makefile4
-rw-r--r--x11/kdebase4/Makefile4
-rw-r--r--x11/kdelibs2/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
11 files changed, 19 insertions, 19 deletions
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}"