diff options
| author | will <will@FreeBSD.org> | 2001-03-24 22:15:59 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2001-03-24 22:15:59 +0000 |
| commit | 63e44ba845351114773cc3c18846cac95bc4be15 (patch) | |
| tree | 87c0cdd041f295f742326ff15825dbec8b7ace9b /multimedia | |
| parent | 8e2927fc3c616d1f4d0dbbeb505045d2273dfcfb (diff) | |
| download | FreeBSD-ports-63e44ba845351114773cc3c18846cac95bc4be15.zip FreeBSD-ports-63e44ba845351114773cc3c18846cac95bc4be15.tar.gz | |
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)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/kdemultimedia3/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/Makefile | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index b3211a5..994bee6 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -20,19 +20,19 @@ USE_QT2= yes MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ s,DO_NOT_COMPILE mpeglib_artsplug,DO_NOT_COMPILE,g; \ - s,DO_NOT_COMPILE mpeglib,DO_NOT_COMPILE,g' ${WRKSRC}/configure + s,DO_NOT_COMPILE mpeglib,DO_NOT_COMPILE,g' ${WRKSRC}/configure.in post-install: @${ECHO_MSG} diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index b3211a5..994bee6 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -20,19 +20,19 @@ USE_QT2= yes MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ s,DO_NOT_COMPILE mpeglib_artsplug,DO_NOT_COMPILE,g; \ - s,DO_NOT_COMPILE mpeglib,DO_NOT_COMPILE,g' ${WRKSRC}/configure + s,DO_NOT_COMPILE mpeglib,DO_NOT_COMPILE,g' ${WRKSRC}/configure.in post-install: @${ECHO_MSG} |
