diff options
author | will <will@FreeBSD.org> | 2000-10-29 07:22:16 +0800 |
---|---|---|
committer | will <will@FreeBSD.org> | 2000-10-29 07:22:16 +0800 |
commit | b644b097737cea11dc72ddbe882d198d29d8cc6d (patch) | |
tree | 4b57b5b6ccaf02ebecc714733b8f7ed7ba0543b6 /x11 | |
parent | f0dba4368e7e5aca622482ec55fcdb9eb575f85e (diff) | |
download | freebsd-ports-gnome-b644b097737cea11dc72ddbe882d198d29d8cc6d.tar.gz freebsd-ports-gnome-b644b097737cea11dc72ddbe882d198d29d8cc6d.tar.zst freebsd-ports-gnome-b644b097737cea11dc72ddbe882d198d29d8cc6d.zip |
Implement fix for configure scripts in regards to finding X libs on
XFree86 4.0.1.
Submitted by: PW (thanks)
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde4-baseapps/Makefile | 4 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 4 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase2/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4-runtime/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4-workspace/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4/Makefile | 4 | ||||
-rw-r--r-- | x11/kdelibs2/Makefile | 2 | ||||
-rw-r--r-- | x11/kdelibs3/Makefile | 2 | ||||
-rw-r--r-- | x11/kdelibs4/Makefile | 2 |
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}" |