diff options
| author | will <will@FreeBSD.org> | 2001-03-25 06:15:59 +0800 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2001-03-25 06:15:59 +0800 |
| commit | 63e44ba845351114773cc3c18846cac95bc4be15 (patch) | |
| tree | 87c0cdd041f295f742326ff15825dbec8b7ace9b | |
| parent | 8e2927fc3c616d1f4d0dbbeb505045d2273dfcfb (diff) | |
| download | freebsd-ports-gnome-63e44ba845351114773cc3c18846cac95bc4be15.tar.gz freebsd-ports-gnome-63e44ba845351114773cc3c18846cac95bc4be15.tar.zst freebsd-ports-gnome-63e44ba845351114773cc3c18846cac95bc4be15.zip | |
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)
54 files changed, 484 insertions, 1143 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk new file mode 100644 index 000000000000..5981a6e46b96 --- /dev/null +++ b/Mk/bsd.kde.mk @@ -0,0 +1,109 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Please view me with 4 column tabs! + +# Please make sure all changes to this file are past through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +KDE_MAINTAINER= will@FreeBSD.org + +.if defined(_POSTMKINCLUDED) + +# This section contains the USE_ definitions. +# XXX: Write HAVE_ definitions sometime. + +# USE_QT_VER - Says that the port uses the Qt toolkit. A number, currently +# 1 or 2, specifies which major version of Qt to use. This +# implies USE_NEWGCC. +# USE_KDELIBS_VER - Says that the port uses KDE libraries. A number, currently 1 +# or 2, specifies which major version of KDE to use. This +# implies USE_QT of the appropriate version. +# USE_KDEBASE_VER - Says that the port uses the KDE base system. A number, +# currently 1 or 2, specifies which major version of KDE to +# use. This implies USE_KDELIBS of the appropriate version. + +# Compat shims. +.if defined(USE_QT) +QT_VER= 1 +pre-everything:: + @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT variable!" +.endif +.if defined(USE_QT2) +QT_VER= 2 +pre-everything:: + @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!" +.endif + +# USE_QT_VER section +.if defined(USE_QT_VER) + +# Qt 1.x common stuff +.if ${USE_QT_VER} == 1 +LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 +USE_NEWGCC= yes +MOC?= ${X11BASE}/bin/moc +.if defined(PREFIX) +QTDIR= ${PREFIX} +.else +QTDIR= ${X11BASE} +.endif +CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" + +.else + +# Qt 2.x common stuff -- DEFAULT +LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 +USE_NEWGCC= yes +QTNAME= qt2 +MOC?= ${X11BASE}/bin/moc2 +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +QTCPPFLAGS= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include +QTCFGLIBS= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ + CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +.endif +.endif +# End of USE_QT section + +# USE_KDELIBS section +.if defined(USE_KDELIBS_VER) + +# kdelibs 1.x common stuff +.if ${USE_KDELIBS_VER} == 1 +LIB_DEPENDS+= kdelibs.3:${PORTSDIR}/x11/kdelibs11 +QT_VER= 1 + +.else + +# kdelibs 2.x common stuff -- DEFAULT +LIB_DEPENDS+= kdelibs.4:${PORTSDIR}/x11/kdelibs2 +QT_VER= 2 + +.endif +.endif +# End of USE_KDELIBS section + +# USE_KDEBASE_VER section +.if defined(USE_KDEBASE_VER) + +# kdebase 1.x common stuff +.if ${USE_KDEBASE_VER} == 1 +RUN_DEPENDS+= kcontrol:${PORTSDIR}/x11/kdebase11 +USE_KDELIBS= 1 + +.else + +# kdebase 2.x common stuff -- DEFAULT +LIB_DEPENDS+= kparts.4:${PORTSDIR}/x11/kdebase2 +USE_KDELIBS= 2 + +.endif +.endif +# End of USE_KDEBASE_VER + +.endif +# End of use part. diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk new file mode 100644 index 000000000000..5981a6e46b96 --- /dev/null +++ b/Mk/bsd.kde4.mk @@ -0,0 +1,109 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Please view me with 4 column tabs! + +# Please make sure all changes to this file are past through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +KDE_MAINTAINER= will@FreeBSD.org + +.if defined(_POSTMKINCLUDED) + +# This section contains the USE_ definitions. +# XXX: Write HAVE_ definitions sometime. + +# USE_QT_VER - Says that the port uses the Qt toolkit. A number, currently +# 1 or 2, specifies which major version of Qt to use. This +# implies USE_NEWGCC. +# USE_KDELIBS_VER - Says that the port uses KDE libraries. A number, currently 1 +# or 2, specifies which major version of KDE to use. This +# implies USE_QT of the appropriate version. +# USE_KDEBASE_VER - Says that the port uses the KDE base system. A number, +# currently 1 or 2, specifies which major version of KDE to +# use. This implies USE_KDELIBS of the appropriate version. + +# Compat shims. +.if defined(USE_QT) +QT_VER= 1 +pre-everything:: + @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT variable!" +.endif +.if defined(USE_QT2) +QT_VER= 2 +pre-everything:: + @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!" +.endif + +# USE_QT_VER section +.if defined(USE_QT_VER) + +# Qt 1.x common stuff +.if ${USE_QT_VER} == 1 +LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 +USE_NEWGCC= yes +MOC?= ${X11BASE}/bin/moc +.if defined(PREFIX) +QTDIR= ${PREFIX} +.else +QTDIR= ${X11BASE} +.endif +CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" + +.else + +# Qt 2.x common stuff -- DEFAULT +LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 +USE_NEWGCC= yes +QTNAME= qt2 +MOC?= ${X11BASE}/bin/moc2 +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +QTCPPFLAGS= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include +QTCFGLIBS= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ + CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +.endif +.endif +# End of USE_QT section + +# USE_KDELIBS section +.if defined(USE_KDELIBS_VER) + +# kdelibs 1.x common stuff +.if ${USE_KDELIBS_VER} == 1 +LIB_DEPENDS+= kdelibs.3:${PORTSDIR}/x11/kdelibs11 +QT_VER= 1 + +.else + +# kdelibs 2.x common stuff -- DEFAULT +LIB_DEPENDS+= kdelibs.4:${PORTSDIR}/x11/kdelibs2 +QT_VER= 2 + +.endif +.endif +# End of USE_KDELIBS section + +# USE_KDEBASE_VER section +.if defined(USE_KDEBASE_VER) + +# kdebase 1.x common stuff +.if ${USE_KDEBASE_VER} == 1 +RUN_DEPENDS+= kcontrol:${PORTSDIR}/x11/kdebase11 +USE_KDELIBS= 1 + +.else + +# kdebase 2.x common stuff -- DEFAULT +LIB_DEPENDS+= kparts.4:${PORTSDIR}/x11/kdebase2 +USE_KDELIBS= 2 + +.endif +.endif +# End of USE_KDEBASE_VER + +.endif +# End of use part. diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index b3211a556338..994bee691883 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/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/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index b3211a556338..994bee691883 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/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/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index 2cbfda0eb7e6..1d4896ca12c8 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -17,46 +17,22 @@ LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_QT2= yes -MOC= ${X11BASE}/bin/moc2 +MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. Even if we have a -# libqt2-mt, it may not be wise to build with it if we don't have -# a threads stub for X. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= "qt2-mt" -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= "" -PTHREAD_LIBS= "-lc_r" -.else -PTHREAD_CFLAGS= "-D_THREAD_SAFE" -PTHREAD_LIBS= "-pthread" -.endif -.else -QTNAME= "qt2" -PTHREAD_CFLAGS= "" -PTHREAD_LIBS= "" -.endif -.endif +USE_GMAKE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --without-audiofile -CONFIGURE_ENV+= LIBQT="-l${QTNAME}" MOC="${MOC}" LIBQTFILE="lib${QTNAME}" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" -USE_GMAKE= yes +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" pre-configure: - ${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g ; \ - s@odbc libaps@odbc@g" ${WRKSRC}/configure ${PERL} -pi -e "s@-version-info 1:1@-version-info 3:0@g" ${WRKSRC}/mimelib/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/kdesupport2/files/patch-ae b/converters/kdesupport2/files/patch-ae deleted file mode 100644 index 5694a2ed4dc1..000000000000 --- a/converters/kdesupport2/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- mimelib/Makefile.in Tue May 9 19:33:18 2000 -+++ mimelib/Makefile.in.new Tue May 16 18:32:11 2000 -@@ -233,7 +233,7 @@ - - DEFS = -D$(LIBVERSION) @DEFS@ - --libmimelib_la_LDFLAGS = -version-info 1:1 -+libmimelib_la_LDFLAGS = -version-info 3:0 - mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile index e12929ad81a0..cee1a28b0250 100644 --- a/devel/qt-designer/Makefile +++ b/devel/qt-designer/Makefile @@ -5,14 +5,14 @@ # $FreeBSD$ # -MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt22 +MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23 PORTNAME= qt-designer CATEGORIES= devel .include "${MASTERDIR}/Makefile" -LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt22 +LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 WRKSRC= ${WRKDIR}/qt-${PORTVERSION} PATCHDIR= ${.CURDIR}/files diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index a69564914598..7ce31bfa1e20 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -26,7 +26,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index a69564914598..7ce31bfa1e20 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -26,7 +26,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index a69564914598..7ce31bfa1e20 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -26,7 +26,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index a69564914598..7ce31bfa1e20 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -26,7 +26,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 8a6ecc508c1a..2f10e12bb138 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -23,7 +23,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 8a6ecc508c1a..2f10e12bb138 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -23,7 +23,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 8a6ecc508c1a..2f10e12bb138 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -23,7 +23,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index b3211a556338..994bee691883 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 b3211a556338..994bee691883 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} diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 1847c939eb92..77dba4dc9b97 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -24,12 +24,13 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ + 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 -lgcc -lstdc++" USE_GMAKE= yes pre-configure: ${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 .include <bsd.port.mk> diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 1847c939eb92..77dba4dc9b97 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -24,12 +24,13 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ + 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 -lgcc -lstdc++" USE_GMAKE= yes pre-configure: ${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 .include <bsd.port.mk> diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 1847c939eb92..77dba4dc9b97 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -24,12 +24,13 @@ USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ + 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 -lgcc -lstdc++" USE_GMAKE= yes pre-configure: ${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 .include <bsd.port.mk> 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 diff --git a/x11-toolkits/qt2-static/Makefile b/x11-toolkits/qt2-static/Makefile index 04a7e109a6bd..39d0cc242e76 100644 --- a/x11-toolkits/qt2-static/Makefile +++ b/x11-toolkits/qt2-static/Makefile @@ -12,6 +12,6 @@ MAINTAINER= ports@freebsd.org WANT_STATIC= yes -MASTERDIR= ${.CURDIR}/../qt22 +MASTERDIR= ${.CURDIR}/../qt23 .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/qt22-static/Makefile b/x11-toolkits/qt22-static/Makefile deleted file mode 100644 index 04a7e109a6bd..000000000000 --- a/x11-toolkits/qt22-static/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: qt22-static -# Date created: 22 February 2001 -# Whom: alex -# -# $FreeBSD$ -# - -PORTNAME= qt -PKGNAMESUFFIX= -static - -MAINTAINER= ports@freebsd.org - -WANT_STATIC= yes - -MASTERDIR= ${.CURDIR}/../qt22 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/qt22/files/manpages b/x11-toolkits/qt22/files/manpages deleted file mode 100644 index bb488b74226e..000000000000 --- a/x11-toolkits/qt22/files/manpages +++ /dev/null @@ -1,331 +0,0 @@ -MAN3= \ -qaccel.3qt \ -qaction.3qt \ -qactiongroup.3qt \ -qapplication.3qt \ -qarray.3qt \ -qasciicache.3qt \ -qasciicacheiterator.3qt \ -qasciidict.3qt \ -qasciidictiterator.3qt \ -qasyncio.3qt \ -qbitarray.3qt \ -qbitmap.3qt \ -qbitval.3qt \ -qboxlayout.3qt \ -qbrush.3qt \ -qbuffer.3qt \ -qbutton.3qt \ -qbuttongroup.3qt \ -qbytearray.3qt \ -qcache.3qt \ -qcacheiterator.3qt \ -qcanvas.3qt \ -qcanvasellipse.3qt \ -qcanvasitem.3qt \ -qcanvasline.3qt \ -qcanvaspixmap.3qt \ -qcanvaspixmaparray.3qt \ -qcanvaspolygon.3qt \ -qcanvaspolygonalitem.3qt \ -qcanvasrectangle.3qt \ -qcanvassprite.3qt \ -qcanvastext.3qt \ -qcanvasview.3qt \ -qcdestyle.3qt \ -qchar.3qt \ -qcharref.3qt \ -qcheckbox.3qt \ -qchecklistitem.3qt \ -qchildevent.3qt \ -qclipboard.3qt \ -qcloseevent.3qt \ -qcollection.3qt \ -qcolor.3qt \ -qcolordialog.3qt \ -qcolordrag.3qt \ -qcolorgroup.3qt \ -qcombobox.3qt \ -qcommonstyle.3qt \ -qconststring.3qt \ -qcopchannel.3qt \ -qcstring.3qt \ -qcursor.3qt \ -qcustomevent.3qt \ -qcustommenuitem.3qt \ -qdatapump.3qt \ -qdatasink.3qt \ -qdatasource.3qt \ -qdatastream.3qt \ -qdate.3qt \ -qdatetime.3qt \ -qdial.3qt \ -qdialog.3qt \ -qdict.3qt \ -qdictiterator.3qt \ -qdir.3qt \ -qdns.3qt \ -qdomattr.3qt \ -qdomcdatasection.3qt \ -qdomcharacterdata.3qt \ -qdomcomment.3qt \ -qdomdocument.3qt \ -qdomdocumentfragment.3qt \ -qdomdocumenttype.3qt \ -qdomelement.3qt \ -qdomentity.3qt \ -qdomentityreference.3qt \ -qdomimplementation.3qt \ -qdomnamednodemap.3qt \ -qdomnode.3qt \ -qdomnodelist.3qt \ -qdomnotation.3qt \ -qdomprocessinginstruction.3qt \ -qdomtext.3qt \ -qdoublevalidator.3qt \ -qdragenterevent.3qt \ -qdragleaveevent.3qt \ -qdragmoveevent.3qt \ -qdragobject.3qt \ -qdropevent.3qt \ -qdropsite.3qt \ -qeucjpcodec.3qt \ -qeuckrcodec.3qt \ -qevent.3qt \ -qfile.3qt \ -qfiledialog.3qt \ -qfileiconprovider.3qt \ -qfileinfo.3qt \ -qfilepreview.3qt \ -qfocusdata.3qt \ -qfocusevent.3qt \ -qfont.3qt \ -qfontdatabase.3qt \ -qfontdialog.3qt \ -qfontinfo.3qt \ -qfontmetrics.3qt \ -qframe.3qt \ -qftp.3qt \ -qgarray.3qt \ -qgbkcodec.3qt \ -qgcache.3qt \ -qgcacheiterator.3qt \ -qgdict.3qt \ -qgdictiterator.3qt \ -qgl.3qt \ -qglayoutiterator.3qt \ -qglcontext.3qt \ -qglformat.3qt \ -qglist.3qt \ -qglistiterator.3qt \ -qglwidget.3qt \ -qgrid.3qt \ -qgridlayout.3qt \ -qgroupbox.3qt \ -qguardedptr.3qt \ -qgvector.3qt \ -qhbox.3qt \ -qhboxlayout.3qt \ -qhbuttongroup.3qt \ -qheader.3qt \ -qhgroupbox.3qt \ -qhideevent.3qt \ -qhostaddress.3qt \ -qicondrag.3qt \ -qicondragitem.3qt \ -qiconset.3qt \ -qiconview.3qt \ -qiconviewitem.3qt \ -qimage.3qt \ -qimageconsumer.3qt \ -qimagedecoder.3qt \ -qimagedrag.3qt \ -qimageformat.3qt \ -qimageformattype.3qt \ -qimageio.3qt \ -qinputdialog.3qt \ -qintcache.3qt \ -qintcacheiterator.3qt \ -qintdict.3qt \ -qintdictiterator.3qt \ -qintvalidator.3qt \ -qiodevice.3qt \ -qiodevicesource.3qt \ -qjiscodec.3qt \ -qjpunicodeconv.3qt \ -qkeyevent.3qt \ -qlabel.3qt \ -qlayout.3qt \ -qlayoutitem.3qt \ -qlayoutiterator.3qt \ -qlcdnumber.3qt \ -qlineedit.3qt \ -qlist.3qt \ -qlistbox.3qt \ -qlistboxitem.3qt \ -qlistboxpixmap.3qt \ -qlistboxtext.3qt \ -qlistiterator.3qt \ -qlistview.3qt \ -qlistviewitem.3qt \ -qlistviewitemiterator.3qt \ -qlnode.3qt \ -qlocalfs.3qt \ -qmainwindow.3qt \ -qmap.3qt \ -qmapconstiterator.3qt \ -qmapiterator.3qt \ -qmenubar.3qt \ -qmenudata.3qt \ -qmessagebox.3qt \ -qmetaobject.3qt \ -qmetaproperty.3qt \ -qmimesource.3qt \ -qmimesourcefactory.3qt \ -qmotifplusstyle.3qt \ -qmotifstyle.3qt \ -qmouseevent.3qt \ -qmoveevent.3qt \ -qmovie.3qt \ -qmultilineedit.3qt \ -qmutex.3qt \ -qnetworkoperation.3qt \ -qnetworkprotocol.3qt \ -qnpinstance.3qt \ -qnplugin.3qt \ -qnpstream.3qt \ -qnpwidget.3qt \ -qobject.3qt \ -qpaintdevice.3qt \ -qpaintdevicemetrics.3qt \ -qpainter.3qt \ -qpaintevent.3qt \ -qpalette.3qt \ -qpen.3qt \ -qpicture.3qt \ -qpixmap.3qt \ -qpixmapcache.3qt \ -qplatinumstyle.3qt \ -qpngimagepacker.3qt \ -qpoint.3qt \ -qpointarray.3qt \ -qpopupmenu.3qt \ -qprinter.3qt \ -qprogressbar.3qt \ -qprogressdialog.3qt \ -qptrdict.3qt \ -qptrdictiterator.3qt \ -qpushbutton.3qt \ -qqueue.3qt \ -qradiobutton.3qt \ -qrangecontrol.3qt \ -qrect.3qt \ -qregexp.3qt \ -qregion.3qt \ -qresizeevent.3qt \ -qscrollbar.3qt \ -qscrollview.3qt \ -qsemaphore.3qt \ -qsemimodal.3qt \ -qserversocket.3qt \ -qsessionmanager.3qt \ -qsgistyle.3qt \ -qshared.3qt \ -qshowevent.3qt \ -qsignal.3qt \ -qsignalmapper.3qt \ -qsimplerichtext.3qt \ -qsize.3qt \ -qsizegrip.3qt \ -qsizepolicy.3qt \ -qsjiscodec.3qt \ -qslider.3qt \ -qsocket.3qt \ -qsocketdevice.3qt \ -qsocketnotifier.3qt \ -qsortedlist.3qt \ -qsound.3qt \ -qspaceritem.3qt \ -qspinbox.3qt \ -qsplitter.3qt \ -qstack.3qt \ -qstatusbar.3qt \ -qstoreddrag.3qt \ -qstrilist.3qt \ -qstring.3qt \ -qstringlist.3qt \ -qstrlist.3qt \ -qstrlistiterator.3qt \ -qstyle.3qt \ -qstylesheet.3qt \ -qstylesheetitem.3qt \ -qt.3qt \ -qtab.3qt \ -qtabbar.3qt \ -qtabdialog.3qt \ -qtable.3qt \ -qtableitem.3qt \ -qtableselection.3qt \ -qtableview.3qt \ -qtabwidget.3qt \ -qtextbrowser.3qt \ -qtextcodec.3qt \ -qtextdecoder.3qt \ -qtextdrag.3qt \ -qtextencoder.3qt \ -qtextistream.3qt \ -qtextostream.3qt \ -qtextstream.3qt \ -qtextview.3qt \ -qthread.3qt \ -qtime.3qt \ -qtimer.3qt \ -qtimerevent.3qt \ -qtoolbar.3qt \ -qtoolbutton.3qt \ -qtooltip.3qt \ -qtooltipgroup.3qt \ -qtranslator.3qt \ -qtsciicodec.3qt \ -quridrag.3qt \ -qurl.3qt \ -qtranslatormessage.3qt \ -qurloperator.3qt \ -qvalidator.3qt \ -qvaluelist.3qt \ -qvaluelistconstiterator.3qt \ -qvaluelistiterator.3qt \ -qvaluestack.3qt \ -qvariant.3qt \ -qvbox.3qt \ -qvboxlayout.3qt \ -qvbuttongroup.3qt \ -qvector.3qt \ -qvgroupbox.3qt \ -qwhatsthis.3qt \ -qwheelevent.3qt \ -qwaitcondition.3qt \ -qwidget.3qt \ -qwidgetitem.3qt \ -qwidgetstack.3qt \ -qwindowsstyle.3qt \ -qwizard.3qt \ -qwmatrix.3qt \ -qworkspace.3qt \ -qxmlattributes.3qt \ -qxmlcontenthandler.3qt \ -qxmldeclhandler.3qt \ -qxmldefaulthandler.3qt \ -qxmldtdhandler.3qt \ -qxmlentityresolver.3qt \ -qxmlerrorhandler.3qt \ -qxmlinputsource.3qt \ -qxmllexicalhandler.3qt \ -qxmllocator.3qt \ -qxmlnamespacesupport.3qt \ -qxmlparseexception.3qt \ -qxmlreader.3qt \ -qxmlsimplereader.3qt \ -qxtapplication.3qt \ -qxtwidget.3qt \ -qscreencursor.3qt diff --git a/x11-toolkits/qt22/files/patch-aa b/x11-toolkits/qt22/files/patch-aa deleted file mode 100644 index 67443ca0c1d4..000000000000 --- a/x11-toolkits/qt22/files/patch-aa +++ /dev/null @@ -1,60 +0,0 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 -@@ -6,7 +6,7 @@ - - # Compiling with support libraries - SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include --SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) - SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include - - # Compiling YACC output -@@ -23,7 +23,7 @@ - SYSCONF_LIBS_X11 = -lXext -lX11 -lm - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib --SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) -+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL - SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -46,7 +46,7 @@ - SYSCONF_LIBS_THREAD = - - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -+SYSCONF_MOC = $(QTDIR)/bin/moc2 - - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -57,16 +57,14 @@ - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # - SYSCONF_LINK_SHLIB = g++ --SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) -+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) - SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ - cd $(DESTDIR) && \ -- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -+ rm -f lib$(TARGET).so;\ -+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - - # Linking static libraries - # - Build the $(TARGET) library, eg. lib$(TARGET).a -@@ -77,8 +75,8 @@ - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) - # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 - # Default link type (static linking is still be used where required) - SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) - SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt22/files/patch-af b/x11-toolkits/qt22/files/patch-af deleted file mode 100644 index 0e02a1aefefc..000000000000 --- a/x11-toolkits/qt22/files/patch-af +++ /dev/null @@ -1,31 +0,0 @@ ---- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 -+++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ - SYSCONF_LIBS_X11 = -lXext -lX11 -lm - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib --SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) -+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL - SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ - SYSCONF_LIBS_THREAD = - - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -+SYSCONF_MOC = $(QTDIR)/bin/moc2 - - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) - # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 - SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) - SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) - # Compiling library source diff --git a/x11-toolkits/qt22/files/patch-al b/x11-toolkits/qt22/files/patch-al deleted file mode 100644 index 3be06c07aa42..000000000000 --- a/x11-toolkits/qt22/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt22/files/patch-am b/x11-toolkits/qt22/files/patch-am deleted file mode 100644 index 0df46e135e46..000000000000 --- a/x11-toolkits/qt22/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt22/files/patch-an b/x11-toolkits/qt22/files/patch-an deleted file mode 100644 index b3a5f30703bb..000000000000 --- a/x11-toolkits/qt22/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt22/files/patch-ao b/x11-toolkits/qt22/files/patch-ao deleted file mode 100644 index f26c1d1e80dc..000000000000 --- a/x11-toolkits/qt22/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt22/files/patch-ap b/x11-toolkits/qt22/files/patch-ap deleted file mode 100644 index 593ac76bdbbf..000000000000 --- a/x11-toolkits/qt22/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt22/files/patch-designer::Makefile.in b/x11-toolkits/qt22/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt22/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 66cd3c4c58bd..6561c7ba1809 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread \ + -system-libmng -thread -no-opengl \ -I${LOCALBASE}/include -L${LOCALBASE}/lib CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) @@ -43,9 +43,11 @@ CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC} .if defined(WANT_STATIC) STATIC=static CONFIGURE_ARGS+=-static +PLIST_SUB+= STATIC="@comment " SHARED="" .else STATIC=shared INSTALLS_SHLIB=yes +PLIST_SUB+= STATIC="" STATIC="@comment " .endif .include <bsd.port.pre.mk> @@ -69,7 +71,7 @@ pre-fetch: pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ - s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} + s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in @@ -81,6 +83,21 @@ pre-configure: post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) +# Add hack to bring in support for GL. The last line is necessary to ensure that +# one can rebuild with the same tree and get the same results. +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.if !defined(WANT_STATIC) + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 + ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 + ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 + ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile +.endif + # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") @@ -93,7 +110,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt2 qt2-mt qtgl ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor @@ -120,14 +137,4 @@ do-install: .endif .endif -.if defined(WANT_STATIC) -.if (${PORTNAME} == "qt") -post-install: - ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ - -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ - ${TMPPLIST}.new > ${TMPPLIST} -.endif -.endif - .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist index d5546993e41f..2b57cd177e28 100644 --- a/x11-toolkits/qt23/pkg-plist +++ b/x11-toolkits/qt23/pkg-plist @@ -284,12 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -lib/libqt2-mt.so -lib/libqt2-mt.so.4 -lib/libqt2.so -lib/libqt2.so.4 -lib/libqutil.so -lib/libqutil.so.1 +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 +%%SHARED%%lib/libqt2-mt.so +%%SHARED%%lib/libqt2-mt.so.4 +%%STATIC%%lib/libqt2.a +%%SHARED%%lib/libqt2.so +%%SHARED%%lib/libqt2.so.4 +%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqutil.so +%%SHARED%%lib/libqutil.so.1 share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index 66cd3c4c58bd..6561c7ba1809 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread \ + -system-libmng -thread -no-opengl \ -I${LOCALBASE}/include -L${LOCALBASE}/lib CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) @@ -43,9 +43,11 @@ CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC} .if defined(WANT_STATIC) STATIC=static CONFIGURE_ARGS+=-static +PLIST_SUB+= STATIC="@comment " SHARED="" .else STATIC=shared INSTALLS_SHLIB=yes +PLIST_SUB+= STATIC="" STATIC="@comment " .endif .include <bsd.port.pre.mk> @@ -69,7 +71,7 @@ pre-fetch: pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ - s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} + s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in @@ -81,6 +83,21 @@ pre-configure: post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) +# Add hack to bring in support for GL. The last line is necessary to ensure that +# one can rebuild with the same tree and get the same results. +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.if !defined(WANT_STATIC) + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 + ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 + ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 + ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile +.endif + # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") @@ -93,7 +110,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt2 qt2-mt qtgl ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor @@ -120,14 +137,4 @@ do-install: .endif .endif -.if defined(WANT_STATIC) -.if (${PORTNAME} == "qt") -post-install: - ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ - -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ - ${TMPPLIST}.new > ${TMPPLIST} -.endif -.endif - .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist index d5546993e41f..2b57cd177e28 100644 --- a/x11-toolkits/qt30/pkg-plist +++ b/x11-toolkits/qt30/pkg-plist @@ -284,12 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -lib/libqt2-mt.so -lib/libqt2-mt.so.4 -lib/libqt2.so -lib/libqt2.so.4 -lib/libqutil.so -lib/libqutil.so.1 +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 +%%SHARED%%lib/libqt2-mt.so +%%SHARED%%lib/libqt2-mt.so.4 +%%STATIC%%lib/libqt2.a +%%SHARED%%lib/libqt2.so +%%SHARED%%lib/libqt2.so.4 +%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqutil.so +%%SHARED%%lib/libqutil.so.1 share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index 66cd3c4c58bd..6561c7ba1809 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread \ + -system-libmng -thread -no-opengl \ -I${LOCALBASE}/include -L${LOCALBASE}/lib CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) @@ -43,9 +43,11 @@ CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC} .if defined(WANT_STATIC) STATIC=static CONFIGURE_ARGS+=-static +PLIST_SUB+= STATIC="@comment " SHARED="" .else STATIC=shared INSTALLS_SHLIB=yes +PLIST_SUB+= STATIC="" STATIC="@comment " .endif .include <bsd.port.pre.mk> @@ -69,7 +71,7 @@ pre-fetch: pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ - s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} + s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in @@ -81,6 +83,21 @@ pre-configure: post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) +# Add hack to bring in support for GL. The last line is necessary to ensure that +# one can rebuild with the same tree and get the same results. +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.if !defined(WANT_STATIC) + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 + ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 + ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 + ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile +.endif + # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") @@ -93,7 +110,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt2 qt2-mt qtgl ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor @@ -120,14 +137,4 @@ do-install: .endif .endif -.if defined(WANT_STATIC) -.if (${PORTNAME} == "qt") -post-install: - ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ - -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ - ${TMPPLIST}.new > ${TMPPLIST} -.endif -.endif - .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist index d5546993e41f..2b57cd177e28 100644 --- a/x11-toolkits/qt31/pkg-plist +++ b/x11-toolkits/qt31/pkg-plist @@ -284,12 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -lib/libqt2-mt.so -lib/libqt2-mt.so.4 -lib/libqt2.so -lib/libqt2.so.4 -lib/libqutil.so -lib/libqutil.so.1 +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 +%%SHARED%%lib/libqt2-mt.so +%%SHARED%%lib/libqt2-mt.so.4 +%%STATIC%%lib/libqt2.a +%%SHARED%%lib/libqt2.so +%%SHARED%%lib/libqt2.so.4 +%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqutil.so +%%SHARED%%lib/libqutil.so.1 share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index 66cd3c4c58bd..6561c7ba1809 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread \ + -system-libmng -thread -no-opengl \ -I${LOCALBASE}/include -L${LOCALBASE}/lib CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) @@ -43,9 +43,11 @@ CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC} .if defined(WANT_STATIC) STATIC=static CONFIGURE_ARGS+=-static +PLIST_SUB+= STATIC="@comment " SHARED="" .else STATIC=shared INSTALLS_SHLIB=yes +PLIST_SUB+= STATIC="" STATIC="@comment " .endif .include <bsd.port.pre.mk> @@ -69,7 +71,7 @@ pre-fetch: pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ - s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} + s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in @@ -81,6 +83,21 @@ pre-configure: post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) +# Add hack to bring in support for GL. The last line is necessary to ensure that +# one can rebuild with the same tree and get the same results. +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.if !defined(WANT_STATIC) + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 + ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 + ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 + ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile +.endif + # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") @@ -93,7 +110,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt2 qt2-mt qtgl ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor @@ -120,14 +137,4 @@ do-install: .endif .endif -.if defined(WANT_STATIC) -.if (${PORTNAME} == "qt") -post-install: - ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ - -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ - ${TMPPLIST}.new > ${TMPPLIST} -.endif -.endif - .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist index d5546993e41f..2b57cd177e28 100644 --- a/x11-toolkits/qt32/pkg-plist +++ b/x11-toolkits/qt32/pkg-plist @@ -284,12 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -lib/libqt2-mt.so -lib/libqt2-mt.so.4 -lib/libqt2.so -lib/libqt2.so.4 -lib/libqutil.so -lib/libqutil.so.1 +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 +%%SHARED%%lib/libqt2-mt.so +%%SHARED%%lib/libqt2-mt.so.4 +%%STATIC%%lib/libqt2.a +%%SHARED%%lib/libqt2.so +%%SHARED%%lib/libqt2.so.4 +%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqutil.so +%%SHARED%%lib/libqutil.so.1 share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 66cd3c4c58bd..6561c7ba1809 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread \ + -system-libmng -thread -no-opengl \ -I${LOCALBASE}/include -L${LOCALBASE}/lib CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) @@ -43,9 +43,11 @@ CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC} .if defined(WANT_STATIC) STATIC=static CONFIGURE_ARGS+=-static +PLIST_SUB+= STATIC="@comment " SHARED="" .else STATIC=shared INSTALLS_SHLIB=yes +PLIST_SUB+= STATIC="" STATIC="@comment " .endif .include <bsd.port.pre.mk> @@ -69,7 +71,7 @@ pre-fetch: pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ - s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} + s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in @@ -81,6 +83,21 @@ pre-configure: post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) +# Add hack to bring in support for GL. The last line is necessary to ensure that +# one can rebuild with the same tree and get the same results. +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.if !defined(WANT_STATIC) + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 + ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 + ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 + ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile +.endif + # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") @@ -93,7 +110,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt2 qt2-mt qtgl ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor @@ -120,14 +137,4 @@ do-install: .endif .endif -.if defined(WANT_STATIC) -.if (${PORTNAME} == "qt") -post-install: - ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ - -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ - ${TMPPLIST}.new > ${TMPPLIST} -.endif -.endif - .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist index d5546993e41f..2b57cd177e28 100644 --- a/x11-toolkits/qt33/pkg-plist +++ b/x11-toolkits/qt33/pkg-plist @@ -284,12 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -lib/libqt2-mt.so -lib/libqt2-mt.so.4 -lib/libqt2.so -lib/libqt2.so.4 -lib/libqutil.so -lib/libqutil.so.1 +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 +%%SHARED%%lib/libqt2-mt.so +%%SHARED%%lib/libqt2-mt.so.4 +%%STATIC%%lib/libqt2.a +%%SHARED%%lib/libqt2.so +%%SHARED%%lib/libqt2.so.4 +%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqutil.so +%%SHARED%%lib/libqutil.so.1 share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 08b63213a6bd..170ff7b40d45 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -27,40 +27,18 @@ USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} - CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" +CONFIGURE_ENV= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" +.include <bsd.port.pre.mk> + pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} @@ -74,15 +52,9 @@ pre-fetch: .endif pre-configure: -.for NUM in 1 3 - (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - "s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g") -.endfor - -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool + (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ + "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ + s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") post-install: .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 08b63213a6bd..170ff7b40d45 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -27,40 +27,18 @@ USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} - CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" +CONFIGURE_ENV= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" +.include <bsd.port.pre.mk> + pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} @@ -74,15 +52,9 @@ pre-fetch: .endif pre-configure: -.for NUM in 1 3 - (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - "s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g") -.endfor - -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool + (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ + "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ + s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") post-install: .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 08b63213a6bd..170ff7b40d45 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -27,40 +27,18 @@ USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} - CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" +CONFIGURE_ENV= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" +.include <bsd.port.pre.mk> + pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} @@ -74,15 +52,9 @@ pre-fetch: .endif pre-configure: -.for NUM in 1 3 - (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - "s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g") -.endfor - -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool + (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ + "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ + s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") post-install: .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ |