summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd>2003-04-09 13:57:14 +0000
committermarkd <markd>2003-04-09 13:57:14 +0000
commit1acebbc241f9dba7a0f8cabe3fb510d854097ddc (patch)
tree0baaabfeaa97e880e41d27d8f48f1bfda4a7185e
parent52ba879e3ca9c2d221b38c6e7e58dc2618b475d2 (diff)
downloadpkgsrc-1acebbc241f9dba7a0f8cabe3fb510d854097ddc.tar.gz
Apply koffice bug fix from koffice.org.
From Marc Recht in PR 20871 cleaned up slightly by me to keep pkglint happy. Bump PKGREVISION.
-rw-r--r--misc/koffice/Makefile9
-rw-r--r--misc/koffice/distinfo4
2 files changed, 10 insertions, 3 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index d67e90de564..5d21dfa0ad6 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,18 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2003/01/10 11:15:55 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/09 13:57:14 markd Exp $
DISTNAME= koffice-1.2.1
+PKGREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.2.1/src/
EXTRACT_SUFX= .tar.bz2
-CONFLICTS+= koffice3-[0-9]*
+PATCH_SITES= http://www.koffice.org/bugfixes/
+PATCHFILES= 1.2.1_kword_crashes.diff
+PATCH_DIST_ARGS?= -d ${WRKSRC}/kword -p0
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.koffice.org/
COMMENT= KDE Office Suite
+CONFLICTS+= koffice3-[0-9]*
+
USE_BUILDLINK2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 72d17e8aabd..ab62ef9a64d 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/01/10 11:15:55 drochner Exp $
+$NetBSD: distinfo,v 1.9 2003/04/09 13:57:14 markd Exp $
SHA1 (koffice-1.2.1.tar.bz2) = f3fd98d081205f2cd7be3fba76e4cf5b053b8e53
Size (koffice-1.2.1.tar.bz2) = 9275595 bytes
+SHA1 (1.2.1_kword_crashes.diff) = 13b6a4843ec918371e6de1622be1154d984aa76b
+Size (1.2.1_kword_crashes.diff) = 3816 bytes