summaryrefslogtreecommitdiff
path: root/editors/calligra
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2003-10-03 22:34:44 +0000
committerWill Andrews <will@FreeBSD.org>2003-10-03 22:34:44 +0000
commitd075bf0f8668353d166ce921b27af99b645d652c (patch)
tree345dd3d2608a097c43d147cb2254e11aebc56937 /editors/calligra
parentAdd cxmon 3.0, interactive file manipulation tool and disassembler. (diff)
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>
Notes
Notes: svn path=/head/; revision=90174
Diffstat (limited to 'editors/calligra')
-rw-r--r--editors/calligra/Makefile6
-rw-r--r--editors/calligra/distinfo4
2 files changed, 4 insertions, 6 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 70f5defbd79d..1e32e14e0098 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 9766b543b213..f59557e8ed16 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