diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-05-25 11:11:14 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-05-25 11:11:14 +0000 |
| commit | b7019955b164e14bc4584cd150ac1e250dfb117d (patch) | |
| tree | f5e5a392426f5933bd26016e61aa10e3fe2fc64f /misc | |
| parent | 70fe0ec1ca3743846b2c4c10bc534809cd0d3ef7 (diff) | |
| download | pkgsrc-b7019955b164e14bc4584cd150ac1e250dfb117d.tar.gz | |
Bump PKGREVISION.
* Depend on xulrunner17 instead of xulrunner.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice3/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice3/options.mk | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 30a17f53b45..bbe39b9c612 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.86 2013/05/09 07:40:14 adam Exp $ +# $NetBSD: Makefile,v 1.87 2013/05/25 11:11:14 ryoon Exp $ OO_VER= 3.1.1 OO_TAG= OOO310_m19 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} -PKGREVISION= 42 +PKGREVISION= 43 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DIST_SUBDIR= ${DISTNAME} diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index a49619363ab..5fe319e4413 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.23 2012/03/22 21:36:08 ryoon Exp $ +# $NetBSD: options.mk,v 1.24 2013/05/25 11:11:14 ryoon Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 @@ -43,7 +43,8 @@ OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1} .if !empty(PKG_OPTIONS:Mxulrunner) CONFIGURE_ARGS+= --with-system-mozilla=mozilla .include "../../devel/nss/buildlink3.mk" -.include "../../devel/xulrunner/buildlink3.mk" +BUILDLINK_API_DEPENDS.xulrunner17+= xulrunner17>=17.0.6nb1 +.include "../../devel/xulrunner17/buildlink3.mk" # # OOo ships headers that are too old and conflict with xulrunner headers. # Instead of patching everything to include external headers, we just @@ -53,7 +54,7 @@ CONFIGURE_ARGS+= --with-system-mozilla=mozilla post-wrapper: copy-mozilla-headers copy-mozilla-headers: cp \ - ${BUILDLINK_DIR}/include/xulrunner/npapi.h \ + ${BUILDLINK_DIR}/include/xulrunner17/npapi.h \ ${WRKSRC}/np_sdk/mozsrc .else CONFIGURE_ARGS+= --disable-mozilla |