Sat May 25 11:11:14 2013 UTC ()
Bump PKGREVISION.

* Depend on xulrunner17 instead of xulrunner.


(ryoon)
diff -r1.86 -r1.87 pkgsrc/misc/openoffice3/Makefile
diff -r1.23 -r1.24 pkgsrc/misc/openoffice3/options.mk
cvs diff -r1.86 -r1.87 pkgsrc/misc/openoffice3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/Makefile 2013/05/09 07:40:14 1.86
+++ pkgsrc/misc/openoffice3/Attic/Makefile 2013/05/25 11:11:14 1.87
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.86 2013/05/09 07:40:14 adam Exp $ 1# $NetBSD: Makefile,v 1.87 2013/05/25 11:11:14 ryoon Exp $
2 2
3OO_VER= 3.1.1 3OO_VER= 3.1.1
4OO_TAG= OOO310_m19 4OO_TAG= OOO310_m19
5DISTNAME= openoffice-${OO_VER} 5DISTNAME= openoffice-${OO_VER}
6PKGNAME= openoffice3-${OO_VER} 6PKGNAME= openoffice3-${OO_VER}
7PKGREVISION= 42 7PKGREVISION= 43
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
10DIST_SUBDIR= ${DISTNAME} 10DIST_SUBDIR= ${DISTNAME}
11 11
12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2 14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2 15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2
16DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2 16DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2
17 17
18MAINTAINER= pkgsrc-users@NetBSD.org 18MAINTAINER= pkgsrc-users@NetBSD.org
19HOMEPAGE= http://www.openoffice.org/ 19HOMEPAGE= http://www.openoffice.org/
20COMMENT= Integrated office productivity suite (version 3) 20COMMENT= Integrated office productivity suite (version 3)
cvs diff -r1.23 -r1.24 pkgsrc/misc/openoffice3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/options.mk 2012/03/22 21:36:08 1.23
+++ pkgsrc/misc/openoffice3/Attic/options.mk 2013/05/25 11:11:14 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.23 2012/03/22 21:36:08 ryoon Exp $ 1# $NetBSD: options.mk,v 1.24 2013/05/25 11:11:14 ryoon Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 4PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
5PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd xulrunner 5PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd xulrunner
6# The list from completelangiso in solenv/inc/postset.mk. 6# The list from completelangiso in solenv/inc/postset.mk.
7OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \ 7OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
8 by ca cs cy da de dgo dz el en-GB en-US en-ZA \ 8 by ca cs cy da de dgo dz el en-GB en-US en-ZA \
9 eo es et eu fa fi fr ga gd gl gu gu-IN he \ 9 eo es et eu fa fi fr ga gd gl gu gu-IN he \
10 hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \ 10 hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \
11 ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \ 11 ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \
12 ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \ 12 ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \
13 ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \ 13 ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \
14 sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \ 14 sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \
@@ -33,37 +33,38 @@ OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S @@ -33,37 +33,38 @@ OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S
33.else 33.else
34. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g} 34. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
35OO_LANGS+= ${lang} 35OO_LANGS+= ${lang}
36OO_BASELANG?= ${lang} # Get first one. 36OO_BASELANG?= ${lang} # Get first one.
37. endfor 37. endfor
38.endif 38.endif
39OO_LANGS?= en-US 39OO_LANGS?= en-US
40OO_BASELANG?= en-US 40OO_BASELANG?= en-US
41OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1} 41OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
42 42
43.if !empty(PKG_OPTIONS:Mxulrunner) 43.if !empty(PKG_OPTIONS:Mxulrunner)
44CONFIGURE_ARGS+= --with-system-mozilla=mozilla 44CONFIGURE_ARGS+= --with-system-mozilla=mozilla
45.include "../../devel/nss/buildlink3.mk" 45.include "../../devel/nss/buildlink3.mk"
46.include "../../devel/xulrunner/buildlink3.mk" 46BUILDLINK_API_DEPENDS.xulrunner17+= xulrunner17>=17.0.6nb1
 47.include "../../devel/xulrunner17/buildlink3.mk"
47# 48#
48# OOo ships headers that are too old and conflict with xulrunner headers. 49# OOo ships headers that are too old and conflict with xulrunner headers.
49# Instead of patching everything to include external headers, we just 50# Instead of patching everything to include external headers, we just
50# Update what they have in the tree to match our xulrunner package. 51# Update what they have in the tree to match our xulrunner package.
51# 52#
52.PHONY: copy-mozilla-headers 53.PHONY: copy-mozilla-headers
53post-wrapper: copy-mozilla-headers 54post-wrapper: copy-mozilla-headers
54copy-mozilla-headers: 55copy-mozilla-headers:
55 cp \ 56 cp \
56 ${BUILDLINK_DIR}/include/xulrunner/npapi.h \ 57 ${BUILDLINK_DIR}/include/xulrunner17/npapi.h \
57 ${WRKSRC}/np_sdk/mozsrc 58 ${WRKSRC}/np_sdk/mozsrc
58.else 59.else
59CONFIGURE_ARGS+= --disable-mozilla 60CONFIGURE_ARGS+= --disable-mozilla
60.endif 61.endif
61 62
62.if !empty(PKG_OPTIONS:Mooo-external-libwpd) 63.if !empty(PKG_OPTIONS:Mooo-external-libwpd)
63CONFIGURE_ARGS+= --with-system-libwpd 64CONFIGURE_ARGS+= --with-system-libwpd
64.include "../../converters/libwpd/buildlink3.mk" 65.include "../../converters/libwpd/buildlink3.mk"
65.endif 66.endif
66 67
67.if !empty(PKG_OPTIONS:Mcups) 68.if !empty(PKG_OPTIONS:Mcups)
68CONFIGURE_ARGS+= --enable-cups 69CONFIGURE_ARGS+= --enable-cups
69.include "../../print/cups/buildlink3.mk" 70.include "../../print/cups/buildlink3.mk"