Fix the -pthread problem in case the option gets removed again. This

patch involved patching the core auto* routines in KDE to accept the PTHREAD_* variables in the environment, with fallbacks. We decided the easiest way to implement this in ports was to generate configure instead of risking incorrect generation at port configure time. Said patch has already been committed to HEAD in KDE and as such will be removed with the 3.2 upgrade once it is released. Ports using Makefile.kde that shouldn't be using them (i.e. non-KDE modules) have this support commented out due to lack of patch. Helped out: Adriaan de Groot <adridg@cs.kun.nl> Lauri Watts <lauri@kde.org> Andy Fawcett <andy@athame.co.uk>
svn path=/head/; revision=90174
2025-02-04 11:23:46 +00:00 · 2003-10-03 22:34:44 +00:00 · 2003-10-03 22:34:44 +00:00 · d075bf0f86 · 2021-03-31 03:12:20 +00:00
commit d075bf0f86
parent 12070fd542
94 changed files with 148 additions and 427 deletions
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@ -34,7 +34,4 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@ -1 +1,3 @@
 MD5 (KDE/arts-1.1.4.tar.bz2) = aa4bef1e80cd3795e3fd832471e348e9
+MD5 (KDE/arts-2003092201-configure.tar.bz2) = 1c4c287f36fe2db5471453c46ce2e128
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/audio/arts/files/patch-configure
+++ b/audio/arts/files/patch-configure
@ -1,47 +0,0 @@
--- configure.orig	Wed Aug 20 13:08:00 2003
-+++ configure	Wed Aug 20 13:07:43 2003
-@@ -2906,7 +2906,7 @@
-   fi
- else
-   if test "$GCC" = yes; then
-    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -3454,7 +3454,7 @@
-         CFLAGS="-g -O2 $CFLAGS"
-       fi
-     else
-      CFLAGS="-O2 $CFLAGS"
-+      CFLAGS="$CFLAGS"
-     fi
-   fi
- 
-@@ -3694,7 +3694,7 @@
-   fi
- else
-   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-+    CXXFLAGS=""
-   else
-     CXXFLAGS=
-   fi
-@@ -4051,7 +4051,7 @@
-       if test "$CXX" = "KCC"; then
-         CXXFLAGS="+K3 $CXXFLAGS"
-       else
-        CXXFLAGS="-O2 $CXXFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
-       fi
-     fi
-   fi
-@@ -26467,7 +26467,7 @@
- 
- 
- 
-for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday
-+for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday vasprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@ -32,7 +32,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdepim-3.1.4.tar.bz2) = 2a3e97a2cd5de688294cb39001282048
+MD5 (KDE/kdepim-2003092201-configure.tar.bz2) = 5cc63741b6f0ff30deb5d07b4f241353
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@ -32,7 +32,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdepim-3.1.4.tar.bz2) = 2a3e97a2cd5de688294cb39001282048
+MD5 (KDE/kdepim-2003092201-configure.tar.bz2) = 5cc63741b6f0ff30deb5d07b4f241353
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@ -32,7 +32,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdepim-3.1.4.tar.bz2) = 2a3e97a2cd5de688294cb39001282048
+MD5 (KDE/kdepim-2003092201-configure.tar.bz2) = 5cc63741b6f0ff30deb5d07b4f241353
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@ -32,9 +32,6 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3

 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include "${FILESDIR}/manpages.mk"

 .include <bsd.port.post.mk>
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdesdk-3.1.4.tar.bz2) = ed343cedeab6c6dc814fa8b4e164e4ec
+MD5 (KDE/kdesdk-2003092201-configure.tar.bz2) = 6d4ef0676b86b63c75d009f44e6c3b81
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@ -32,9 +32,6 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3

 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include "${FILESDIR}/manpages.mk"

 .include <bsd.port.post.mk>
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdesdk-3.1.4.tar.bz2) = ed343cedeab6c6dc814fa8b4e164e4ec
+MD5 (KDE/kdesdk-2003092201-configure.tar.bz2) = 6d4ef0676b86b63c75d009f44e6c3b81
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdevelop-2.1.5_for_KDE_3.1.tar.bz2) = 8953caa03c22aabe6707ca494a0d4a41
+MD5 (KDE/kdevelop-2003092201-configure.tar.bz2) = f5f5d12b346804bb72541c6a61b96fb9
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice

-PATCH_SITES=	http://www.koffice.org/bugfixes/
+PATCH_SITES=	http://www.fruitsalad.org/patches/
 PATCHFILES=	1.2.1_kword_crashes.diff

 MAINTAINER=	kde@FreeBSD.org
@ -31,7 +31,6 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
-PATCH_WRKSRC=		${WRKSRC}/kword
 USE_REINPLACE=		yes

 INSTALLS_SHLIB=		yes
@ -41,7 +40,4 @@ LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3

 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@ -1,2 +1,4 @@
 MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e
-MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = 2d6f967f5302ed8c0136a10005fff0e4
+MD5 (KDE/koffice/koffice-2003092201-configure.tar.bz2) = 7fb220020f4515ea218a04d58693ca42
+MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = bd89862f0c15396ad54e30a1c9f2f5d9
+MD5 (KDE/koffice/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice

-PATCH_SITES=	http://www.koffice.org/bugfixes/
+PATCH_SITES=	http://www.fruitsalad.org/patches/
 PATCHFILES=	1.2.1_kword_crashes.diff

 MAINTAINER=	kde@FreeBSD.org
@ -31,7 +31,6 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
-PATCH_WRKSRC=		${WRKSRC}/kword
 USE_REINPLACE=		yes

 INSTALLS_SHLIB=		yes
@ -41,7 +40,4 @@ LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3

 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@ -1,2 +1,4 @@
 MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e
-MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = 2d6f967f5302ed8c0136a10005fff0e4
+MD5 (KDE/koffice/koffice-2003092201-configure.tar.bz2) = 7fb220020f4515ea218a04d58693ca42
+MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = bd89862f0c15396ad54e30a1c9f2f5d9
+MD5 (KDE/koffice/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice

-PATCH_SITES=	http://www.koffice.org/bugfixes/
+PATCH_SITES=	http://www.fruitsalad.org/patches/
 PATCHFILES=	1.2.1_kword_crashes.diff

 MAINTAINER=	kde@FreeBSD.org
@ -31,7 +31,6 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
-PATCH_WRKSRC=		${WRKSRC}/kword
 USE_REINPLACE=		yes

 INSTALLS_SHLIB=		yes
@ -41,7 +40,4 @@ LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3

 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@ -1,2 +1,4 @@
 MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e
-MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = 2d6f967f5302ed8c0136a10005fff0e4
+MD5 (KDE/koffice/koffice-2003092201-configure.tar.bz2) = 7fb220020f4515ea218a04d58693ca42
+MD5 (KDE/koffice/1.2.1_kword_crashes.diff) = bd89862f0c15396ad54e30a1c9f2f5d9
+MD5 (KDE/koffice/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@ -30,7 +30,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @-pedantic -fpermissive @g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdegames-3.1.4.tar.bz2) = be604fb91e24f990659f5cab2ac8decf
+MD5 (KDE/kdegames-2003092201-configure.tar.bz2) = fda0388e3915a17bf3cd95e628227e69
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@ -30,7 +30,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @-pedantic -fpermissive @g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdegames-3.1.4.tar.bz2) = be604fb91e24f990659f5cab2ac8decf
+MD5 (KDE/kdegames-2003092201-configure.tar.bz2) = fda0388e3915a17bf3cd95e628227e69
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@ -93,7 +93,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif # defined(WITH_SANE)

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdegraphics-3.1.4.tar.bz2) = c695c8574efca207c445dcef0bb4ae43
+MD5 (KDE/kdegraphics-2003092201-configure.tar.bz2) = d613df699cacde88ae363eeb42a1d691
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@ -93,7 +93,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif # defined(WITH_SANE)

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdegraphics-3.1.4.tar.bz2) = c695c8574efca207c445dcef0bb4ae43
+MD5 (KDE/kdegraphics-2003092201-configure.tar.bz2) = d613df699cacde88ae363eeb42a1d691
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeaddons-3.1.4.tar.bz2) = 1e9e3159994583a38e2451380bccdae2
+MD5 (KDE/kdeaddons-2003092201-configure.tar.bz2) = 8b093a2738dd3c97fa779b81210b1aaa
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@ -40,9 +40,6 @@ CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" \
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if defined(WITH_MIDI) || defined(WITH_KMIDI)
 PLIST_APPEND+=	plist.midi
 .if ${MACHINE_ARCH} == "alpha"
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdemultimedia-3.1.4.tar.bz2) = f9f2b0b79a6a9ced3ae601b57da53129
+MD5 (KDE/kdemultimedia-2003092201-configure.tar.bz2) = 2895c980fe38846439a6628a1ea786b0
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/multimedia/kdemultimedia3/files/patch-configure
+++ b/multimedia/kdemultimedia3/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	Fri May  2 15:23:56 2003
-+++ configure	Fri May  2 15:24:28 2003
-@@ -26016,7 +26016,7 @@ fi
- 
- echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
- echo "${ECHO_T}$ac_cv_x86_sse" >&6
-if eval "test \"`echo `$ac_cv_x86_sse\" = yes"; then
-+if test $ac_cv_x86_sse = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_X86_SSE 1
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@ -40,9 +40,6 @@ CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" \
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if defined(WITH_MIDI) || defined(WITH_KMIDI)
 PLIST_APPEND+=	plist.midi
 .if ${MACHINE_ARCH} == "alpha"
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdemultimedia-3.1.4.tar.bz2) = f9f2b0b79a6a9ced3ae601b57da53129
+MD5 (KDE/kdemultimedia-2003092201-configure.tar.bz2) = 2895c980fe38846439a6628a1ea786b0
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/multimedia/kdemultimedia4/files/patch-configure
+++ b/multimedia/kdemultimedia4/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	Fri May  2 15:23:56 2003
-+++ configure	Fri May  2 15:24:28 2003
-@@ -26016,7 +26016,7 @@ fi
- 
- echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
- echo "${ECHO_T}$ac_cv_x86_sse" >&6
-if eval "test \"`echo `$ac_cv_x86_sse\" = yes"; then
-+if test $ac_cv_x86_sse = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_X86_SSE 1
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@ -19,6 +19,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@ -20,6 +20,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 pre-patch:
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@ -20,6 +20,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 pre-patch:
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@ -33,16 +33,13 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if !defined(WITHOUT_KTALKD)
 UTMP?=	/var/run/utmp
 .if exists(${UTMP})
 PLIST_APPEND+=	plist.ktalkd
 .else
 DO_NOT_COMPILE+=	ktalkd
-pre-configure::
+pre-everything::
 	@${ECHO_MSG} "===> \"${UTMP}\" was not found."
 	@${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built."
 .endif # exists(${UTMP})
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdenetwork-3.1.4.tar.bz2) = 83d69ab3be7b4b10b898b250eb2d9046
+MD5 (KDE/kdenetwork-2003092201-configure.tar.bz2) = d5493de3232d664fd77797242891ecc1
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@ -33,16 +33,13 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if !defined(WITHOUT_KTALKD)
 UTMP?=	/var/run/utmp
 .if exists(${UTMP})
 PLIST_APPEND+=	plist.ktalkd
 .else
 DO_NOT_COMPILE+=	ktalkd
-pre-configure::
+pre-everything::
 	@${ECHO_MSG} "===> \"${UTMP}\" was not found."
 	@${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built."
 .endif # exists(${UTMP})
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdenetwork-3.1.4.tar.bz2) = 83d69ab3be7b4b10b898b250eb2d9046
+MD5 (KDE/kdenetwork-2003092201-configure.tar.bz2) = d5493de3232d664fd77797242891ecc1
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/net/kmerlin/Makefile
+++ b/net/kmerlin/Makefile
@ -19,6 +19,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
--- a/net/kmess/Makefile
+++ b/net/kmess/Makefile
@ -20,6 +20,7 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 pre-patch:
--- a/net/kopete/Makefile
+++ b/net/kopete/Makefile
@ -22,10 +22,11 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

 CONFIGURE_ENV=	LDFLAGS="-lcrypto"
+_NO_KDE_FIXPTHREAD=	yes

 pre-configure:
 	${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure
-
+ 
 post-install:
 	${RM} ${PREFIX}/share/locale/xx/LC_MESSAGES/kopete.mo
 	-${RMDIR} ${PREFIX}/share/locale/xx/LC_MESSAGES/
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@ -18,6 +18,7 @@ RUN_DEPENDS=		gpg:${PORTSDIR}/security/gnupg
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_KDELIBS_VER=	3
+_NO_KDE_FIXPTHREAD=	yes

 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@ -59,7 +59,4 @@ post-patch:

 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
+MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@ -31,7 +31,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdetoys-3.1.4.tar.bz2) = 58c9a31f31564513414fbaf09fc13b29
+MD5 (KDE/kdetoys-2003092201-configure.tar.bz2) = 00119e2ed2f73f9ec4ad288172ec5031
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@ -31,7 +31,4 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdetoys-3.1.4.tar.bz2) = 58c9a31f31564513414fbaf09fc13b29
+MD5 (KDE/kdetoys-2003092201-configure.tar.bz2) = 00119e2ed2f73f9ec4ad288172ec5031
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@ -32,9 +32,6 @@ KDE_BUILD_PLIST=yes
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if exists(${X11BASE}/bin/xscreensaver)
 WITH_XS=	yes
 .endif # exists(${X11BASE}/bin/xscreensaver)
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeartwork-3.1.4.tar.bz2) = 042e42ade90a8d137edea88eb7d3e11d
+MD5 (KDE/kdeartwork-2003092201-configure.tar.bz2) = 1b9503ae03b62ba380ff3c5e07b19d2a
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-themes/kdeartwork3/files/patch-configure
+++ b/x11-themes/kdeartwork3/files/patch-configure
@ -1,57 +0,0 @@
--- configure.orig	Sun May 11 14:21:07 2003
-+++ configure	Sun May 11 14:22:34 2003
-@@ -24849,12 +24849,12 @@
- IFS=$old_IFS
- 
- 
-   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
-+echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
-    if test -n "$XSCREENSAVER"; then
-         kde_cv_path="$XSCREENSAVER";
-    else
-        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+        kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
- 
-         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24870,16 +24870,16 @@
- 	IFS=$kde_save_IFS
- 
-         for dir in $dirs; do
-	  if test -x "$dir/lib/xscreensaver/flame"; then
-+	  if test -x "$dir/bin/xscreensaver-hacks/flame"; then
- 	    if test -n ""
- 	    then
-              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
-+              evalstr="$dir/bin/xscreensaver-hacks/flame  2>&1 "
- 	      if eval $evalstr; then
-                kde_cv_path="$dir/lib/xscreensaver/flame"
-+                kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	      fi
-             else
-		kde_cv_path="$dir/lib/xscreensaver/flame"
-+		kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	    fi
-           fi
-@@ -24923,7 +24923,7 @@
- XSCREENSAVER_CONFIG=NO
- for i in  $xscreensaver_prefixes ;
- do
-  for j in lib/xscreensaver/config/flame.xml;
-+  for j in share/xscreensaver/config/flame.xml;
-   do
-     echo "configure: 24928: $i/$j" >&5
-     if test -r "$i/$j"; then
-@@ -24954,7 +24954,7 @@
- 	     XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
-         fi
-      else
-	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-+	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
-      fi
-      echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
- echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@ -32,9 +32,6 @@ KDE_BUILD_PLIST=yes
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if exists(${X11BASE}/bin/xscreensaver)
 WITH_XS=	yes
 .endif # exists(${X11BASE}/bin/xscreensaver)
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeartwork-3.1.4.tar.bz2) = 042e42ade90a8d137edea88eb7d3e11d
+MD5 (KDE/kdeartwork-2003092201-configure.tar.bz2) = 1b9503ae03b62ba380ff3c5e07b19d2a
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-themes/kdeartwork4/files/patch-configure
+++ b/x11-themes/kdeartwork4/files/patch-configure
@ -1,57 +0,0 @@
--- configure.orig	Sun May 11 14:21:07 2003
-+++ configure	Sun May 11 14:22:34 2003
-@@ -24849,12 +24849,12 @@
- IFS=$old_IFS
- 
- 
-   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
-+echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
-    if test -n "$XSCREENSAVER"; then
-         kde_cv_path="$XSCREENSAVER";
-    else
-        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+        kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
- 
-         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24870,16 +24870,16 @@
- 	IFS=$kde_save_IFS
- 
-         for dir in $dirs; do
-	  if test -x "$dir/lib/xscreensaver/flame"; then
-+	  if test -x "$dir/bin/xscreensaver-hacks/flame"; then
- 	    if test -n ""
- 	    then
-              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
-+              evalstr="$dir/bin/xscreensaver-hacks/flame  2>&1 "
- 	      if eval $evalstr; then
-                kde_cv_path="$dir/lib/xscreensaver/flame"
-+                kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	      fi
-             else
-		kde_cv_path="$dir/lib/xscreensaver/flame"
-+		kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	    fi
-           fi
-@@ -24923,7 +24923,7 @@
- XSCREENSAVER_CONFIG=NO
- for i in  $xscreensaver_prefixes ;
- do
-  for j in lib/xscreensaver/config/flame.xml;
-+  for j in share/xscreensaver/config/flame.xml;
-   do
-     echo "configure: 24928: $i/$j" >&5
-     if test -r "$i/$j"; then
-@@ -24954,7 +24954,7 @@
- 	     XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
-         fi
-      else
-	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-+	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
-      fi
-      echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
- echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
--- a/x11-wm/kdeartwork3/Makefile
+++ b/x11-wm/kdeartwork3/Makefile
@ -32,9 +32,6 @@ KDE_BUILD_PLIST=yes
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>

-pre-configure::
-	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
 .if exists(${X11BASE}/bin/xscreensaver)
 WITH_XS=	yes
 .endif # exists(${X11BASE}/bin/xscreensaver)
--- a/x11-wm/kdeartwork3/distinfo
+++ b/x11-wm/kdeartwork3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdeartwork-3.1.4.tar.bz2) = 042e42ade90a8d137edea88eb7d3e11d
+MD5 (KDE/kdeartwork-2003092201-configure.tar.bz2) = 1b9503ae03b62ba380ff3c5e07b19d2a
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11-wm/kdeartwork3/files/patch-configure
+++ b/x11-wm/kdeartwork3/files/patch-configure
@ -1,57 +0,0 @@
--- configure.orig	Sun May 11 14:21:07 2003
-+++ configure	Sun May 11 14:22:34 2003
-@@ -24849,12 +24849,12 @@
- IFS=$old_IFS
- 
- 
-   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
-+echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
-    if test -n "$XSCREENSAVER"; then
-         kde_cv_path="$XSCREENSAVER";
-    else
-        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+        kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
- 
-         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24870,16 +24870,16 @@
- 	IFS=$kde_save_IFS
- 
-         for dir in $dirs; do
-	  if test -x "$dir/lib/xscreensaver/flame"; then
-+	  if test -x "$dir/bin/xscreensaver-hacks/flame"; then
- 	    if test -n ""
- 	    then
-              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
-+              evalstr="$dir/bin/xscreensaver-hacks/flame  2>&1 "
- 	      if eval $evalstr; then
-                kde_cv_path="$dir/lib/xscreensaver/flame"
-+                kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	      fi
-             else
-		kde_cv_path="$dir/lib/xscreensaver/flame"
-+		kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
-                 break
- 	    fi
-           fi
-@@ -24923,7 +24923,7 @@
- XSCREENSAVER_CONFIG=NO
- for i in  $xscreensaver_prefixes ;
- do
-  for j in lib/xscreensaver/config/flame.xml;
-+  for j in share/xscreensaver/config/flame.xml;
-   do
-     echo "configure: 24928: $i/$j" >&5
-     if test -r "$i/$j"; then
-@@ -24954,7 +24954,7 @@
- 	     XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
-         fi
-      else
-	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-+	XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
-      fi
-      echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
- echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@ -37,6 +37,8 @@ post-extract:
 # Unfortunately, this feature doesn't work right now due to binary files.
 _NO_KDE_PATCHUP=yes

+CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 # Start options here.
 .if !defined(_NO_KDE_PATCHUP)
 .if !defined(KDE_PATCHFROM_VER)
@ -90,6 +92,26 @@ CONFIGURE_ARGS+=	--with-xinerama
 .endif
 .endif # !defined(_NO_KDE_XINERAMA)

+.if defined(KDE_I18N)
+_NO_KDE_FIXPTHREAD=	yes
+.endif
+
+.if !defined(_NO_KDE_FIXPTHREAD)
+PTHFIX_DATE?=	2003092201
+MASTER_SITES+=	http://www.fruitsalad.org/patches/:kde \
+		${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${PTHFIX_DATE}-configure.tar.bz2:kde
+PATCH_SITES+=	http://www.fruitsalad.org/patches/:kde \
+		${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g}
+PATCHFILES+=	patch-ltmain.sh:kde
+USE_REINPLACE=	yes
+
+pre-configure: fix-pedantic
+fix-pedantic:
+	@${REINPLACE_CMD} "s,-pedantic,,g" ${WRKSRC}/configure
+.endif
+
 kde-version-check:
 .if exists(${LOCALBASE}/include/kfm.h)
 	@${ECHO}
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@ -37,6 +37,8 @@ post-extract:
 # Unfortunately, this feature doesn't work right now due to binary files.
 _NO_KDE_PATCHUP=yes

+CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 # Start options here.
 .if !defined(_NO_KDE_PATCHUP)
 .if !defined(KDE_PATCHFROM_VER)
@ -90,6 +92,26 @@ CONFIGURE_ARGS+=	--with-xinerama
 .endif
 .endif # !defined(_NO_KDE_XINERAMA)

+.if defined(KDE_I18N)
+_NO_KDE_FIXPTHREAD=	yes
+.endif
+
+.if !defined(_NO_KDE_FIXPTHREAD)
+PTHFIX_DATE?=	2003092201
+MASTER_SITES+=	http://www.fruitsalad.org/patches/:kde \
+		${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${PTHFIX_DATE}-configure.tar.bz2:kde
+PATCH_SITES+=	http://www.fruitsalad.org/patches/:kde \
+		${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g}
+PATCHFILES+=	patch-ltmain.sh:kde
+USE_REINPLACE=	yes
+
+pre-configure: fix-pedantic
+fix-pedantic:
+	@${REINPLACE_CMD} "s,-pedantic,,g" ${WRKSRC}/configure
+.endif
+
 kde-version-check:
 .if exists(${LOCALBASE}/include/kfm.h)
 	@${ECHO}
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
+MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdelibs-3.1.4.tar.bz2) = 82c265de78d53c7060a09c5cb1a78942
+MD5 (KDE/kdelibs-2003092201-configure.tar.bz2) = 24127f6cb3ce49450e7f0292918ab8ad
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdelibs3/files/patch-configure
+++ b/x11/kdelibs3/files/patch-configure
@ -1,38 +0,0 @@
--- configure.orig	Thu Jan 30 15:08:09 2003
-+++ configure	Thu Jan 30 15:08:30 2003
-@@ -2813,7 +2813,7 @@
-   fi
- else
-   if test "$GCC" = yes; then
-    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -3220,7 +3220,7 @@
-         CFLAGS="-g -O2 $CFLAGS"
-       fi
-     else
-      CFLAGS="-O2 $CFLAGS"
-+      CFLAGS="$CFLAGS"
-     fi
-   fi
- 
-@@ -3462,7 +3462,7 @@
-   fi
- else
-   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-+    CXXFLAGS=""
-   else
-     CXXFLAGS=
-   fi
-@@ -3811,7 +3811,7 @@
-       if test "$CXX" = "KCC"; then
-         CXXFLAGS="+K3 $CXXFLAGS"
-       else
-        CXXFLAGS="-O2 $CXXFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
-       fi
-     fi
-   fi
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@ -1 +1,3 @@
 MD5 (KDE/kdelibs-3.1.4.tar.bz2) = 82c265de78d53c7060a09c5cb1a78942
+MD5 (KDE/kdelibs-2003092201-configure.tar.bz2) = 24127f6cb3ce49450e7f0292918ab8ad
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
--- a/x11/kdelibs4/files/patch-configure
+++ b/x11/kdelibs4/files/patch-configure
@ -1,38 +0,0 @@
--- configure.orig	Thu Jan 30 15:08:09 2003
-+++ configure	Thu Jan 30 15:08:30 2003
-@@ -2813,7 +2813,7 @@
-   fi
- else
-   if test "$GCC" = yes; then
-    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -3220,7 +3220,7 @@
-         CFLAGS="-g -O2 $CFLAGS"
-       fi
-     else
-      CFLAGS="-O2 $CFLAGS"
-+      CFLAGS="$CFLAGS"
-     fi
-   fi
- 
-@@ -3462,7 +3462,7 @@
-   fi
- else
-   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-+    CXXFLAGS=""
-   else
-     CXXFLAGS=
-   fi
-@@ -3811,7 +3811,7 @@
-       if test "$CXX" = "KCC"; then
-         CXXFLAGS="+K3 $CXXFLAGS"
-       else
-        CXXFLAGS="-O2 $CXXFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
-       fi
-     fi
-   fi