diff options
| author | will <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
| commit | 8f83b0f304ffe579fd4a068d613cf47bb015e5a8 (patch) | |
| tree | 14d060b659c29b8e11092216ba0d95308a108c5c /editors | |
| parent | 2205ebb5c60a6843e652faa33a5623131e615aff (diff) | |
| download | FreeBSD-ports-8f83b0f304ffe579fd4a068d613cf47bb015e5a8.zip FreeBSD-ports-8f83b0f304ffe579fd4a068d613cf47bb015e5a8.tar.gz | |
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>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/calligra/Makefile | 6 | ||||
| -rw-r--r-- | editors/calligra/distinfo | 4 | ||||
| -rw-r--r-- | editors/koffice-kde3/Makefile | 6 | ||||
| -rw-r--r-- | editors/koffice-kde3/distinfo | 4 | ||||
| -rw-r--r-- | editors/koffice-kde4/Makefile | 6 | ||||
| -rw-r--r-- | editors/koffice-kde4/distinfo | 4 |
6 files changed, 12 insertions, 18 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 70f5def..1e32e14 100644 --- 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> diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 9766b54..f59557e 100644 --- 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 diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 70f5def..1e32e14 100644 --- 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> diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 9766b54..f59557e 100644 --- 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 diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 70f5def..1e32e14 100644 --- 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> diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 9766b54..f59557e 100644 --- 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 |
