diff options
| author | jlam <jlam> | 2002-10-08 14:32:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-08 14:32:57 +0000 |
| commit | 4441f7315ccb403fe8531a14d90a86000a6dccf6 (patch) | |
| tree | 93e3ae6802f0cf7fc8ca66c151a4913b4bd8bfb5 | |
| parent | c1eaf5c8b21cb14c6b0d5a590ea335d5cdcd1d20 (diff) | |
| download | pkgsrc-4441f7315ccb403fe8531a14d90a86000a6dccf6.tar.gz | |
* You can't mix buildlink1 and buildlink2, so remove USE_BUILDLINK_ONLY.
* x11.buildlink2.mk is not meant to be included by package Makefiles.
* Note conflict with older koffice3 package.
| -rw-r--r-- | misc/koffice/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index a47b39e17d9..bc395ed4f8a 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/10/08 14:15:53 martti Exp $ +# $NetBSD: Makefile,v 1.15 2002/10/08 14:32:57 jlam Exp $ DISTNAME= koffice-1.2 CATEGORIES= misc kde @@ -7,12 +7,13 @@ MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.2/src/ \ ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.2/src/ EXTRACT_SUFX= .tar.bz2 +CONFLICTS+= koffice3-[0-9]* + MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.koffice.org/ COMMENT= KDE Office Suite USE_BUILDLINK2= YES -USE_BUILDLINK_ONLY= YES USE_GMAKE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES @@ -38,5 +39,5 @@ post-install: .include "../../x11/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" -.include "../../mk/x11.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |