diff options
| author | jlam <jlam> | 2002-08-01 05:48:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-01 05:48:00 +0000 |
| commit | 0667348e2457442483cc1061eff529caade5d9eb (patch) | |
| tree | ddb090c3c0b454f9c8402f5b1724832e17cddad6 /misc | |
| parent | 67259e22f565d221aaa481aa2ada437d89be3c4a (diff) | |
| download | pkgsrc-0667348e2457442483cc1061eff529caade5d9eb.tar.gz | |
Adjust to new pthread.buildlink.mk: remove USE_PTHREAD and replace with
appropriate PTHREAD_OPTS incantation, and move the checks for the value
of PTHREAD_TYPE below the inclusion of pthread.buildlink.mk.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/koffice3/Makefile | 5 | ||||
| -rw-r--r-- | misc/openoffice/Makefile | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile index 3831367f1f6..7aba5087b65 100644 --- a/misc/koffice3/Makefile +++ b/misc/koffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/07/25 19:38:54 jschauma Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:17 jlam Exp $ DISTNAME= koffice PKGNAME= koffice3-${VERSION} @@ -10,7 +10,7 @@ DISTFILES= ${DISTNAME}-${VERSION}-kde3.tar.bz2 .include "../../x11/kde3/Makefile.kde3" MAINTAINER= jschauma@netbsd.org -USE_PTHREAD= native pth-syscall +PTHREAD_OPTS+= require WRKSRC= ${WRKDIR}/${DISTNAME}-${VERSION} PATCHDIR= ../../misc/koffice/patches @@ -18,4 +18,5 @@ DESCR_SRC= ../../misc/koffice/DESCR .include "../../x11/kde3/buildlink.mk" .include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../misc/koffice/Makefile.common" diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 41bd9e7ac0d..98099bb39a3 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/07/31 21:14:04 mrauch Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/01 05:48:17 jlam Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -16,8 +16,7 @@ MAINTAINER= mrauch@netbsd.org HOMEPAGE= http://www.openoffice.org/ COMMENT= Integrated office productivity suite -USE_PTHREAD= native pth -BUILDLINK_DEPENDS.pth= pth>=1.4.0nb1 +PTHREAD_OPTS+= require # OpenOffice requires gcc 2.95.2 or better, # so for NetBSD<=1.5 we need the package lang/gcc. @@ -34,10 +33,6 @@ BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport USE_JAVA= build PKG_JVM= sun-jdk -.include "../../lang/perl5/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" -.include "../../mk/x11.buildlink.mk" - CONFLICTS= staroffice-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.5.3*-i386 NetBSD-1.5Z?-i386 \ @@ -96,4 +91,7 @@ do-install: <${FILESDIR}/soffice >${PREFIX}/bin/soffice ${CHMOD} +x ${PREFIX}/bin/soffice +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |