diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-03-24 22:15:59 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-03-24 22:15:59 +0000 |
| commit | cd5ac27b080695645adeb97642ae92ac8987ddc3 (patch) | |
| tree | 02f05001735d741a4930238201a081a66e0609f8 /x11-clocks | |
| parent | Add new categories science and ukrainian. (diff) | |
Bring in my fixes for KDE2 for users of XFree86 4.0.x. Basically, what
this involves is this: Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads. Then also provide a Qt
library that has threads but not GL. This allows us to make KDE2 depend
on a library that will *not* have threads, ever. Threads will be
revisited at a later date. Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4. The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability. Also, static
qt will not have GL support.
Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.
Replace qt22-static with qt2-static, since it's just a proxy. Update
qt-designer to depend on qt23. Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.
Miscellaneous changes: remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore. Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports. Hopefully.
Suggested by: ade, asami, sobomax (bsd.kde.mk)
Repocopied by: asami (qt22-static --> qt2-static)
Notes
Notes:
svn path=/head/; revision=40324
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/kdetoys2/Makefile | 2 | ||||
| -rw-r--r-- | x11-clocks/kdetoys3/Makefile | 2 | ||||
| -rw-r--r-- | x11-clocks/kdetoys4/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index ed7dfbd8a059..911a1ef20521 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index ed7dfbd8a059..911a1ef20521 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index ed7dfbd8a059..911a1ef20521 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes |