aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--converters/kdesupport2/Makefile31
-rw-r--r--x11/kde4-baseapps/Makefile38
-rw-r--r--x11/kde4-runtime/Makefile38
-rw-r--r--x11/kde4-workspace/Makefile38
-rw-r--r--x11/kdebase2/Makefile38
-rw-r--r--x11/kdebase3/Makefile38
-rw-r--r--x11/kdebase4-runtime/Makefile38
-rw-r--r--x11/kdebase4-workspace/Makefile38
-rw-r--r--x11/kdebase4/Makefile38
-rw-r--r--x11/kdelibs2/Makefile38
-rw-r--r--x11/kdelibs3/Makefile38
-rw-r--r--x11/kdelibs4/Makefile38
12 files changed, 398 insertions, 51 deletions
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 78094ac43756..2cbfda0eb7e6 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -22,13 +22,36 @@ 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
+
CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib \
--with-extra-libs=${LOCALBASE}/lib \
--without-audiofile
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
+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
pre-configure:
@@ -36,4 +59,4 @@ pre-configure:
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.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 16190dd22f0b..8ce6abfc9403 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -25,6 +25,30 @@ 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}
+
CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
@@ -32,9 +56,10 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
--with-extra-libs=${LOCALBASE}/lib \
--without-ldap \
--disable-closure
-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"
+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}"
USE_GMAKE= yes
pre-configure:
@@ -43,4 +68,9 @@ 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
-.include <bsd.port.mk>
+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>
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 5ba118d06462..08b63213a6bd 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -26,18 +26,41 @@ USE_BZIP2= yes
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" \
- MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+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}"
USE_GMAKE= yes
MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
PLIST_SUB+= LIBVER="${SOMAJOR}"
-.include <bsd.port.pre.mk>
-
pre-fetch:
.if ${OSVERSION} <= 410002
@${ECHO}
@@ -56,6 +79,11 @@ pre-configure:
"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
+
post-install:
.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
kparts kspell ksycoca kjava
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5ba118d06462..08b63213a6bd 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -26,18 +26,41 @@ USE_BZIP2= yes
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" \
- MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+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}"
USE_GMAKE= yes
MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
PLIST_SUB+= LIBVER="${SOMAJOR}"
-.include <bsd.port.pre.mk>
-
pre-fetch:
.if ${OSVERSION} <= 410002
@${ECHO}
@@ -56,6 +79,11 @@ pre-configure:
"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
+
post-install:
.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
kparts kspell ksycoca kjava
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 5ba118d06462..08b63213a6bd 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -26,18 +26,41 @@ USE_BZIP2= yes
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" \
- MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+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}"
USE_GMAKE= yes
MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
PLIST_SUB+= LIBVER="${SOMAJOR}"
-.include <bsd.port.pre.mk>
-
pre-fetch:
.if ${OSVERSION} <= 410002
@${ECHO}
@@ -56,6 +79,11 @@ pre-configure:
"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
+
post-install:
.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
kparts kspell ksycoca kjava
generated by cgit (git 2.34.1) at 2024-12-29 06:06:57 +0800