Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.454 2015/06/04 20:28:06 youri Exp $
+# $NetBSD: Makefile,v 1.460 2015/09/08 21:51:35 kamil Exp $
 #

 COMMENT=	Miscellaneous utilities
@@ -7,6 +7,7 @@ SUBDIR+=	9menu
 SUBDIR+=	Addresses
 SUBDIR+=	JBidwatcher
 SUBDIR+=	JMdict
+SUBDIR+=	ansiweather
 SUBDIR+=	ascii
 SUBDIR+=	asr-manpages
 SUBDIR+=	astrolog
@@ -172,8 +173,10 @@ SUBDIR+=	libkgeomap
 SUBDIR+=	libkkc-data
 SUBDIR+=	libkvkontakte
 SUBDIR+=	libquantum
+SUBDIR+=	libreoffice
 SUBDIR+=	libreoffice4
 SUBDIR+=	libreoffice4-bin
+SUBDIR+=	libreoffice43
 SUBDIR+=	libutf
 SUBDIR+=	lile
 SUBDIR+=	linux-words
@@ -241,10 +244,15 @@ SUBDIR+=	py-carddav
 SUBDIR+=	py-stdnum
 SUBDIR+=	py-trytond-company
 SUBDIR+=	py-trytond-party
+SUBDIR+=	py-trytond-party-relationship
 SUBDIR+=	py-trytond-party-siret
 SUBDIR+=	py-trytond-product
+SUBDIR+=	py-trytond-product-attribute
+SUBDIR+=	py-trytond-production
 SUBDIR+=	py-trytond-stock
+SUBDIR+=	py-trytond-stock-inventory-location
 SUBDIR+=	py-trytond-stock-lot
+SUBDIR+=	py-trytond-stock-product-location
 SUBDIR+=	qbrew
 SUBDIR+=	qterm
 SUBDIR+=	raspberrypi-userland
@@ -335,6 +343,7 @@ SUBDIR+=	whohas
 SUBDIR+=	window
 SUBDIR+=	xchm
 SUBDIR+=	xdg-utils
+SUBDIR+=	xfce4-smartbookmark-plugin
 SUBDIR+=	xfce4-time-out-plugin
 SUBDIR+=	xfce4-weather-plugin
 SUBDIR+=	xjdic
--- a/misc/ansiweather/DESCR
+++ b/misc/ansiweather/DESCR
@@ -0,0 +1,11 @@
+AnsiWeather is a Shell script for displaying the current weather conditions in
+your terminal, with support for ANSI colors and Unicode symbols.
+
+Weather data comes from the `OpenWeatherMap` free weather API.
+
+The default location of a configuration file can be overriden by the global
+environment variable ANSIWEATHERRC.
+
+Beware, if configuration file doesn't exists, the script queries a GeoIP API to
+try to approximate user location, this service may be overloaded at time so the
+application might appear stalled.
--- a/misc/ansiweather/Makefile
+++ b/misc/ansiweather/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2015/09/08 21:50:28 kamil Exp $
+
+DISTNAME=	ansiweather-1.03
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_GITHUB:=fcambus/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	${MASTER_SITE_GITHUB:=fcambus/ansiweather/}
+COMMENT=	Display current weather conditions in your terminal
+LICENSE=	modified-bsd
+
+USE_LANGUAGES=	# none
+
+USE_TOOLS+=	awk:run date:run grep:run
+
+DEPENDS+=	curl-[0-9]*:../../www/curl
+DEPENDS+=	jq-[0-9]*:../../devel/jq
+
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
+
+INSTALL_UNSTRIPPED=	yes
+
+DOCDIR=		share/doc/ansiweather
+EGDIR=		share/examples/ansiweather
+
+CONF_FILES+=	${EGDIR}/ansiweatherrc.example ${PKG_SYSCONFDIR}/ansiweatherrc
+
+SUBST_CLASSES+=		config shebang
+SUBST_FILES.config=	ansiweather
+SUBST_SED.config=	-e 's,~/.ansiweatherrc,${PKG_SYSCONFDIR}/ansiweatherrc,'
+SUBST_STAGE.config=	post-patch
+
+SUBST_FILES.shebang=	ansiweather
+SUBST_SED.shebang=	-e 's,/usr/bin/env sh,${SH},'
+SUBST_STAGE.shebang=	post-patch
+
+AUTO_MKDIRS=	yes
+
+do-install:
+	${RUN}${INSTALL_PROGRAM} ${WRKSRC}/ansiweather ${DESTDIR}${PREFIX}/bin
+.for f in AUTHORS ChangeLog README.md ansiweather.plugin.zsh
+	${RUN}${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
+.endfor
+	${RUN}${INSTALL_DATA} ${WRKSRC}/ansiweatherrc.example \
+	                      ${DESTDIR}${PREFIX}/${EGDIR}
+
+.include "../../mk/bsd.pkg.mk"
--- a/misc/ansiweather/PLIST
+++ b/misc/ansiweather/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2015/09/08 21:50:28 kamil Exp $
+bin/ansiweather
+share/doc/ansiweather/AUTHORS
+share/doc/ansiweather/ChangeLog
+share/doc/ansiweather/README.md
+share/doc/ansiweather/ansiweather.plugin.zsh
+share/examples/ansiweather/ansiweatherrc.example
--- a/misc/ansiweather/distinfo
+++ b/misc/ansiweather/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/09/08 21:50:28 kamil Exp $
+
+SHA1 (ansiweather-1.03.tar.gz) = 3f8eccc0de0017494ae9cbeb43aaa13e9a244dea
+RMD160 (ansiweather-1.03.tar.gz) = 46c20cdac8204ee1ffb5619753bed5322eae9342
+Size (ansiweather-1.03.tar.gz) = 6230 bytes
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/10/08 09:57:16 asau Exp $
+# $NetBSD: Makefile,v 1.39 2015/07/04 16:18:38 joerg Exp $

 DISTNAME=	ast54unx
 PKGNAME=	astrolog-5.40
@@ -21,8 +21,6 @@ WRKSRC=		${WRKDIR}
 EPHEM=		LRZ5_24 CHI_24 CPJV_24
 EXTRACT_ONLY=	${DISTNAME}.shr

-USE_X11BASE=	yes
-
 DIST_SUBDIR=	astrolog
 BUILD_TARGET=	astrolog

--- a/misc/autocue/files/autocue.c
+++ b/misc/autocue/files/autocue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autocue.c,v 1.3 2007/02/24 12:16:12 agc Exp $ */
+/* $NetBSD: autocue.c,v 1.4 2015/07/09 09:44:18 jperkin Exp $ */

 /*
 * Copyright © 2006 Alistair Crooks.  All rights reserved.
@@ -27,12 +27,18 @@
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif

 #ifndef lint
 __COPYRIGHT("@(#) Copyright © 2006 \
 	        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: autocue.c,v 1.3 2007/02/24 12:16:12 agc Exp $");
+__RCSID("$NetBSD: autocue.c,v 1.4 2015/07/09 09:44:18 jperkin Exp $");
 #endif

 #include <err.h>
@@ -143,7 +149,7 @@ main(int argc, char **argv)
 	if ((fp = fopen(argv[optind], "r")) == NULL) {
 		errx(EXIT_FAILURE, "can't open `%s'", argv[optind]);
 	}
-	printf("send this process - %d - a USR1 to make the display go faster, a USR2 to make it go slower\n", getpid());
+	printf("send this process - %ld - a USR1 to make the display go faster, a USR2 to make it go slower\n", (long)getpid());
 	for (cc = 0 ; fgets(line, sizeof(line), fp) != NULL ; ) {
 		if (line[0] == '\n') {
 			showbuffer(buf, cc, maxcut);
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 09:57:16 asau Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:38 joerg Exp $
 #

 DISTNAME=	bbappconf-0.0.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://bbtools.sourceforge.net/download.php?file=1
 COMMENT=	Configure the behaviour of an application under Blackbox

 USE_LANGUAGES=		c c++
-USE_X11BASE=		YES
 GNU_CONFIGURE=		YES

 INSTALLATION_DIRS=	${PKGMANDIR}/man1
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/04/06 20:27:25 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2015/08/03 13:16:58 mef Exp $
 #

 DISTNAME=		bbdb-2.35
@@ -12,9 +12,10 @@ HOMEPAGE=		http://sourceforge.net/projects/bbdb/
 COMMENT=		Insidious Big Brother DataBase, a rolodex-like database Emacs program

 # bbdb is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs24 emacs24nox emacs23 emacs23nox \
+EMACS_VERSIONS_ACCEPTED=	emacs25 \
+				emacs24 emacs24nox emacs23 emacs23nox \
 				emacs22 emacs22nox emacs21 emacs21nox \
-				emacs20
+
 CONFLICTS+=		xemacs-packages-[0-9]*

 USE_PKGLOCALEDIR=	yes
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2015/06/10 09:00:40 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2015/09/11 21:22:25 wiz Exp $

-DISTNAME=	calibre-2.30.0
+DISTNAME=	calibre-2.38.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
+MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

@@ -12,7 +13,7 @@ COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3

 #DEPENDS+=	help2man>=1.36.4:../../converters/help2man
-#DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 #DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=	${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2015/06/10 09:00:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.46 2015/09/11 21:22:25 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -670,7 +670,6 @@ lib/calibre/calibre/gui2/catalog/__init__.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
-lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
@@ -783,6 +782,7 @@ lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
+lib/calibre/calibre/gui2/dialogs/confirm_merge.py
 lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
 lib/calibre/calibre/gui2/dialogs/custom_recipes.py
@@ -837,6 +837,7 @@ lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
 lib/calibre/calibre/gui2/font_family_chooser.py
+lib/calibre/calibre/gui2/icon_theme.py
 lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/job_indicator.py
 lib/calibre/calibre/gui2/jobs.py
@@ -1027,6 +1028,7 @@ lib/calibre/calibre/gui2/tweak_book/__init__.py
 lib/calibre/calibre/gui2/tweak_book/boss.py
 lib/calibre/calibre/gui2/tweak_book/char_select.py
 lib/calibre/calibre/gui2/tweak_book/check.py
+lib/calibre/calibre/gui2/tweak_book/check_links.py
 lib/calibre/calibre/gui2/tweak_book/completion/__init__.py
 lib/calibre/calibre/gui2/tweak_book/completion/basic.py
 lib/calibre/calibre/gui2/tweak_book/completion/popup.py
@@ -1154,11 +1156,13 @@ lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
+lib/calibre/calibre/plugins/dukpy.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/libheadless.so
+lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/matcher.so
@@ -1171,7 +1175,6 @@ lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/plugins/tokenizer.so
 lib/calibre/calibre/plugins/unrar.so
-lib/calibre/calibre/plugins/woff.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/spell/__init__.py
@@ -1179,7 +1182,11 @@ lib/calibre/calibre/spell/break_iterator.py
 lib/calibre/calibre/spell/dictionary.py
 lib/calibre/calibre/spell/import_from.py
 lib/calibre/calibre/srv/__init__.py
+lib/calibre/calibre/srv/ajax.py
+lib/calibre/calibre/srv/auth.py
+lib/calibre/calibre/srv/auto_reload.py
 lib/calibre/calibre/srv/bonjour.py
+lib/calibre/calibre/srv/content.py
 lib/calibre/calibre/srv/errors.py
 lib/calibre/calibre/srv/handler.py
 lib/calibre/calibre/srv/http_request.py
@@ -1192,7 +1199,10 @@ lib/calibre/calibre/srv/routes.py
 lib/calibre/calibre/srv/sendfile.py
 lib/calibre/calibre/srv/standalone.py
 lib/calibre/calibre/srv/tests/__init__.py
+lib/calibre/calibre/srv/tests/ajax.py
+lib/calibre/calibre/srv/tests/auth.py
 lib/calibre/calibre/srv/tests/base.py
+lib/calibre/calibre/srv/tests/content.py
 lib/calibre/calibre/srv/tests/http.py
 lib/calibre/calibre/srv/tests/loop.py
 lib/calibre/calibre/srv/tests/main.py
@@ -1244,7 +1254,6 @@ lib/calibre/calibre/utils/fonts/sfnt/metrics.py
 lib/calibre/calibre/utils/fonts/sfnt/subset.py
 lib/calibre/calibre/utils/fonts/utils.py
 lib/calibre/calibre/utils/fonts/win_fonts.py
-lib/calibre/calibre/utils/fonts/woff/__init__.py
 lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/formatter_functions.py
 lib/calibre/calibre/utils/html2text.py
@@ -1252,6 +1261,7 @@ lib/calibre/calibre/utils/https.py
 lib/calibre/calibre/utils/icu.py
 lib/calibre/calibre/utils/icu_test.py
 lib/calibre/calibre/utils/imghdr.py
+lib/calibre/calibre/utils/inotify.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
@@ -1294,12 +1304,14 @@ lib/calibre/calibre/utils/pyconsole/history.py
 lib/calibre/calibre/utils/pyconsole/interpreter.py
 lib/calibre/calibre/utils/pyconsole/main.py
 lib/calibre/calibre/utils/pyparsing.py
+lib/calibre/calibre/utils/rapydscript.py
 lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/search_query_parser.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
+lib/calibre/calibre/utils/shared_file.py
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
@@ -1344,6 +1356,12 @@ lib/calibre/css_selectors/ordered_set.py
 lib/calibre/css_selectors/parser.py
 lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
+lib/calibre/duktape/__init__.py
+lib/calibre/duktape/tests.py
+lib/calibre/lzma/__init__.py
+lib/calibre/lzma/errors.py
+lib/calibre/lzma/lzma1.py
+lib/calibre/lzma/xz.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -1424,7 +1442,9 @@ share/calibre/catalog/mastheadImage.gif
 share/calibre/catalog/section_list_templates.py
 share/calibre/catalog/stylesheet.css
 share/calibre/catalog/template.xhtml
+share/calibre/coffee-script.js
 share/calibre/compiled_coffeescript.zip
+share/calibre/content-server/empty.html
 share/calibre/content_server/av.jpg
 share/calibre/content_server/bg_search_box.png
 share/calibre/content_server/browse/browse.css
@@ -1738,6 +1758,11 @@ share/calibre/quick_start/deu.epub
 share/calibre/quick_start/eng.epub
 share/calibre/quick_start/fra.epub
 share/calibre/quick_start/ita.epub
+share/calibre/rapydscript/compiler.js.xz
+share/calibre/rapydscript/lib/math.pyj
+share/calibre/rapydscript/lib/operator.pyj
+share/calibre/rapydscript/lib/random.pyj
+share/calibre/rapydscript/lib/re.pyj
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/20_minutos.recipe
@@ -1745,6 +1770,7 @@ share/calibre/recipes/20minutes.recipe
 share/calibre/recipes/20minutos.recipe
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/24sata_rs.recipe
+share/calibre/recipes/3dnews.recipe
 share/calibre/recipes/7dias.recipe
 share/calibre/recipes/7seri.recipe
 share/calibre/recipes/Ansa.recipe
@@ -1936,6 +1962,7 @@ share/calibre/recipes/ceske_noviny.recipe
 share/calibre/recipes/cesky_rozhlas_6.recipe
 share/calibre/recipes/cetnixploitation.recipe
 share/calibre/recipes/cgm_pl.recipe
+share/calibre/recipes/champion.recipe
 share/calibre/recipes/chicago_breaking_news.recipe
 share/calibre/recipes/chicago_tribune.recipe
 share/calibre/recipes/china_economic_net.recipe
@@ -2386,6 +2413,7 @@ share/calibre/recipes/hoy.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
 share/calibre/recipes/huffingtonpost_uk.recipe
+share/calibre/recipes/hurriyet.recipe
 share/calibre/recipes/hurriyet_daily_news.recipe
 share/calibre/recipes/hvg.recipe
 share/calibre/recipes/ibm_smarter_planet.recipe
@@ -2397,6 +2425,7 @@ share/calibre/recipes/idg_se.recipe
 share/calibre/recipes/idnes.recipe
 share/calibre/recipes/ieco.recipe
 share/calibre/recipes/ieeespectrum.recipe
+share/calibre/recipes/iekspries.recipe
 share/calibre/recipes/ifzm.recipe
 share/calibre/recipes/ihned.cz.recipe
 share/calibre/recipes/ihned.recipe
@@ -2444,6 +2473,7 @@ share/calibre/recipes/irish_times.recipe
 share/calibre/recipes/isar-loisachbote.recipe
 share/calibre/recipes/ittechblog.recipe
 share/calibre/recipes/ivanamilakovic.recipe
+share/calibre/recipes/ixbt.recipe
 share/calibre/recipes/izdiham.com.recipe
 share/calibre/recipes/izvestia.recipe
 share/calibre/recipes/jagran_josh.recipe
@@ -2479,6 +2509,7 @@ share/calibre/recipes/kahokushinpo.recipe
 share/calibre/recipes/kamerabild.recipe
 share/calibre/recipes/kamikaze.recipe
 share/calibre/recipes/karlsruhe.recipe
+share/calibre/recipes/karsi_gazete.recipe
 share/calibre/recipes/kath_net.recipe
 share/calibre/recipes/kathemerini.recipe
 share/calibre/recipes/kellog_faculty.recipe
@@ -2518,6 +2549,7 @@ share/calibre/recipes/kurier_poranny.recipe
 share/calibre/recipes/kurier_szczecinski.recipe
 share/calibre/recipes/kyungyhang.recipe
 share/calibre/recipes/l_espresso.recipe
+share/calibre/recipes/l_vivs_ghazieta.recipe
 share/calibre/recipes/la_cuarta.recipe
 share/calibre/recipes/la_diaria.recipe
 share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
@@ -2702,10 +2734,8 @@ share/calibre/recipes/nation_ke.recipe
 share/calibre/recipes/national_geographic_de.recipe
 share/calibre/recipes/national_geographic_es.recipe
 share/calibre/recipes/national_geographic_it.recipe
-share/calibre/recipes/national_geographic_mag.recipe
 share/calibre/recipes/national_geographic_pl.recipe
 share/calibre/recipes/national_post.recipe
-share/calibre/recipes/nationalgeographic.recipe
 share/calibre/recipes/nationalgeographicjp.recipe
 share/calibre/recipes/nationalgeoro.recipe
 share/calibre/recipes/nationalreviewonline.recipe
@@ -3042,6 +3072,7 @@ share/calibre/recipes/skeptical_enquirer.recipe
 share/calibre/recipes/skylife.recipe
 share/calibre/recipes/slashdot.recipe
 share/calibre/recipes/slate.recipe
+share/calibre/recipes/slate_star_codex.recipe
 share/calibre/recipes/slovo.recipe
 share/calibre/recipes/smashing.recipe
 share/calibre/recipes/sme.recipe
@@ -3213,6 +3244,7 @@ share/calibre/recipes/tyzden.recipe
 share/calibre/recipes/ubuntu_pl.recipe
 share/calibre/recipes/ubuntu_pomoc_org.recipe
 share/calibre/recipes/ukraiyns_kii_tizhdien.recipe
+share/calibre/recipes/ukraiyns_tizhdien.recipe
 share/calibre/recipes/ultimahora.recipe
 share/calibre/recipes/uncrate.recipe
 share/calibre/recipes/unica.recipe
@@ -3278,7 +3310,6 @@ share/calibre/recipes/winter_olympics.recipe
 share/calibre/recipes/wired.recipe
 share/calibre/recipes/wired_daily.recipe
 share/calibre/recipes/wired_it.recipe
-share/calibre/recipes/wired_uk.recipe
 share/calibre/recipes/wirtscafts_woche.recipe
 share/calibre/recipes/wirtualnemedia_pl.recipe
 share/calibre/recipes/wnp.recipe
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.41 2015/06/10 09:00:40 wiz Exp $
+$NetBSD: distinfo,v 1.49 2015/09/11 21:22:25 wiz Exp $

-SHA1 (calibre-2.30.0.tar.xz) = 0b95fe511ad77d541d6115cbb39cbce28021e699
-RMD160 (calibre-2.30.0.tar.xz) = 6a3e84fde6e5bf1b9036425c67b26ec0d440f00e
-Size (calibre-2.30.0.tar.xz) = 36851416 bytes
+SHA1 (calibre-2.38.0.tar.xz) = 6fbabdd6aea31c9100df6dce36d59f2deccedbd9
+RMD160 (calibre-2.38.0.tar.xz) = bd5d0ac0a4741f824e90a9f06b2f8a9d2ca04625
+Size (calibre-2.38.0.tar.xz) = 37610220 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556
--- a/misc/calibre1/Makefile
+++ b/misc/calibre1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:31 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/15 15:09:38 wiz Exp $

 DISTNAME=	calibre-1.48.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/10/09 14:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/07/09 11:44:09 jperkin Exp $

 DISTNAME=	ls
 PKGNAME=	colorls-2.2
@@ -17,6 +17,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
 			MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
+MAKE_ENV+=		LDADD=${LIBS:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1

 CFLAGS.SunOS+=		-Du_quad_t=uint64_t -DS_ISTXT=S_ISVTX
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.9 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/07/09 11:44:09 jperkin Exp $

 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
 Size (ls.tar.gz) = 11768 bytes
-SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
-SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
-SHA1 (patch-ac) = c96de4d9964055ca0244cecbc5ed2249ce2aa803
-SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
-SHA1 (patch-ae) = f217206de7b35bf03db4b95040f26bdf850b7cb7
-SHA1 (patch-extern.h) = ecb2f17ab8f17a42f744c26a86d243d90b309fd5
-SHA1 (patch-stat__flags.c) = 2def9b687a3c81611543875b5e99f86a65183680
+SHA1 (patch-aa) = d7d2381f1af5f8a452b6c875f7d0c84c80460ec0
+SHA1 (patch-ab) = 9e54a34c85ec0e4011aa6e5a4776b29e8cb0be54
+SHA1 (patch-ac) = ca39144a044969fe5aa17960c898c7e1b8bba86f
+SHA1 (patch-ad) = fb1d96b03fa028d45ddd4fe46ca520036f26be25
+SHA1 (patch-ae) = 70cfb2b8942e0130406e0c483b8e01de8c02a8d4
+SHA1 (patch-cmp.c) = 0f2675956bbf010055e39cd868337f1e452cf297
+SHA1 (patch-extern.h) = da879e819ce201ca434bb4bd6d15b92413877361
+SHA1 (patch-stat__flags.c) = 08f16c05d9383dc75c8954022fd491aa466312fa
+SHA1 (patch-util.c) = 312830c2a66925e44292426f857bf7704decaf4d
--- a/misc/colorls/patches/patch-aa
+++ b/misc/colorls/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/10/13 18:50:13 tv Exp $
+$NetBSD: patch-aa,v 1.8 2015/07/09 11:44:09 jperkin Exp $

--- Makefile.orig	Fri Sep 23 22:55:51 1994
+Use pkgsrc layout.
+
+--- Makefile.orig	1994-09-24 02:55:51.000000000 +0000
 +++ Makefile
@@ -3,4 +3,7 @@
 
--- a/misc/colorls/patches/patch-ab
+++ b/misc/colorls/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2004/10/13 18:50:13 tv Exp $
+$NetBSD: patch-ab,v 1.8 2015/07/09 11:44:09 jperkin Exp $

--- colorls.1.orig	Wed Oct 13 14:49:05 2004
+Manual page fixes.
+
+--- colorls.1.orig	2015-07-09 11:19:52.025462425 +0000
 +++ colorls.1
@@ -37,14 +37,22 @@
 .\"
--- a/misc/colorls/patches/patch-ac
+++ b/misc/colorls/patches/patch-ac
@@ -1,8 +1,21 @@
-$NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: patch-ac,v 1.7 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.

 --- ls.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ ls.c
-@@ -59,12 +59,26 @@ static char const sccsid[] = "@(#)ls.c	8
+@@ -53,18 +53,37 @@ static char const sccsid[] = "@(#)ls.c	8
+ #include <dirent.h>
+ #include <err.h>
+ #include <errno.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
+ #include <fts.h>
+#endif
+ #include <stdio.h>
+ #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <locale.h>
@@ -29,7 +42,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 static void	 traverse __P((int, char **, int));
 
 static void (*printfcn) __P((DISPLAY *));
-@@ -76,7 +90,9 @@ int termwidth = 80;		/* default terminal
+@@ -76,7 +95,9 @@ int termwidth = 80;		/* default terminal
 /* flags */
 int f_accesstime;		/* use time of last access */
 int f_column;			/* columnated format */
@@ -39,7 +52,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 int f_inode;			/* print inode */
 int f_kblocks;			/* print size in kilobytes */
 int f_listdir;			/* list actual directory, not contents */
-@@ -94,6 +110,7 @@ int f_statustime;		/* use time of last m
+@@ -94,6 +115,7 @@ int f_statustime;		/* use time of last m
 int f_dirname;			/* if precede with directory name */
 int f_timesort;			/* sort by time vice name */
 int f_type;			/* add type character for non-regular files */
@@ -47,7 +60,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 #ifndef BSD4_4_LITE
 int f_whiteout;			/* show whiteout entries */
 #endif
-@@ -135,9 +152,13 @@ main(argc, argv)
+@@ -135,9 +157,13 @@ main(argc, argv)
 
 	fts_options = FTS_PHYSICAL;
 #ifdef BSD4_4_LITE
@@ -63,7 +76,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 #endif
 		switch (ch) {
 		/*
-@@ -168,6 +189,10 @@ main(argc, argv)
+@@ -168,6 +194,10 @@ main(argc, argv)
 		case 'F':
 			f_type = 1;
 			break;
@@ -74,7 +87,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 		case 'L':
 			fts_options &= ~FTS_PHYSICAL;
 			fts_options |= FTS_LOGICAL;
-@@ -197,9 +222,11 @@ main(argc, argv)
+@@ -197,9 +227,11 @@ main(argc, argv)
 		case 'k':
 			f_kblocks = 1;
 			break;
@@ -86,7 +99,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 		case 'q':
 			f_nonprint = 1;
 			break;
-@@ -228,18 +255,21 @@ main(argc, argv)
+@@ -228,18 +260,21 @@ main(argc, argv)
 	argc -= optind;
 	argv += optind;
 
@@ -110,7 +123,19 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 		fts_options |= FTS_COMFOLLOW;
 
 #ifndef BSD4_4_LITE
-@@ -384,7 +414,8 @@ display(p, list)
+@@ -257,7 +292,11 @@ main(argc, argv)
+ 		if (f_kblocks)
+ 			blocksize = 2;
+ 		else {
+#ifdef __sun
+			blocksize = 512;
+#else
+ 			(void)getbsize(&notused, &blocksize);
+#endif
+ 			blocksize /= 512;
+ 		}
+ 	}
+@@ -384,7 +423,8 @@ display(p, list)
 	u_long btotal, maxblock, maxinode, maxlen, maxnlink;
 	int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser;
 	int entries, needstats;
@@ -120,7 +145,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 
 	/*
 	 * If list is NULL there are two possibilities: that the parent
-@@ -452,12 +483,14 @@ display(p, list)
+@@ -452,12 +492,14 @@ display(p, list)
 				group = group_from_gid(sp->st_gid, 0);
 				if ((glen = strlen(group)) > maxgroup)
 					maxgroup = glen;
@@ -135,7 +160,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 					flen = 0;
 
 				if ((np = malloc(sizeof(NAMES) +
-@@ -473,10 +506,12 @@ display(p, list)
+@@ -473,10 +515,12 @@ display(p, list)
 				    S_ISBLK(sp->st_mode))
 					bcfile = 1;
 
@@ -148,7 +173,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 				cur->fts_pointer = np;
 			}
 		}
-@@ -500,7 +535,7 @@ display(p, list)
+@@ -500,7 +544,7 @@ display(p, list)
 		d.s_inode = strlen(buf);
 		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
 		d.s_nlink = strlen(buf);
@@ -157,7 +182,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 		d.s_size = strlen(buf);
 		d.s_user = maxuser;
 	}
-@@ -521,7 +556,11 @@ display(p, list)
+@@ -521,7 +565,11 @@ display(p, list)
  */
 static int
 mastercmp(a, b)
--- a/misc/colorls/patches/patch-ad
+++ b/misc/colorls/patches/patch-ad
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:12 agc Exp $
+$NetBSD: patch-ad,v 1.3 2015/07/09 11:44:09 jperkin Exp $

--- ls.h.orig	Sun Dec 22 00:40:58 1996
-+++ ls.h	Thu May 21 15:42:08 1998
-@@ -54,6 +54,7 @@
+Add color.
+
+--- ls.h.orig	1996-12-21 23:40:58.000000000 +0000
+++ ls.h
+@@ -54,6 +54,7 @@ extern int f_sectime;		/* print the real
 extern int f_size;		/* list size in short listing */
 extern int f_statustime;	/* use time of last mode change */
 extern int f_type;		/* add type character for non-regular files */
--- a/misc/colorls/patches/patch-ae
+++ b/misc/colorls/patches/patch-ae
@@ -1,16 +1,26 @@
-$NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: patch-ae,v 1.5 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.

 --- print.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ print.c
-@@ -43,6 +43,7 @@ static char const sccsid[] = "@(#)print.
+@@ -43,9 +43,15 @@ static char const sccsid[] = "@(#)print.
 #include <sys/param.h>
 #include <sys/stat.h>
 
 +#include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
 #include <fts.h>
-@@ -64,6 +65,26 @@ static int	printtype __P((u_int));
+#endif
+ #include <grp.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -64,6 +70,26 @@ static int	printtype __P((u_int));
 
 #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
 
@@ -37,7 +47,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 void
 printscol(dp)
 	DISPLAY *dp;
-@@ -97,8 +118,8 @@ printlong(dp)
+@@ -97,15 +123,17 @@ printlong(dp)
 		if (f_inode)
 			(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
 		if (f_size)
@@ -48,7 +58,16 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 		(void)strmode(sp->st_mode, buf);
 		np = p->fts_pointer;
 		(void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
-@@ -114,20 +135,24 @@ printlong(dp)
+ 		    sp->st_nlink, dp->s_user, np->user, dp->s_group,
+ 		    np->group);
+#ifndef __sun
+ 		if (f_flags)
+ 			(void)printf("%-*s ", dp->s_flags, np->flags);
+#endif
+ 		if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
+ 			if (minor(sp->st_rdev) > 255)
+ 				(void)printf("%3d, 0x%08x ",
+@@ -114,20 +142,24 @@ printlong(dp)
 				(void)printf("%3d, %3d ",
 				    major(sp->st_rdev), minor(sp->st_rdev));
 		else if (dp->bcfile)
@@ -77,7 +96,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 			printlink(p);
 		(void)putchar('\n');
 	}
-@@ -190,10 +215,22 @@ printcol(dp)
+@@ -190,10 +222,22 @@ printcol(dp)
 			    dp->s_block);
 			if ((base += numrows) >= num)
 				break;
@@ -104,7 +123,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 			endcol += colwidth;
 		}
 		(void)putchar('\n');
-@@ -217,11 +254,15 @@ printaname(p, inodefield, sizefield)
+@@ -217,11 +261,15 @@ printaname(p, inodefield, sizefield)
 	if (f_inode)
 		chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
 	if (f_size)
@@ -122,7 +141,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 	return (chcnt);
 }
 
-@@ -281,6 +322,96 @@ printtype(mode)
+@@ -281,6 +329,96 @@ printtype(mode)
 	return (0);
 }
 
--- a/misc/colorls/patches/patch-cmp.c
+++ b/misc/colorls/patches/patch-cmp.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmp.c,v 1.1 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
+
+--- cmp.c.orig	1997-01-02 06:25:13.000000000 +0000
+++ cmp.c
+@@ -43,7 +43,12 @@ static char const sccsid[] = "@(#)cmp.c
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
+ #include <fts.h>
+#endif
+ #include <string.h>
+ 
+ #include "ls.h"
--- a/misc/colorls/patches/patch-extern.h
+++ b/misc/colorls/patches/patch-extern.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-extern.h,v 1.1 2011/06/14 13:25:57 wiz Exp $
+$NetBSD: patch-extern.h,v 1.2 2015/07/09 11:44:09 jperkin Exp $
+
+Add colors.

 --- extern.h.orig	1994-09-24 02:55:52.000000000 +0000
 +++ extern.h
--- a/misc/colorls/patches/patch-stat__flags.c
+++ b/misc/colorls/patches/patch-stat__flags.c
@@ -1,7 +1,9 @@
-$NetBSD: patch-stat__flags.c,v 1.1 2012/03/01 16:25:16 hans Exp $
+$NetBSD: patch-stat__flags.c,v 1.2 2015/07/09 11:44:09 jperkin Exp $

--- stat_flags.c.orig	1996-12-22 00:40:58.000000000 +0100
-+++ stat_flags.c	2012-03-01 15:39:46.769141152 +0100
+Avoid file flags on SunOS.
+
+--- stat_flags.c.orig	1996-12-21 23:40:58.000000000 +0000
+++ stat_flags.c
@@ -43,6 +43,8 @@ static char const sccsid[] = "@(#)stat_f
 #include <stddef.h>
 #include <string.h>
--- a/misc/colorls/patches/patch-util.c
+++ b/misc/colorls/patches/patch-util.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-util.c,v 1.1 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
+
+--- util.c.orig	1996-12-21 23:40:58.000000000 +0000
+++ util.c
+@@ -44,7 +44,12 @@ static char const sccsid[] = "@(#)util.c
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
+ #include <fts.h>
+#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2015/05/31 13:06:24 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2015/09/08 11:57:50 jperkin Exp $

 DISTNAME=	dialog-1.2-20150528
+PKGREVISION=	2
 PKGNAME=	${DISTNAME:C/-2/.2/}
 CATEGORIES=	misc
 MASTER_SITES=	ftp://invisible-island.net/dialog/
@@ -16,8 +17,6 @@ MAKE_FILE=	makefile
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--with-libtool

-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-P]-*
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1

 SUBST_CLASSES+=		rpath
@@ -26,5 +25,11 @@ SUBST_MESSAGE.rpath=	Fixing rpath in dialog-config
 SUBST_SED.rpath=	-e 's;-L\(.\);${_COMPILER_RPATH_FLAG}\1\{exec_prefix\}/lib -L\1;'
 SUBST_STAGE.rpath=	pre-configure

+.include "../../mk/bsd.prefs.mk"
+# curses from NetBSD 5 and earlier will coredump when displaying shadows
+.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5]*)
+CONFIGURE_ARGS+=	--disable-widec
+.endif
+
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/misc/dialog/buildlink3.mk
+++ b/misc/dialog/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/09/07 20:14:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/08/18 07:31:01 wiz Exp $

 BUILDLINK_TREE+=	dialog

@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	dialog
 DIALOG_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.dialog+=	dialog>=1.1.20080819nb1
+BUILDLINK_ABI_DEPENDS.dialog?=	dialog>=1.2.20150528nb2
 BUILDLINK_PKGSRCDIR.dialog?=	../../misc/dialog

 .include "../../mk/curses.buildlink3.mk"
--- a/misc/dose3/Makefile
+++ b/misc/dose3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 13:59:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2015/06/30 11:52:58 jaapb Exp $

 DISTNAME=	dose3-3.3-beta2
 PKGNAME= dose3-3.3beta2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/34180/

--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/08/18 07:31:13 wiz Exp $
 #

 DISTNAME=	dpkg_1.16.10
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/dvorakng/Makefile
+++ b/misc/dvorakng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/10/09 14:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/08/18 07:31:13 wiz Exp $
 #

 DISTNAME=	dvorakng-0.6.0rc1
-PKGREVISION=	1
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/dvorakng
 CATEGORIES=	misc
 MASTER_SITES=	http://www.free.of.pl/n/nopik/
--- a/misc/dvtm/Makefile
+++ b/misc/dvtm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2014/12/10 04:52:55 mef Exp $
+# $NetBSD: Makefile,v 1.13 2015/08/23 08:54:12 leot Exp $

-DISTNAME=	dvtm-0.13
+DISTNAME=	dvtm-0.14
 CATEGORIES=	misc
 MASTER_SITES=	http://www.brain-dump.org/projects/dvtm/

--- a/misc/dvtm/distinfo
+++ b/misc/dvtm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2014/12/10 04:52:55 mef Exp $
+$NetBSD: distinfo,v 1.11 2015/08/23 08:54:12 leot Exp $

-SHA1 (dvtm-0.13.tar.gz) = 8a4fc2440faa3050244e5a492fb6766899e0c0d7
-RMD160 (dvtm-0.13.tar.gz) = 3b9fc0e2616179bae036b9ade00fd72c0d335345
-Size (dvtm-0.13.tar.gz) = 35651 bytes
+SHA1 (dvtm-0.14.tar.gz) = 205a2165e70455309f7ed6a6f11b3072fb9b13c3
+RMD160 (dvtm-0.14.tar.gz) = d9e04111e0b1a476c3a280ca58f9d7766309ae82
+Size (dvtm-0.14.tar.gz) = 35893 bytes
 SHA1 (patch-aa) = 468fdc831372b9c78c9c7f5606f7c6246bb2943f
--- a/misc/gelemental/Makefile
+++ b/misc/gelemental/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:32 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2015/07/03 12:46:10 joerg Exp $
 #

 DISTNAME=	gelemental-1.2.0
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	misc
 MASTER_SITES=	http://www.kdau.com/files/
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/gelemental/distinfo
+++ b/misc/gelemental/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/05/06 23:07:05 dholland Exp $
+$NetBSD: distinfo,v 1.4 2015/07/03 12:46:10 joerg Exp $

 SHA1 (gelemental-1.2.0.tar.bz2) = 5640c8912de555eddf72924c866831249d0fdd28
 RMD160 (gelemental-1.2.0.tar.bz2) = a54b29e853d4861f4fd5adb947816cb0f736d2bc
@@ -6,5 +6,7 @@ Size (gelemental-1.2.0.tar.bz2) = 460757 bytes
 SHA1 (patch-aa) = bef3bc522e630b5f5674b75bb9713a844e38b66f
 SHA1 (patch-libelemental_misc_extras_cc) = 5b65d9d3b26ff81f96a3af9a0de2552c79b2c957
 SHA1 (patch-libelemental_misc_widgets_cc) = 1de3021e6b4790e8f879f7ed8859281bf6f768ff
+SHA1 (patch-libelemental_value.cc) = 1db6a3d81c98749bf71a66ee88af8a18f3b2608d
+SHA1 (patch-libelemental_value.hh) = bc630930c5e6a801419b7e48986814b7a96c4e89
 SHA1 (patch-libelemental_value.tcc) = d07bd0eda624514bf4e22a2f995cc0176d1e6a6c
 SHA1 (patch-src_main_cc) = efd05b15c0e4fc2d19c07c525ac5f20e9fb05b1c
--- a/misc/gelemental/patches/patch-libelemental_value.cc
+++ b/misc/gelemental/patches/patch-libelemental_value.cc
@@ -0,0 +1,32 @@
+$NetBSD: patch-libelemental_value.cc,v 1.1 2015/07/03 12:46:10 joerg Exp $
+
+--- libelemental/value.cc.orig	2015-06-27 14:24:42.000000000 +0000
+++ libelemental/value.cc
+@@ -23,7 +23,6 @@
+ #include <libelemental/value.hh>
+ #include <libelemental/value-types.hh>
+ 
+-#include <ext/stdio_filebuf.h>
+ #include <glibmm/utility.h>
+ #include <pango/pango-attributes.h>
+ 
+@@ -130,19 +129,6 @@ EntriesView::max_name_length = 0;
+ //******************************************************************************
+ // class EntriesStream
+ 
+-
+-EntriesStream::EntriesStream (FILE* file) throw ()
+-:	buf (new __gnu_cxx::stdio_filebuf<char> (file, std::ios_base::out)),
+-	buf_owned (true), os (*new std::ostream (buf)), os_owned (true)
+-{}
+-
+-
+-EntriesStream::EntriesStream (int fd) throw ()
+-:	buf (new __gnu_cxx::stdio_filebuf<char> (fd, std::ios_base::out)),
+-	buf_owned (true), os (*new std::ostream (buf)), os_owned (true)
+-{}
+-
+-
+ EntriesStream::EntriesStream (std::streambuf& buf_) throw ()
+ :	buf (&buf_), buf_owned (false),
+ 	os (*new std::ostream (buf)), os_owned (true)
--- a/misc/gelemental/patches/patch-libelemental_value.hh
+++ b/misc/gelemental/patches/patch-libelemental_value.hh
@@ -0,0 +1,17 @@
+$NetBSD: patch-libelemental_value.hh,v 1.1 2015/07/03 12:46:10 joerg Exp $
+
+--- libelemental/value.hh.orig	2015-06-27 14:24:40.000000000 +0000
+++ libelemental/value.hh
+@@ -142,12 +142,6 @@ class EntriesStream
+ {
+ public:
+ 
+-	//! Constructs a new EntriesStream for an open FILE pointer.
+-	EntriesStream (FILE* file) throw ();
+-
+-	//! Constructs a new EntriesStream for an open file descriptor.
+-	EntriesStream (int fd) throw ();
+-
+ 	//! Constructs a new EntriesStream for a stream buffer.
+ 	EntriesStream (std::streambuf& buf) throw ();
+ 
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.147 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2015/08/18 07:31:13 wiz Exp $

 DISTNAME=		gnome-utils-2.32.0
-PKGREVISION=		41
+PKGREVISION=		42
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.32/}
 EXTRACT_SUFX=		.tar.bz2
--- a/misc/goffice0.10/Makefile
+++ b/misc/goffice0.10/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2015/04/25 14:23:32 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/13 15:10:44 he Exp $

-DISTNAME=		goffice-0.10.9
+DISTNAME=		goffice-0.10.23
 PKGNAME=		${DISTNAME:S/goffice/goffice0.10/}
-PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.10/}
 EXTRACT_SUFX=		.tar.xz
@@ -20,15 +19,22 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config

 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.24
 .include "../../devel/libgsf/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.1
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.24.0
 .include "../../devel/pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.0
 .include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gdk-pibxbuf2+=	gdk-pixbuf2>=2.22.0
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.22.0
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/lasem/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.4.12
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.8.7
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/misc/goffice0.10/PLIST
+++ b/misc/goffice0.10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/20 15:44:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/13 15:10:44 he Exp $
 include/libgoffice-0.10/goffice/app/error-info.h
 include/libgoffice-0.10/goffice/app/file.h
 include/libgoffice-0.10/goffice/app/go-cmd-context-impl.h
@@ -93,6 +93,7 @@ include/libgoffice-0.10/goffice/gtk/go-action-combo-color.h
 include/libgoffice-0.10/goffice/gtk/go-action-combo-pixmaps.h
 include/libgoffice-0.10/goffice/gtk/go-action-combo-stack.h
 include/libgoffice-0.10/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.10/goffice/gtk/go-arrow-sel.h
 include/libgoffice-0.10/goffice/gtk/go-calendar-button.h
 include/libgoffice-0.10/goffice/gtk/go-charmap-sel.h
 include/libgoffice-0.10/goffice/gtk/go-color-group.h
@@ -110,6 +111,7 @@ include/libgoffice-0.10/goffice/gtk/go-image-sel.h
 include/libgoffice-0.10/goffice/gtk/go-line-selector.h
 include/libgoffice-0.10/goffice/gtk/go-locale-sel.h
 include/libgoffice-0.10/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.10/goffice/gtk/go-math-editor.h
 include/libgoffice-0.10/goffice/gtk/go-optionmenu.h
 include/libgoffice-0.10/goffice/gtk/go-palette.h
 include/libgoffice-0.10/goffice/gtk/go-pattern-selector.h
@@ -121,6 +123,7 @@ include/libgoffice-0.10/goffice/math/go-accumulator.h
 include/libgoffice-0.10/goffice/math/go-complex.h
 include/libgoffice-0.10/goffice/math/go-cspline.h
 include/libgoffice-0.10/goffice/math/go-distribution.h
+include/libgoffice-0.10/goffice/math/go-dtoa.h
 include/libgoffice-0.10/goffice/math/go-fft.h
 include/libgoffice-0.10/goffice/math/go-math.h
 include/libgoffice-0.10/goffice/math/go-matrix.h
@@ -147,6 +150,7 @@ include/libgoffice-0.10/goffice/utils/go-libxml-extras.h
 include/libgoffice-0.10/goffice/utils/go-line.h
 include/libgoffice-0.10/goffice/utils/go-locale.h
 include/libgoffice-0.10/goffice/utils/go-marker.h
+include/libgoffice-0.10/goffice/utils/go-mml-to-itex.h
 include/libgoffice-0.10/goffice/utils/go-pango-extras.h
 include/libgoffice-0.10/goffice/utils/go-path.h
 include/libgoffice-0.10/goffice/utils/go-pattern.h
@@ -159,9 +163,12 @@ include/libgoffice-0.10/goffice/utils/go-style.h
 include/libgoffice-0.10/goffice/utils/go-styled-object.h
 include/libgoffice-0.10/goffice/utils/go-svg.h
 include/libgoffice-0.10/goffice/utils/go-undo.h
+include/libgoffice-0.10/goffice/utils/go-unit.h
 include/libgoffice-0.10/goffice/utils/go-units.h
 include/libgoffice-0.10/goffice/utils/goffice-utils.h
 include/libgoffice-0.10/goffice/utils/regutf8.h
+lib/goffice/${PKGVERSION}/plugins/lasem/lasem.la
+lib/goffice/${PKGVERSION}/plugins/lasem/plugin.xml
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/barcol.la
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/plot-types.xml
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/plugin.xml
@@ -191,6 +198,14 @@ lib/goffice/${PKGVERSION}/plugins/smoothing/smoothing.la
 lib/goffice/${PKGVERSION}/plugins/smoothing/types.xml
 lib/libgoffice-0.10.la
 lib/pkgconfig/libgoffice-0.10.pc
+share/goffice/${PKGVERSION}/mmlitex/README
+share/goffice/${PKGVERSION}/mmlitex/cmarkup.xsl
+share/goffice/${PKGVERSION}/mmlitex/entities.xsl
+share/goffice/${PKGVERSION}/mmlitex/glayout.xsl
+share/goffice/${PKGVERSION}/mmlitex/mmlitex.xsl
+share/goffice/${PKGVERSION}/mmlitex/scripts.xsl
+share/goffice/${PKGVERSION}/mmlitex/tables.xsl
+share/goffice/${PKGVERSION}/mmlitex/tokens.xsl
 share/gtk-doc/html/goffice-0.10/GOArrow.html
 share/gtk-doc/html/goffice-0.10/GOBezierSpline.html
 share/gtk-doc/html/goffice-0.10/GOCalendarButton.html
@@ -211,6 +226,7 @@ share/gtk-doc/html/goffice-0.10/GODocControl.html
 share/gtk-doc/html/goffice-0.10/GOEditor.html
 share/gtk-doc/html/goffice-0.10/GOErrorInfo.html
 share/gtk-doc/html/goffice-0.10/GOFileSaver.html
+share/gtk-doc/html/goffice-0.10/GOFont.html
 share/gtk-doc/html/goffice-0.10/GOFontSel.html
 share/gtk-doc/html/goffice-0.10/GOFormat.html
 share/gtk-doc/html/goffice-0.10/GOFormatSel.html
@@ -313,7 +329,6 @@ share/gtk-doc/html/goffice-0.10/goffice-0.10-GOColor.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GOComplex.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GODataCVector.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GOFileOpeners.html
-share/gtk-doc/html/goffice-0.10/goffice-0.10-GOFont.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GOPattern.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GOQuad.html
 share/gtk-doc/html/goffice-0.10/goffice-0.10-GORange.html
@@ -341,19 +356,23 @@ share/gtk-doc/html/goffice-0.10/gsf-index.html
 share/gtk-doc/html/goffice-0.10/home.png
 share/gtk-doc/html/goffice-0.10/index.html
 share/gtk-doc/html/goffice-0.10/index.sgml
+share/gtk-doc/html/goffice-0.10/left-insensitive.png
 share/gtk-doc/html/goffice-0.10/left.png
 share/gtk-doc/html/goffice-0.10/pt01.html
 share/gtk-doc/html/goffice-0.10/pt02.html
 share/gtk-doc/html/goffice-0.10/pt03.html
 share/gtk-doc/html/goffice-0.10/pt04.html
+share/gtk-doc/html/goffice-0.10/right-insensitive.png
 share/gtk-doc/html/goffice-0.10/right.png
 share/gtk-doc/html/goffice-0.10/style.css
+share/gtk-doc/html/goffice-0.10/up-insensitive.png
 share/gtk-doc/html/goffice-0.10/up.png
 share/locale/am/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/ar/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/ast/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/az/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/bg/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/bs/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/ca/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/ca@valencia/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/cs/LC_MESSAGES/goffice-${PKGVERSION}.mo
--- a/misc/goffice0.10/buildlink3.mk
+++ b/misc/goffice0.10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:23:32 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2015/08/04 11:57:50 he Exp $

 BUILDLINK_TREE+=	goffice0.10

@@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.goffice0.10?=	../../misc/goffice0.10
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/lasem/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # GOFFICE0.10_BUILDLINK3_MK

--- a/misc/goffice0.10/distinfo
+++ b/misc/goffice0.10/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.8 2014/01/02 18:41:51 wiz Exp $
+$NetBSD: distinfo,v 1.13 2015/09/11 21:37:00 he Exp $

-SHA1 (goffice-0.10.9.tar.xz) = b99b1cdc42b27533828ff963793e60c35eab5861
-RMD160 (goffice-0.10.9.tar.xz) = 0297d1e5802a1f749b3308102335b59bc341a834
-Size (goffice-0.10.9.tar.xz) = 2214120 bytes
+SHA1 (goffice-0.10.23.tar.xz) = cbf0bdcfb6920979057efcad0355747109fc9d9d
+RMD160 (goffice-0.10.23.tar.xz) = a93dec3b10cd9c4f9501029e3d510957bcf69d30
+Size (goffice-0.10.23.tar.xz) = 2356604 bytes
+SHA1 (patch-gofffice_app_io-context.h) = b8aceae57a06af6873cbf0219b255ce9b9627d84
+SHA1 (patch-goffice_app_error-info.h) = 6273b5d9a95bb5d45aaa9369271f7476d74f6b0a
+SHA1 (patch-goffice_math_go-complex.c) = f9a7b429c04b25014f2bfa998b2ad09db8c2bcfa
+SHA1 (patch-goffice_math_go-dtoa.c) = 49a9194f6be85cfec2df4ee09a918f65f820c1cc
+SHA1 (patch-goffice_math_go-matrix.c) = 3d7be1540defaefbd2facc2c85b31938e0c5cac0
+SHA1 (patch-goffice_utils_go-glib-extras.c) = ed27e08c67a9341a43f24a23a1f97c4851d8cd3d
--- a/misc/goffice0.10/patches/patch-gofffice_app_io-context.h
+++ b/misc/goffice0.10/patches/patch-gofffice_app_io-context.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-gofffice_app_io-context.h,v 1.1 2015/08/10 19:30:06 joerg Exp $
+
+--- goffice/app/io-context.h.orig	2015-08-10 16:19:57.000000000 +0000
+++ goffice/app/io-context.h
+@@ -43,7 +43,7 @@ void       go_io_progress_unset      (GO
+ void go_io_context_set_num_files	(GOIOContext *ioc, guint count);
+ void go_io_context_processing_file	(GOIOContext *ioc, char const *uri);
+ void go_io_warning			(GOIOContext *ioc, char const *fmt, ...) G_GNUC_PRINTF (2, 3);
+-void go_io_warning_varargs		(GOIOContext *ioc, char const *fmt, va_list args);
+void go_io_warning_varargs		(GOIOContext *ioc, char const *fmt, va_list args) G_GNUC_PRINTF (2, 0);
+ void go_io_warning_unknown_font	(GOIOContext *ioc, char const *font_name);
+ void go_io_warning_unknown_function	(GOIOContext *ioc, char const *funct_name);
+ void go_io_warning_unsupported_feature	(GOIOContext *ioc, char const *feature);
--- a/misc/goffice0.10/patches/patch-goffice_app_error-info.h
+++ b/misc/goffice0.10/patches/patch-goffice_app_error-info.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-goffice_app_error-info.h,v 1.1 2015/08/10 19:30:06 joerg Exp $
+
+--- goffice/app/error-info.h.orig	2015-08-10 16:17:07.000000000 +0000
+++ goffice/app/error-info.h
+@@ -16,7 +16,7 @@ GOErrorInfo *go_error_info_new_str			(ch
+ GOErrorInfo *go_error_info_new_printf		(char const *msg_format, ...) G_GNUC_PRINTF (1, 2);
+ GOErrorInfo *go_error_info_new_vprintf		(GOSeverity severity,
+ 						 char const *msg_format,
+-						 va_list args);
+						 va_list args) G_GNUC_PRINTF (2, 0);
+ GOErrorInfo *go_error_info_new_str_with_details	(char const *msg, GOErrorInfo *details);
+ GOErrorInfo *go_error_info_new_str_with_details_list (char const *msg, GSList *details);
+ GOErrorInfo *go_error_info_new_from_error_list	(GSList *errors);
--- a/misc/goffice0.10/patches/patch-goffice_math_go-complex.c
+++ b/misc/goffice0.10/patches/patch-goffice_math_go-complex.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-goffice_math_go-complex.c,v 1.1 2015/08/10 19:30:06 joerg Exp $
+
+Format string is passed in as argument.
+
+--- goffice/math/go-complex.c.orig	2015-08-10 16:25:07.000000000 +0000
+++ goffice/math/go-complex.c
+@@ -58,6 +58,8 @@
+ #define COMPLEX SUFFIX(GOComplex)
+ 
+ /* ------------------------------------------------------------------------- */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ 
+ char *
+ SUFFIX(go_complex_to_string) (COMPLEX const *src, char const *reformat,
+@@ -103,6 +105,7 @@ SUFFIX(go_complex_to_string) (COMPLEX co
+ 
+ 	return res;
+ }
+#pragma GCC diagnostic pop
+ 
+ /* ------------------------------------------------------------------------- */
+ 
--- a/misc/goffice0.10/patches/patch-goffice_math_go-dtoa.c
+++ b/misc/goffice0.10/patches/patch-goffice_math_go-dtoa.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-goffice_math_go-dtoa.c,v 1.3 2015/09/11 21:37:00 he Exp $
+
+Use frexp() as a substitute for frexpl() on NetBSD before 6.99.17.
+
+--- goffice/math/go-dtoa.c.orig	2014-10-27 23:55:13.000000000 +0000
+++ goffice/math/go-dtoa.c
+@@ -43,6 +43,14 @@ typedef GString FAKE_FILE;
+ #define go_finitel isfinite
+ #endif
+ 
+#if defined(__NetBSD__) 
+#if (__NetBSD_Version__ >= 699001700)
+/* in <math.h> in newer NetBSDs, should already be included */
+#else
+/* OK, this will lose precision and range, but what else to do? */
+#define frexpl(ldv,i)	(long double)frexp((double)ldv, i)
+#endif
+#endif /* __NetBSD__ */
+ 
+ /* musl code starts here */
+ 
--- a/misc/goffice0.10/patches/patch-goffice_math_go-matrix.c
+++ b/misc/goffice0.10/patches/patch-goffice_math_go-matrix.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-goffice_math_go-matrix.c,v 1.1 2015/08/10 19:30:06 joerg Exp $
+
+Format string is passed in as argument.
+
+--- goffice/math/go-matrix.c.orig	2015-08-10 16:26:04.000000000 +0000
+++ goffice/math/go-matrix.c
+@@ -581,6 +581,8 @@ SUFFIX(go_quad_matrix_eigen_range) (cons
+ 	}
+ }
+ 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ 
+ void
+ SUFFIX(go_quad_matrix_dump) (const QMATRIX *A, const char *fmt)
+@@ -594,6 +596,8 @@ SUFFIX(go_quad_matrix_dump) (const QMATR
+ 	}
+ }
+ 
+#pragma GCC diagnostic pop
+
+ /* -------------------------------------------------------------------------- */
+ 
+ /**
--- a/misc/goffice0.10/patches/patch-goffice_utils_go-glib-extras.c
+++ b/misc/goffice0.10/patches/patch-goffice_utils_go-glib-extras.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-goffice_utils_go-glib-extras.c,v 1.1 2015/08/10 19:30:06 joerg Exp $
+
+Format string is passed in as argument.
+
+--- goffice/utils/go-glib-extras.c.orig	2015-08-10 16:27:43.000000000 +0000
+++ goffice/utils/go-glib-extras.c
+@@ -893,6 +893,8 @@ go_object_toggle (gpointer object, const
+ 	g_object_set (object, property_name, !value, NULL);
+ }
+ 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ 
+ gboolean
+ go_object_set_property (GObject *obj, const char *property_name,
+@@ -963,8 +965,7 @@ go_object_set_property (GObject *obj, co
+ 		return TRUE;
+ }
+ 
+-
+-
+#pragma GCC diagnostic pop
+ 
+ /**
+  * go_object_properties_collect:
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/08/17 17:11:25 wiz Exp $
 #

 DISTNAME=	gwaei-3.6.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/heirloom-more/Makefile
+++ b/misc/heirloom-more/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/18 07:31:13 wiz Exp $

 PKGNAME=	heirloom-more-${HEIRLOOM_VER}
+PKGREVISION=	1
 CATEGORIES=	misc sysutils
 LICENSE=	original-bsd

--- a/misc/howm/Makefile
+++ b/misc/howm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2015/06/11 17:24:30 taca Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/29 11:06:48 ryoon Exp $

 DISTNAME=	howm-1.4.1
 CATEGORIES=	misc
-MASTER_SITES=	http://howm.sourceforge.jp/a/
+MASTER_SITES=	http://howm.osdn.jp/a/

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://howm.sourceforge.jp/
+HOMEPAGE=	http://howm.osdn.jp/
 COMMENT=	Write fragmentarily and read collectively
 LICENSE=	gnu-gpl-v2

--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/08/17 17:11:26 wiz Exp $
 #

 DISTNAME=	ipbt-r8765
 PKGNAME=	ipbt-8765
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc
 # The upstream distfile is apparently rebuilt every night with
 # newly regenerated docs that have different timestamps. Use the
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/06/16 12:38:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:13 wiz Exp $
 #

 DISTNAME=		iselect-1.4.0
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		ftp://ftp.ossp.org/pkg/tool/iselect/ \
 			ftp://ftp.ntua.gr/pub/utils/ossp/tool/iselect/
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2015/04/25 14:23:33 tnn Exp $
+# $NetBSD: Makefile,v 1.101 2015/06/30 09:57:38 ryoon Exp $

 DISTNAME=	kdeaddons-${_KDE_VERSION}
-PKGREVISION=	40
+PKGREVISION=	41
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop

--- a/misc/khard/Makefile
+++ b/misc/khard/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.1 2015/04/02 22:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/21 19:18:25 wiz Exp $

-DISTNAME=		khard-0.3.0
+DISTNAME=		khard-0.4.1
 CATEGORIES=		misc net
-MASTER_SITES=		${MASTER_SITE_GITHUB:=scheibler/}
+MASTER_SITES=		https://pypi.python.org/packages/source/k/khard/

 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://github.com/scheibler/khard
 COMMENT=		CLI contacts application built around CardDAV
 LICENSE=		gnu-gpl-v3

-GITHUB_TAG=		v${PKGVERSION_NOREV}
 DEPENDS+=		${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
 DEPENDS+=		${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 DEPENDS+=		${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse

-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.0
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.4.1

 INSTALLATION_DIRS=	share/examples/khard
 REPLACE_PYTHON+=	*/*.py
--- a/misc/khard/PLIST
+++ b/misc/khard/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/02 22:35:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/07/21 19:17:51 wiz Exp $
 bin/davcontroller
 bin/khard
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/davcontroller/__init__.py
--- a/misc/khard/distinfo
+++ b/misc/khard/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/04/02 22:35:34 wiz Exp $
+$NetBSD: distinfo,v 1.2 2015/07/21 19:17:51 wiz Exp $

-SHA1 (khard-0.3.0.tar.gz) = 9a5e4557776aeeab2c64d099a14df0c6a635541b
-RMD160 (khard-0.3.0.tar.gz) = 758e9eca409327fb0cff860a243ba5ff5604b348
-Size (khard-0.3.0.tar.gz) = 5051405 bytes
+SHA1 (khard-0.4.1.tar.gz) = b215e2e681ab07335c969d92a41aec98ae18d9ca
+RMD160 (khard-0.4.1.tar.gz) = 8b275e0e37b5424da00dbbae1c22d80116560dce
+Size (khard-0.4.1.tar.gz) = 5032863 bytes
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.170 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.172 2015/09/12 16:50:00 joerg Exp $

 DISTNAME=	koffice-1.6.3
-PKGREVISION=	63
+PKGREVISION=	64
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
@@ -67,7 +67,7 @@ post-install:
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../print/poppler-qt/buildlink3.mk"
+.include "../../print/poppler016-qt3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
--- a/misc/kz_h8write/Makefile
+++ b/misc/kz_h8write/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2013/04/30 13:29:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/29 11:06:48 ryoon Exp $
 #

 DISTNAME=	kz_h8write-v0.2.1
 PKGNAME=	${DISTNAME:S/-v/-/}
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kz-h8write/57645/}
+MASTER_SITES=	${MASTER_SITE_OSDN:=kz-h8write/57645/}
 EXTRACT_SUFX=	.zip

 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://sourceforge.jp/projects/kz-h8write/
+HOMEPAGE=	http://osdn.jp/projects/kz-h8write/
 COMMENT=	Flash writer for H8/3069F, mainly for KOZOS
 LICENSE=	mit

--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/06/12 10:50:34 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2015/08/18 07:31:13 wiz Exp $

 DISTNAME=	libcdio-0.93
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/libreoffice/DESCR
+++ b/misc/libreoffice/DESCR
@@ -0,0 +1,4 @@
+LibreOffice is a free, community-developed, multi-platform office
+productivity suite. It includes key desktop applications:
+word processor, spreadsheet, presentation manager, and drawing program,
+with a user interface and feature set similar to other office suites.
--- a/misc/libreoffice/MESSAGE
+++ b/misc/libreoffice/MESSAGE
@@ -0,0 +1,5 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+To enable Java support, please set JDK path in Tools->Options->Advanced.
+===========================================================================
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -0,0 +1,329 @@
+# $NetBSD: Makefile,v 1.64 2015/09/24 03:18:34 ryoon Exp $
+
+VERREL=		5.0.2
+VERRC=		2
+VER=		${VERREL}.${VERRC}
+DISTNAME=	libreoffice-${VER}
+CATEGORIES=	misc
+MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	ryoon@NetBSD.org
+HOMEPAGE=	http://www.libreoffice.org/
+COMMENT=	Office productivity suite from The Document Foundation
+LICENSE=	gnu-lgpl-v3
+
+# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE.
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
+BUILDLINK_TRANSFORM+=	opt:-O2:-O
+.endif
+
+GCC_REQD+=	4.6
+
+CHECK_SHLIBS_SUPPORTED=	no
+# configure will be regenerated.
+CHECK_PORTABILITY_SKIP=configure
+
+DIST_SUBDIR=	libreoffice
+
+LO_BOOTSTRAP=	${DISTNAME}
+LO_COMPONENTS=	dictionaries help translations
+
+DISTFILES+=	${LO_BOOTSTRAP}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${LO_BOOTSTRAP}${EXTRACT_SUFX}
+
+.for component in ${LO_COMPONENTS}
+DISTFILES+=		libreoffice-${component}-${VER}.tar.xz
+EXTRACT_ONLY+=		libreoffice-${component}-${VER}.tar.xz
+.endfor
+
+MORE_DISTFILES= \
+	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \
+	0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz \
+	134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz \
+	5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz \
+	edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
+	8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz \
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz \
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
+	35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip \
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip \
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip \
+	commons-logging-1.2-src.tar.gz \
+	a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz \
+	7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz \
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip \
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip \
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip \
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip \
+	048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip \
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip \
+	c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz \
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip \
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip \
+	e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip \
+	ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip \
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip \
+	a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip \
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip \
+	b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 \
+	a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz \
+	d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz \
+	185d60944ea767075d27247c3162b3bc-unowinreg.dll \
+	c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \
+	OpenCOLLADA-master-6509aa13af.tar.bz2 \
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
+	368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
+
+.for md in ${MORE_DISTFILES}
+DISTFILES+=		${md}
+SITES.${md}=		http://dev-www.libreoffice.org/src/
+.endfor
+
+DISTFILES+=e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
+SITES.e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip=http://www.numbertext.org/linux/
+
+DISTFILES+=185d60944ea767075d27247c3162b3bc-unowinreg.dll
+SITES.185d60944ea767075d27247c3162b3bc-unowinreg.dll=http://download.go-oo.org/extern/
+
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+# tar: Invalid header, starting valid header search.
+EXTRACT_USING=		gtar
+
+WRKSRC=		${WRKDIR}/${LO_BOOTSTRAP}
+
+BUILD_DEPENDS+=		p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+# dmake scripts use relative path with -rpath-link ld arguments, which
+# is a no-go with normal pkgsrc wrappers.
+# dmake is slowly beeing removed from the LibreOffice build process
+# and this option will hopefully become unneeded in the future
+WRAPPER_SKIP_TRANSFORM=yes
+
+USE_LANGUAGES+=		c c++
+
+LDFLAGS+=		-lboost_system
+
+USE_LIBTOOL=		yes
+# Use GNU find fron findutils.
+TOOLS_PLATFORM.find=	# empty
+# GUN tar is really needed. Some Makefiles depends on GNUTAR.
+USE_TOOLS+=		automake bash bison gmake gsed gtar perl pkg-config unzip zip
+PTHREAD_OPTS+=		require
+
+HAS_CONFIGURE=		yes
+#GNU_CONFIGURE=		yes
+
+# Do not use /tmp, outside of WRKSRC.
+CONFIGURE_ENV+=		TMPDIR=${WRKSRC}/tmp
+
+MAKE_JOBS_SAFE=		no # --with-parallelism conficts with -jN
+.if !empty(MAKE_JOBS)
+CONFIGURE_ARGS+=	--with-parallelism=${MAKE_JOBS}
+.else
+CONFIGURE_ARGS+=	--with-parallelism=1
+.endif
+
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX}/${PKGNAME_NOREV}
+CONFIGURE_ARGS+=	--disable-ccache
+CONFIGURE_ARGS+=	--enable-dbus
+# We cannot use system collada2gltf, and NetBSD requires some patches (4.3.2.2)
+CONFIGURE_ARGS+=	--disable-collada
+CONFIGURE_ARGS+=	--disable-epm
+CONFIGURE_ARGS+=	--disable-fetch-external
+CONFIGURE_ARGS+=	--disable-firebird-sdbc
+CONFIGURE_ARGS+=	--disable-gconf
+CONFIGURE_ARGS+=	--disable-gnome-vfs
+CONFIGURE_ARGS+=	--disable-odk
+CONFIGURE_ARGS+=	--disable-randr-link
+CONFIGURE_ARGS+=	--disable-systray
+# Enabling crashrep causes error. Non-official build does not need it.
+CONFIGURE_ARGS+=	--disable-crashdump
+# Enabling GIO causes error. losessioninstall.component not found.
+CONFIGURE_ARGS+=	--disable-gio
+CONFIGURE_ARGS+=	--enable-gstreamer-1-0
+CONFIGURE_ARGS+=	--enable-lockdown
+CONFIGURE_ARGS+=	--enable-python=system
+#CONFIGURE_ARGS+=	--enable-release-build
+CONFIGURE_ARGS+=	--enable-ext-wiki-publisher
+CONFIGURE_ARGS+=	--enable-ext-nlpsolver
+CONFIGURE_ARGS+=	--with-alloc=system
+CONFIGURE_ARGS+=	--with-compat-oowrappers
+CONFIGURE_ARGS+=	--with-external-tar=${DISTDIR}/${DIST_SUBDIR}
+CONFIGURE_ARGS+=	--with-fonts
+CONFIGURE_ARGS+=	--with-lang="ALL"
+CONFIGURE_ARGS+=	--with-myspell-dicts
+CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
+CONFIGURE_ARGS+=	--with-system-libs
+CONFIGURE_ARGS+=	--with-system-dicts
+# internal vigra should be used because only header files are used.
+CONFIGURE_ARGS+=	--without-system-vigra
+CONFIGURE_ARGS+=	--with-vendor="pkgsrc"
+CONFIGURE_ARGS+=	--without-doxygen
+CONFIGURE_ARGS+=	--without-junit
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-gssapi
+CONFIGURE_ARGS+=	--without-system-apache-commons
+CONFIGURE_ARGS+=	--with-system-cppunit
+CONFIGURE_ARGS+=	--with-system-libgltf
+CONFIGURE_ARGS+=	--without-system-npapi-headers
+# internal sane should be used because only header files are used.
+CONFIGURE_ARGS+=	--without-system-sane
+# sbin might not be in PATH
+CONFIGURE_ARGS+=	ac_cv_path_SYSTEM_GENCCODE=${BUILDLINK_PREFIX.icu}/sbin/genccode
+CONFIGURE_ARGS+=	ac_cv_path_SYSTEM_GENCMN=${BUILDLINK_PREFIX.icu}/sbin/gencmn
+
+# more REPLACE_PERL are needed.
+REPLACE_PERL=	sd/res/webview/editpic.pl
+REPLACE_PERL+=	sd/res/webview/poll.pl
+REPLACE_PERL+=	sd/res/webview/savepic.pl
+REPLACE_PERL+=	sd/res/webview/show.pl
+REPLACE_PERL+=	sd/res/webview/webcast.pl
+
+LO_PROGRAMS=		sbase scalc sdraw simpress smath soffice swriter
+# Base depends on java, we don't install the icon
+LO_DESKTOP_FILES=	calc.desktop draw.desktop impress.desktop math.desktop \
+			startcenter.desktop writer.desktop
+
+#OBJDIR=			pkgsrcbuild
+#CONFIGURE_DIRS=		${OBJDIR}
+CONFIGURE_SCRIPT=	${WRKSRC}/autogen.sh
+
+#LD_LIBRARY_PATH+=	${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
+
+MAKE_ENV+=		ROOT_USER=${ROOT_USER}
+MAKE_ENV+=		ROOT_GROUP=${ROOT_GROUP}
+MAKE_ENV+=		SHELL=${BASH}
+#MAKE_ENV+=		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+BUILD_MAKE_FLAGS+=	VERBOSE=true
+#BUILD_MAKE_FLAGS+=	GMAKE_OPTIONS+=-p
+
+BUILDLINK_TRANSFORM+=	rm:-ldl
+
+INSTALLATION_DIRS=	bin share/applications
+
+.PHONY: debugrun
+# For debugging
+debugrun:
+	cd ${WRKSRC} && gmake debugrun
+
+post-extract:
+	${MKDIR} -p ${WRKSRC}/src
+.for md in ${MORE_DISTFILES}
+	${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
+.endfor
+	mkdir ${WRKSRC}/tmp
+#	mkdir ${WRKSRC}/${OBJDIR}
+
+do-install:
+	cd ${WRKSRC} && make DESTDIR="${DESTDIR}" PREFIXDIR="${PREFIX}" distro-pack-install
+# make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed.
+.for d in ${INSTALLATION_DIRS}
+	cd ${DESTDIR}${PREFIX} && \
+		${MKDIR} ${d}
+.endfor
+
+#post-install:
+#.for f in ${LO_PROGRAMS}
+#	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../${PKGNAME_NOREV}/program/${f}
+#.endfor
+#	${LN} -s ${DESTDIR}${PREFIX}/bin/soffice ${DESTDIR}${PREFIX}/bin/libreoffice
+#.for f in ${LO_DESKTOP_FILES}
+#	cd ${DESTDIR}${PREFIX}/share/applications && ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/share/xdg/${f}
+#.endfor
+
+.include "../../converters/libabw/buildlink3.mk"
+.include "../../converters/libcdr/buildlink3.mk"
+.include "../../converters/libe-book/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libetonyek+=	libetonyek>=0.1.2
+.include "../../converters/libetonyek/buildlink3.mk"
+.include "../../converters/libfreehand/buildlink3.mk"
+.include "../../converters/librevenge/buildlink3.mk"
+.include "../../converters/libmspub/buildlink3.mk"
+.include "../../converters/libpagemaker/buildlink3.mk"
+.include "../../converters/libvisio/buildlink3.mk"
+.include "../../converters/libwpd/buildlink3.mk"
+.include "../../converters/libwpg/buildlink3.mk"
+.include "../../converters/libwps/buildlink3.mk"
+.include "../../converters/libmwaw/buildlink3.mk"
+.include "../../converters/orcus0.8/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
+.include "../../databases/shared-mime-info/buildlink3.mk"
+.include "../../databases/unixodbc/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
+.include "../../devel/gperf/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/liblangtag/buildlink3.mk"
+.include "../../devel/mdds/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glm/buildlink3.mk"
+.include "../../graphics/graphite2/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libgltf/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+#.include "../../graphics/sane-backends/buildlink3.mk"
+#.include "../../graphics/vigra/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
+.include "../../math/coinmp/buildlink3.mk"
+.include "../../math/lp_solve/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../net/libcmis/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/poppler-cpp/buildlink3.mk"
+.include "../../print/poppler-includes/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../textproc/hyphen/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/libclucene/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libodfgen+=       libodfgen>=0.1.4
+.include "../../textproc/libodfgen/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/redland/buildlink3.mk"
+.include "../../textproc/libexttextcat/buildlink3.mk"
+.include "../../textproc/mythes/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
--- a/misc/libreoffice/PLIST
+++ b/misc/libreoffice/PLIST
--- a/misc/libreoffice/PLIST.debug
+++ b/misc/libreoffice/PLIST.debug
@@ -0,0 +1,89 @@
+@comment $NetBSD: PLIST.debug,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+${PKGNAME}/program/resource/abpqtz.res
+${PKGNAME}/program/resource/accqtz.res
+${PKGNAME}/program/resource/analysisqtz.res
+${PKGNAME}/program/resource/avmediaqtz.res
+${PKGNAME}/program/resource/basctlqtz.res
+${PKGNAME}/program/resource/bibqtz.res
+${PKGNAME}/program/resource/chartcontrollerqtz.res
+${PKGNAME}/program/resource/cnrqtz.res
+${PKGNAME}/program/resource/cuiqtz.res
+${PKGNAME}/program/resource/dateqtz.res
+${PKGNAME}/program/resource/dbaqtz.res
+${PKGNAME}/program/resource/dbmmqtz.res
+${PKGNAME}/program/resource/dbpqtz.res
+${PKGNAME}/program/resource/dbuqtz.res
+${PKGNAME}/program/resource/dbwqtz.res
+${PKGNAME}/program/resource/deploymentguiqtz.res
+${PKGNAME}/program/resource/deploymentqtz.res
+${PKGNAME}/program/resource/dktqtz.res
+${PKGNAME}/program/resource/editengqtz.res
+${PKGNAME}/program/resource/epsqtz.res
+${PKGNAME}/program/resource/eurqtz.res
+${PKGNAME}/program/resource/forqtz.res
+${PKGNAME}/program/resource/foruiqtz.res
+${PKGNAME}/program/resource/fps_officeqtz.res
+${PKGNAME}/program/resource/frmqtz.res
+${PKGNAME}/program/resource/fweqtz.res
+${PKGNAME}/program/resource/galqtz.res
+${PKGNAME}/program/resource/impqtz.res
+${PKGNAME}/program/resource/ofaqtz.res
+${PKGNAME}/program/resource/pcrqtz.res
+${PKGNAME}/program/resource/pdffilterqtz.res
+${PKGNAME}/program/resource/pricingqtz.res
+${PKGNAME}/program/resource/rptqtz.res
+${PKGNAME}/program/resource/rptuiqtz.res
+${PKGNAME}/program/resource/sbqtz.res
+${PKGNAME}/program/resource/scnqtz.res
+${PKGNAME}/program/resource/scqtz.res
+${PKGNAME}/program/resource/sdbclqtz.res
+${PKGNAME}/program/resource/sdberrqtz.res
+${PKGNAME}/program/resource/sdbtqtz.res
+${PKGNAME}/program/resource/sdqtz.res
+${PKGNAME}/program/resource/sfxqtz.res
+${PKGNAME}/program/resource/smqtz.res
+${PKGNAME}/program/resource/solverqtz.res
+${PKGNAME}/program/resource/svlqtz.res
+${PKGNAME}/program/resource/svtqtz.res
+${PKGNAME}/program/resource/svxqtz.res
+${PKGNAME}/program/resource/swqtz.res
+${PKGNAME}/program/resource/t602filterqtz.res
+${PKGNAME}/program/resource/tplqtz.res
+${PKGNAME}/program/resource/updqtz.res
+${PKGNAME}/program/resource/uuiqtz.res
+${PKGNAME}/program/resource/vclqtz.res
+${PKGNAME}/program/resource/wziqtz.res
+${PKGNAME}/program/resource/xmlsecqtz.res
+${PKGNAME}/program/resource/xsltdlgqtz.res
+${PKGNAME}/readmes/README_qtz
+${PKGNAME}/share/config/images_tango_testing.zip
+${PKGNAME}/share/config/soffice.cfg/cui/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/dbaccess/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/desktop/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/filter/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/formula/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/fps/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/BasicIDE/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/dbreport/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/sabpilot/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/sbibliography/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scalc/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/schart/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/sdraw/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/simpress/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/smath/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/spropctrlr/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/swriter/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/sfx/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/svt/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/svx/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/uui/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/vcl/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/xmlsec/ui/res/qtz.zip
+${PKGNAME}/share/extensions/dict-en/dialog/en_qtz.properties
+${PKGNAME}/share/extensions/dict-hu/dialog/hu_HU_qtz.properties
+${PKGNAME}/share/extensions/dict-ru/dialog/ru_RU_qtz.properties
+${PKGNAME}/share/registry/Langpack-qtz.xcd
+${PKGNAME}/share/registry/res/fcfg_langpack_qtz.xcd
+${PKGNAME}/share/registry/res/registry_qtz.xcd
--- a/misc/libreoffice/PLIST.java
+++ b/misc/libreoffice/PLIST.java
--- a/misc/libreoffice/PLIST.javascript
+++ b/misc/libreoffice/PLIST.javascript
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.javascript,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+${PKGNAME}/program/classes/ScriptProviderForJavaScript.jar
+${PKGNAME}/program/classes/js.jar
+${PKGNAME}/program/services/scriptproviderforjavascript.rdb
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/exportsheetstohtml.js
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/HelloWorld/helloworld.js
+${PKGNAME}/share/Scripts/javascript/HelloWorld/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/Highlight/ButtonPressHandler.js
+${PKGNAME}/share/Scripts/javascript/Highlight/ShowDialog.js
+${PKGNAME}/share/Scripts/javascript/Highlight/parcel-descriptor.xml
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -0,0 +1,154 @@
+$NetBSD: distinfo,v 1.10 2015/09/24 03:18:34 ryoon Exp $
+
+SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
+RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
+Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
+SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25
+RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066
+Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes
+SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974
+RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266
+Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes
+SHA1 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = c36bccbf6a0e562fa5a7b4b832af7185fa7f8a4b
+RMD160 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = ff53f6a5027654477d307baa3bcceba7b109220f
+Size (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 1333593 bytes
+SHA1 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 5ac3c475e604f34e1b7b490048652e09787a0341
+RMD160 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 3b24b4b2c93ac634a867fa64f50e90d700bcb867
+Size (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 502 bytes
+SHA1 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 8f949ae74a6d66278a595bd063f13e0ad196d14a
+RMD160 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 6056046e4043e3e6a613029fe94f5f1728bebcd5
+Size (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670 bytes
+SHA1 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 5c604f102e0716597b3d2659ac3e77f80a02f22d
+RMD160 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 12e2f383b8b13afbb63a9460008f97b3356d0ac2
+Size (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664 bytes
+SHA1 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 3232dd31859be4f7eb443c33e8e3287f394789a0
+RMD160 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = cf09fd0e4911275fddac1779cdbcfc6a7769eb5c
+Size (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 bytes
+SHA1 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 1acea86fd399ed7817879d36370d3d1f8b109050
+RMD160 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 687165fa06edad490e6173f3b868e1e1afdfc2c9
+Size (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796 bytes
+SHA1 (libreoffice/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip) = b67507ea7a48f7b68075cdfb2384784e516cb8ca
+RMD160 (libreoffice/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip) = 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1
+Size (libreoffice/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip) = 867405 bytes
+SHA1 (libreoffice/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz) = 6f8f87cd21c4cd7e72031852eb90453dba3e2473
+RMD160 (libreoffice/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz) = c7132f965b56110fe57f86c5d3f06ffe32d8fad4
+Size (libreoffice/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz) = 112756 bytes
+SHA1 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = b92930010622906778f713fb8f0153fa0683d018
+RMD160 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 0e6a6f183b1aafa43635ed9dfb74fc76761e65b4
+Size (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157 bytes
+SHA1 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e393beea80d36ff27b732882c706826988a64f5c
+RMD160 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 229deeb4c533422466c16eaf490c08103be21fc8
+Size (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 bytes
+SHA1 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 84b40d7f8bb0cd085dd70b3abed197133d761557
+RMD160 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 99ee3851f3f1ae9a431541de5765312f01ef19d7
+Size (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 2285857 bytes
+SHA1 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 8a90669029e107b61953b90ba11545fef586c2ca
+RMD160 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 68e248ec03675458f0536282ef250efa42c4c154
+Size (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 bytes
+SHA1 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 8896e0e17c66d2ed134faa5f8b95794334b81f80
+RMD160 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 46384cde5caf553206290a7c174297db0b98cc5a
+Size (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 466545 bytes
+SHA1 (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = c78ddd06845e267ba5bec20a38430f66eec3e0e4
+RMD160 (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = e764192666e940b00f1ff276f419d06bb4286f1d
+Size (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 739050 bytes
+SHA1 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = a637c0c3ad3be32d6814972e1c45e547c5f6359d
+RMD160 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 3235b45b4065750b0b2df4735a57ca1f815dfc69
+Size (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 bytes
+SHA1 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 47b58e0ef2d856df26372a7061ae43fae6e08051
+RMD160 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 61672340e92957a5b72cddddcfcbf56d9602842c
+Size (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 bytes
+SHA1 (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = c4f5760a1d21213dc52e2cf3ad9c0b9112585f36
+RMD160 (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 03da8df2411bd246a9b8376a496e61699b3aecf7
+Size (libreoffice/OpenCOLLADA-master-6509aa13af.tar.bz2) = 9691335 bytes
+SHA1 (libreoffice/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz) = bd92f8c5ab55777c66492a6f3566d013f19c9bbe
+RMD160 (libreoffice/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz) = 35d9aaed95f48a6631c929c5751695d8ef512a0c
+Size (libreoffice/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz) = 1923436 bytes
+SHA1 (libreoffice/a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip) = 3417fdcb2bc9a2fb02aff9b8ee8eb236e678ead1
+RMD160 (libreoffice/a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip) = 5d467bc8809b08438e4503372d16304cbe30fe8b
+Size (libreoffice/a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip) = 5140387 bytes
+SHA1 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d49e11b0b711970f494294dc3698f05eb294853
+RMD160 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 923870cf88023713a492e0a5c5d5707ec21d8739
+Size (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150 bytes
+SHA1 (libreoffice/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz) = c038831d84882cdf639e038e44decb1e40527591
+RMD160 (libreoffice/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz) = 4bf022808a362c0711ec857787bc3376e9adb940
+Size (libreoffice/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz) = 4910303 bytes
+SHA1 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = b19ad429273abb116432eae3af955ecaf1ab5b17
+RMD160 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = a2d9dfc67448b7ae43ff23873c3191494a3d73bc
+Size (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311 bytes
+SHA1 (libreoffice/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2) = aa8faa4f9e6721eed9bc6878862d74d0cb23251c
+RMD160 (libreoffice/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2) = e0ac7cc60e692c22a604949dd6c0b3c2be997db8
+Size (libreoffice/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2) = 37482428 bytes
+SHA1 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b
+RMD160 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = ecf14c46ddf095734752ef260134c97b1772be57
+Size (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031 bytes
+SHA1 (libreoffice/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz) = 04c5fe97131fc367cc909573e77bbf5c7c60bbf6
+RMD160 (libreoffice/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz) = 4ef085862083feadd238aa9e2e4bcd7b26d91d6e
+Size (libreoffice/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz) = 714196 bytes
+SHA1 (libreoffice/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz) = 65ceb1377897a4d5a404134423728592aea6eb13
+RMD160 (libreoffice/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz) = c866f23bc73a0f7e883c08d9056ef10b7af8bb58
+Size (libreoffice/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz) = 1169488 bytes
+SHA1 (libreoffice/commons-logging-1.2-src.tar.gz) = 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6
+RMD160 (libreoffice/commons-logging-1.2-src.tar.gz) = ff628c8de57f7da8572de3554196ee033e255312
+Size (libreoffice/commons-logging-1.2-src.tar.gz) = 188536 bytes
+SHA1 (libreoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 9714a0c4efb77726a1140329e98e5db057f9a69f
+RMD160 (libreoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = cc9f6626801182a0ee71ec9eb8fa34c38f8777a7
+Size (libreoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 16525605 bytes
+SHA1 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09
+RMD160 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166
+Size (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 bytes
+SHA1 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 65dfba9970bb862d09c1f9e636b86b22f05d3936
+RMD160 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = aec803e586e247ddbc39557090924988035d306c
+Size (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 bytes
+SHA1 (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = 9ab6ee07f70fa8143b5c9cc48a52602b368cc976
+RMD160 (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = 061ce85689f99eb670229c4c52a27adcf48282f4
+Size (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) = 6651982 bytes
+SHA1 (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = 4d9d0fb9264676d88b643b51d3876ac291175588
+RMD160 (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = 240e8ab543d2520b2558250ed54d95a52217481d
+Size (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = 1982036 bytes
+SHA1 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = f12277bdbacc8da5a0977fa35a1fe22ffa978760
+RMD160 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 8d9fe21f5d6d7ff1eb0123bfd669f9acfa5739b1
+Size (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 1098827 bytes
+SHA1 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 43a7ff11dd15370d456b20a093e1ee81279163a0
+RMD160 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea
+Size (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 bytes
+SHA1 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 5ecb895ffc1eff2c381fa78d2197d0c57422b3df
+RMD160 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 575a7daf02efbab9ea972e03a6870f7f13112806
+Size (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 bytes
+SHA1 (libreoffice/libreoffice-5.0.2.2.tar.xz) = fe9f80a2bf2a8e1e32fbe91b6e6832dab3a55f4b
+RMD160 (libreoffice/libreoffice-5.0.2.2.tar.xz) = ce7b99681d79b25ee74c29d559632750af186289
+Size (libreoffice/libreoffice-5.0.2.2.tar.xz) = 166869100 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-5.0.2.2.tar.xz) = 0d44bf666c98e0a20250cf5541aa37ebb2ae7350
+RMD160 (libreoffice/libreoffice-dictionaries-5.0.2.2.tar.xz) = c5dc79bedbd9dd145021e0ac76e1d95b18c4defe
+Size (libreoffice/libreoffice-dictionaries-5.0.2.2.tar.xz) = 36704156 bytes
+SHA1 (libreoffice/libreoffice-help-5.0.2.2.tar.xz) = 3831b4966d2b63a3a6260f1f07b92c45ca40d80a
+RMD160 (libreoffice/libreoffice-help-5.0.2.2.tar.xz) = f2fad56f216cd2243550b1a6b15e931cc7cbcd1e
+Size (libreoffice/libreoffice-help-5.0.2.2.tar.xz) = 1882964 bytes
+SHA1 (libreoffice/libreoffice-translations-5.0.2.2.tar.xz) = 448cc28158ac6d0f1c0d5ca464ce5e3b79c5c2fd
+RMD160 (libreoffice/libreoffice-translations-5.0.2.2.tar.xz) = 87c6bf7a99f0467e2d6deb5154d1ab1f40612eec
+Size (libreoffice/libreoffice-translations-5.0.2.2.tar.xz) = 130062656 bytes
+SHA1 (patch-Repository.mk) = 01a1fe049fc192a2b8b171b7162e3d34da1480c0
+SHA1 (patch-bin_distro-install-desktop-integration) = 292abb5c40018547bc58efa092eb7014dc28dced
+SHA1 (patch-bin_distro-install-file-lists) = 782e2943a8438fb0ff033b97eda8ad4923453774
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 9d7bb01d816003e90f36631c21b71c53b8ec0127
+SHA1 (patch-configure.ac) = 4314429f4e612e340413e45c0b2dcec1db3b8495
+SHA1 (patch-desktop_Library__sofficeapp.mk) = 320ab924a87607ed98c3404ed9d8688cbbed820a
+SHA1 (patch-include_LibreOfficeKit_LibreOfficeKitInit.h) = ce962b5d8646038150d57b02fd25a03eef592bb6
+SHA1 (patch-libreofficekit_Executable__gtktiledviewer.mk) = aa0967fe3e4d0f74dae899ac0b2d293a447af630
+SHA1 (patch-libreofficekit_Executable__tilebench.mk) = 39bbf45e59a434c1b03a8ac18ddec7e96e869059
+SHA1 (patch-libreofficekit_Library__libreofficekitgtk.mk) = 7bfa2a61f6aa66050ff89d3a33d12e573a5f9671
+SHA1 (patch-libreofficekit_Module__libreofficekit.mk) = 82e0c1dc6fd3ffacbe5e74b3e849879039ea0b24
+SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
+SHA1 (patch-odk_CustomTarget__javadoc.mk) = 403efd49783849318a895821e4e15af8fb4ea8a4
+SHA1 (patch-solenv_bin_ooinstall) = f4c1f3c917719a33882a8cacd0043733d5cf5676
+SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
+SHA1 (patch-solenv_gbuild_ExternalProject.mk) = c51913b6678084d283fc781cc54b2880a6ae6299
+SHA1 (patch-solenv_gbuild_Module.mk) = 729f051341b21325537a7f9902e7283caa66a456
+SHA1 (patch-svx_Executable__gengal.mk) = 12d454a75b465186e5a7f7830f6bfda91833a5be
+SHA1 (patch-sysui_desktop_share_create_tree.sh) = 338cb0f157ea9b49965aa7b31350173b8b7557a6
+SHA1 (patch-vcl_Executable__icontest.mk) = d96f7922f6c24be91d246cf20fc50954cf8d2e60
+SHA1 (patch-vcl_Executable__mtfdemo.mk) = 2c4e642fc17d399dcf6fcc48a40cb9a11f40a597
+SHA1 (patch-vcl_Executable__ui-previewer.mk) = 23512666725a9fa203cc942342b734aa1c2e27ae
+SHA1 (patch-vcl_Executable__vcldemo.mk) = 10711a1ecd7ad795c48d19554a3eaa853cd12a48
+SHA1 (patch-vcl_Library__desktop__detector.mk) = b18ea82aa519596edbae5db56cf7bec79b2b9e0f
+SHA1 (patch-vcl_Library__vcl.mk) = 30728fa898701bc095c321cf8fd76ad193e09ef7
+SHA1 (patch-vcl_Module__vcl.mk) = df7dbb524dbc7811970068e90d7cee6190a85df3
--- a/misc/libreoffice/options.mk
+++ b/misc/libreoffice/options.mk
@@ -0,0 +1,69 @@
+# $NetBSD: options.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice
+PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+PKG_SUGGESTED_OPTIONS=	java
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	java kde4 gtk3
+
+.if !empty(PKG_OPTIONS:Mjava)
+.include "../../mk/java-env.mk"
+.include "../../mk/java-vm.mk"
+USE_JAVA=		yes
+USE_JAVA2=		yes
+BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
+FIND_PREFIX:=		ANTDIR=apache-ant
+CONFIGURE_ARGS+=	--with-ant-home=${ANTDIR}
+
+DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
+FIND_PREFIX+=		HSQLDB_SYSDIR=hsqldb18
+CONFIGURE_ARGS+=	--with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
+.include "../../mk/find-prefix.mk"
+CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
+			--with-java \
+			--with-jdk-home=${PKG_JAVA_HOME} \
+			--without-system-beanshell \
+			--enable-scripting-beanshell \
+			--with-system-hsqldb \
+			--without-system-jfreereport
+PLIST_SRC+=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
+.  if !empty(PKG_JVM:Mopenjdk7)
+CONFIGURE_ARGS+=	--disable-scripting-javascript
+.  else
+PLIST_SRC+=		${PKGDIR}/PLIST.javascript
+.  endif
+PLIST.java=		yes
+.else
+CONFIGURE_ARGS+=	--without-java
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+CONFIGURE_ARGS+=	--enable-selective-debuginfo="all"
+PLIST_SRC=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.debug
+.else
+CONFIGURE_ARGS+=	--enable-release-build
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=	--enable-gtk3
+PLIST.gtk3=		yes
+.include "../../x11/gtk3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gtk3
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde4)
+CONFIGURE_ARGS+=	--enable-kde4
+CONFIGURE_ENV+=		KDE4DIR="${LOCALBASE}"
+PLIST.kde4=		yes
+.include "../../x11/kdelibs4/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-kde4
+.endif
--- a/misc/libreoffice/patches/patch-Repository.mk
+++ b/misc/libreoffice/patches/patch-Repository.mk
@@ -0,0 +1,30 @@
+$NetBSD: patch-Repository.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- Repository.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ Repository.mk
+@@ -67,13 +67,13 @@ $(eval $(call gb_Helper_register_executa
+         svptest \
+         svpclient \
+         pixelctl ) \
+-	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
+-	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
+	$(if $(and $(ENABLE_GTK), $(filter LINUX NETBSD,$(OS))), tilebench) \
+	$(if $(filter LINUX MACOSX WNT NETBSD,$(OS)),icontest \
+ 	    outdevgrind) \
+ 	vcldemo \
+ 	tiledrendering \
+     mtfdemo \
+-	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
+	$(if $(and $(ENABLE_GTK), $(filter LINUX NETBSD,$(OS))), gtktiledviewer) \
+ ))
+ 
+ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
+@@ -581,7 +581,7 @@ $(eval $(call gb_Helper_register_librari
+ 	i18nlangtag \
+ 	i18nutil \
+ 	index_data \
+-	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), libreofficekitgtk) \
+	$(if $(and $(ENABLE_GTK), $(filter LINUX NETBSD,$(OS))), libreofficekitgtk) \
+ 	localedata_en \
+ 	localedata_es \
+ 	localedata_euro \
--- a/misc/libreoffice/patches/patch-bin_distro-install-desktop-integration
+++ b/misc/libreoffice/patches/patch-bin_distro-install-desktop-integration
@@ -0,0 +1,56 @@
+$NetBSD: patch-bin_distro-install-desktop-integration,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- bin/distro-install-desktop-integration.orig	2015-07-31 00:32:43.000000000 +0000
+++ bin/distro-install-desktop-integration
+@@ -5,7 +5,7 @@ if test -z "${SRC_ROOT}"; then
+     exit 1
+ fi
+ 
+-PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
+PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | gsed -e "s/\.//"`
+ 
+ mkdir -p $DESTDIR$PREFIXDIR/bin
+ 
+@@ -70,7 +70,7 @@ add_wrapper()
+     # do we want compat oowrapper?
+     oowrapper_name=""
+     if test "$WITH_COMPAT_OOWRAPPERS" = 'TRUE' ; then
+-        oowrapper_name=`echo "$lowrapper_name" | sed -e "s/^lo/oo/"`
+        oowrapper_name=`echo "$lowrapper_name" | gsed -e "s/^lo/oo/"`
+         # "oo" prefix only for wrappers stating with "lo" prefix
+         test "$oowrapper_name" = "$lowrapper_name" && oowrapper_name=
+     fi
+@@ -94,13 +94,13 @@ add_wrapper()
+ }
+ 
+ # install desktop integration from plain packages
+-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
+sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XXXXXX`
+ cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
+ cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
+ builddir=`pwd`
+ cd $sysui_temp
+ # we want non-versioned stuff in the distro packages
+-sed -i \
+gsed -i \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+     -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+@@ -130,7 +130,7 @@ fi
+ # we want non-versioned desktop files
+ cd $DESTDIR/$INSTALLDIR/share/xdg
+ # we want non-versioned stuff in the distro packages
+-sed -i \
+gsed -i \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+     -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+@@ -187,7 +187,7 @@ fi
+ 
+ echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
+ mkdir -p $DESTDIR$INSTALLDIR/program
+-sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >| "$DESTDIR$INSTALLDIR/program/java-set-classpath" || exit 1;
+gsed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >| "$DESTDIR$INSTALLDIR/program/java-set-classpath" || exit 1;
+ chmod 755 "$DESTDIR$INSTALLDIR/program/java-set-classpath"
+ test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand
+ 
--- a/misc/libreoffice/patches/patch-bin_distro-install-file-lists
+++ b/misc/libreoffice/patches/patch-bin_distro-install-file-lists
@@ -0,0 +1,51 @@
+$NetBSD: patch-bin_distro-install-file-lists,v 1.2 2015/08/12 12:13:02 wiz Exp $
+
+--- bin/distro-install-file-lists.orig	2015-07-31 00:32:43.000000000 +0000
+++ bin/distro-install-file-lists
+@@ -31,8 +31,8 @@ mv_file_between_flists()
+ # Params: target_file_list source_file_list
+ add_used_directories()
+ {
+-    sort -u -r $2 | sed -n "s|^%dir \(.*\)\$|s%^\\\\(\1\\\\).*%\\\\1%p|p" >$2.pattern
+-    sed -n -f $2.pattern $1 | sort -u | sed "s|^|%dir |" >>$1
+    sort -u -r $2 | gsed -n "s|^%dir \(.*\)\$|s%^\\\\(\1\\\\).*%\\\\1%p|p" >$2.pattern
+    gsed -n -f $2.pattern $1 | sort -u | gsed "s|^|%dir |" >>$1
+     rm $2.pattern
+     sort -u $1 >$1.unique
+     mv $1.unique $1
+@@ -164,7 +164,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
+     fi
+ 
+     # lang packs
+-    for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
+    for lang in `echo $WITH_LANG_LIST | gsed -e s/-/_/g`; do
+         lang_lists=
+         if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then
+             test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
+@@ -198,7 +198,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
+         # some help files are in _Langpack_{Writer,Impress,...}_<lang>
+         # move them from -l10n to -help
+         if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then
+-            for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
+            for lang in `echo $WITH_LANG_LIST | gsed -e s/-/_/g`; do
+                 test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
+                 mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
+                 add_used_directories $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt
+@@ -442,12 +442,12 @@ else
+ 
+     for l in `echo $WITH_LANG_LIST`; do
+         for p in Impress Draw Math Calc Base Writer; do
+-            create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
+            create_package_directory  gid_Module_Langpack_${p}_`echo $l | gsed -e s/-/_/g` pkg/libreoffice-l10n-$l
+         done
+-        create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g`     pkg/libreoffice-l10n-$l
+-        create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`     pkg/libreoffice-l10n-$l
+-        create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`  pkg/libreoffice-l10n-$l
+-        create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g`      pkg/libreoffice-help-$l
+        create_package_directory gid_Module_Langpack_Basis_`echo $l | gsed -e s/-/_/g`     pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Langpack_Brand_`echo $l | gsed -e s/-/_/g`     pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Langpack_Resource_`echo $l | gsed -e s/-/_/g`  pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Helppack_Help_`echo $l | gsed -e s/-/_/g`      pkg/libreoffice-help-$l
+ 
+         # some help files are in _Langpack_{Writer,Impress,...}_<lang>
+         # move them from -l10n to -help
--- a/misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3linuxx86-64_share.hxx
+++ b/misc/libreoffice/patches/patch-bridges_source_cpp__uno_gcc3linuxx86-64_share.hxx
@@ -0,0 +1,54 @@
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.1 2015/09/23 20:48:44 joerg Exp $
+
+--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig	2015-08-13 17:21:26.000000000 +0000
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+@@ -40,6 +40,14 @@ namespace __cxxabiv1
+     {
+         explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+         virtual ~__class_type_info();
+
+        enum __offset_flags_masks
+        {
+            __virtual_mask = 0x1,
+            __public_mask = 0x2,
+            __hwm_bit = 2,
+            __offset_shift = 8
+        };
+     };
+ 
+     struct __si_class_type_info : public __class_type_info
+@@ -50,6 +58,34 @@ namespace __cxxabiv1
+         const __class_type_info *__base_type;
+     };
+ 
+    struct __base_class_type_info {
+        const __class_type_info *__base_type;
+        uintptr_t __offset_flags;
+
+        enum __offset_flags_masks {
+            __virtual_mask = 0x1,
+            __public_mask = 0x2,
+            __hwm_bit = 2,
+            __offset_shift = 8
+        };
+    };
+
+    struct __vmi_class_type_info : public __class_type_info {
+        unsigned int __flags;
+        unsigned int __base_count;
+        __base_class_type_info __base_info[0];
+
+        explicit __vmi_class_type_info(const char *__n, int ___flags) :
+          __class_type_info(__n), __flags(___flags), __base_count(0) {}
+
+        enum __flags_masks
+        {
+            __non_diamond_repeat_mask = 0x1,
+            __diamond_shaped_mask = 0x2,
+            __flags_unknown_mask = 0x10
+        };
+    };
+
+ extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+ 
+ extern "C" _LIBCPP_NORETURN void __cxa_throw(
--- a/misc/libreoffice/patches/patch-configure.ac
+++ b/misc/libreoffice/patches/patch-configure.ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-configure.ac,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+* Use gstreamer under OpenBSD
+* Add FreeBSD support (GNU patch is not needed)
+* Detect pkgsrc apache-ant library
+* Fix installation directory
+
+--- configure.ac.orig	2015-07-31 00:32:43.000000000 +0000
+++ configure.ac
+@@ -7882,7 +7882,7 @@ no|disable)
+     else
+         # Unset variables set by the above AM_PATH_PYTHON so that
+         # we actually do check anew.
+-        unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
+        #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
+         AM_PATH_PYTHON([3.3],, [:])
+         if test "$PYTHON" = ":"; then
+             if test -z "$PYTHON_FOR_BUILD"; then
+@@ -7935,9 +7935,9 @@ if test $enable_python = system; then
+     elif test "$cross_compiling" != yes; then
+         # Unset variables set by the above AM_PATH_PYTHON so that
+         # we actually do check anew.
+-        unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
+        #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
+         # This causes an error if no python command is found
+-        AM_PATH_PYTHON([3.3])
+        AM_PATH_PYTHON([2.6])
+         python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+         python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+         python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+@@ -12069,7 +12069,7 @@ EOF
+     dnl Checking for ant.jar
+     if test "$ANT_HOME" != "NO_ANT_HOME"; then
+         AC_MSG_CHECKING([Ant lib directory])
+-        if test -f $ANT_HOME/lib/ant.jar; then
+        if test -f $ANT_HOME/lib/java/ant/ant.jar; then
+             ANT_LIB="$ANT_HOME/lib"
+         else
+             if test -f $ANT_HOME/ant.jar; then
+@@ -12513,7 +12513,7 @@ AC_SUBST(MANDIR)
+ DOCDIR=[$(eval echo $(eval echo $docdir))]
+ AC_SUBST(DOCDIR)
+ 
+-INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
+INSTALLDIR="$PREFIXDIR"
+ AC_SUBST(INSTALLDIR)
+ 
+ TESTINSTALLDIR="${BUILDDIR}/test-install"
--- a/misc/libreoffice/patches/patch-desktop_Library__sofficeapp.mk
+++ b/misc/libreoffice/patches/patch-desktop_Library__sofficeapp.mk
@@ -0,0 +1,40 @@
+$NetBSD: patch-desktop_Library__sofficeapp.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+https://bugs.documentfoundation.org/show_bug.cgi?id=89551
+
+--- desktop/Library_sofficeapp.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ desktop/Library_sofficeapp.mk
+@@ -23,6 +23,13 @@ $(eval $(call gb_Library_add_libs,soffic
+     ) \
+ ))
+ 
+$(eval $(call gb_Library_add_libs,sofficeapp,\
+    $(if $(filter $(OS),NETBSD), \
+        -ldl \
+        -lpthread \
+    ) \
+))
+
+ $(eval $(call gb_Library_use_external,sofficeapp,boost_headers))
+ 
+ $(eval $(call gb_Library_use_custom_headers,sofficeapp,\
+@@ -117,6 +124,19 @@ $(eval $(call gb_Library_add_libs,soffic
+     -lX11 \
+ ))
+ endif
+
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_use_static_libraries,sofficeapp,\
+    glxtest \
+))
+
+$(eval $(call gb_Library_add_libs,sofficeapp,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+endif
+ endif
+ 
+ # LibreOfficeKit bits
--- a/misc/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit.h
+++ b/misc/libreoffice/patches/patch-include_LibreOfficeKit_LibreOfficeKitInit.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_LibreOfficeKit_LibreOfficeKitInit.h,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- include/LibreOfficeKit/LibreOfficeKitInit.h.orig	2015-07-31 00:32:43.000000000 +0000
+++ include/LibreOfficeKit/LibreOfficeKitInit.h
+@@ -17,7 +17,7 @@ extern "C"
+ {
+ #endif
+ 
+-#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__)
+#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__)
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
--- a/misc/libreoffice/patches/patch-libreofficekit_Executable__gtktiledviewer.mk
+++ b/misc/libreoffice/patches/patch-libreofficekit_Executable__gtktiledviewer.mk
@@ -0,0 +1,18 @@
+$NetBSD: patch-libreofficekit_Executable__gtktiledviewer.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- libreofficekit/Executable_gtktiledviewer.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ libreofficekit/Executable_gtktiledviewer.mk
+@@ -39,6 +39,13 @@ $(eval $(call gb_Executable_add_libs,gtk
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,gtktiledviewer,\
+    -lm \
+    -lpthread \
+))
+endif
+
+ $(eval $(call gb_Executable_add_exception_objects,gtktiledviewer,\
+     libreofficekit/qa/gtktiledviewer/gtktiledviewer \
+ ))
--- a/misc/libreoffice/patches/patch-libreofficekit_Executable__tilebench.mk
+++ b/misc/libreoffice/patches/patch-libreofficekit_Executable__tilebench.mk
@@ -0,0 +1,25 @@
+$NetBSD: patch-libreofficekit_Executable__tilebench.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- libreofficekit/Executable_tilebench.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ libreofficekit/Executable_tilebench.mk
+@@ -19,11 +19,20 @@ $(eval $(call gb_Executable_use_librarie
+ 	sal \
+ ))
+ 
+ifeq ($(OS),LINUX)
+ $(eval $(call gb_Executable_add_libs,tilebench,\
+     -lm \
+     -ldl \
+     -lpthread \
+ ))
+endif
+
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,tilebench,\
+    -lm \
+    -lpthread \
+))
+endif
+ 
+ $(eval $(call gb_Executable_add_exception_objects,tilebench,\
+     libreofficekit/qa/tilebench/tilebench \
--- a/misc/libreoffice/patches/patch-libreofficekit_Library__libreofficekitgtk.mk
+++ b/misc/libreoffice/patches/patch-libreofficekit_Library__libreofficekitgtk.mk
@@ -0,0 +1,15 @@
+$NetBSD: patch-libreofficekit_Library__libreofficekitgtk.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- libreofficekit/Library_libreofficekitgtk.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ libreofficekit/Library_libreofficekitgtk.mk
+@@ -26,4 +26,10 @@ $(eval $(call gb_Library_add_libs,libreo
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_add_libs,libreofficekitgtk,\
+    -lm \
+))
+endif
+
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-libreofficekit_Module__libreofficekit.mk
+++ b/misc/libreoffice/patches/patch-libreofficekit_Module__libreofficekit.mk
@@ -0,0 +1,28 @@
+$NetBSD: patch-libreofficekit_Module__libreofficekit.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- libreofficekit/Module_libreofficekit.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ libreofficekit/Module_libreofficekit.mk
+@@ -28,4 +28,23 @@ endif # ($(ENABLE_GTK),)
+ 
+ endif # ($(OS),LINUX)
+ 
+ifeq ($(OS),NETBSD)
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
+    CppunitTest_libreofficekit_tiledrendering \
+))
+
+ifneq ($(ENABLE_GTK),)
+$(eval $(call gb_Module_add_targets,libreofficekit,\
+    Library_libreofficekitgtk \
+    Executable_gtktiledviewer \
+))
+
+$(eval $(call gb_Module_add_targets,libreofficekit,\
+    Executable_tilebench \
+))
+endif # ($(ENABLE_GTK),)
+
+endif # ($(OS),NETBSD)
+
+ # vim: set ts=4 sw=4 et:
--- a/misc/libreoffice/patches/patch-odk_CustomTarget__classes.mk
+++ b/misc/libreoffice/patches/patch-odk_CustomTarget__classes.mk
@@ -0,0 +1,15 @@
+$NetBSD: patch-odk_CustomTarget__classes.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+* cp(1) of NetBSD 5.2 has no -a option
+
+--- odk/CustomTarget_classes.mk.orig	2013-08-21 11:40:03.000000000 +0000
+++ odk/CustomTarget_classes.mk
+@@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,odk/c
+ 
+ $(call gb_CustomTarget_get_workdir,odk/classes)/java.done: $(call gb_JavaClassSet_get_target,loader)
+ 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
+-	cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
+	cp -r $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
+ 	touch $@
+ 
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-odk_CustomTarget__javadoc.mk
+++ b/misc/libreoffice/patches/patch-odk_CustomTarget__javadoc.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-odk_CustomTarget__javadoc.mk,v 1.1 2015/09/23 20:48:44 joerg Exp $
+
+--- odk/CustomTarget_javadoc.mk.orig	2015-08-14 13:38:24.000000000 +0000
+++ odk/CustomTarget_javadoc.mk
+@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d
+ 		$(call gb_Jar_get_target,ridl)
+ 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
+ 	$(call gb_Helper_abbreviate_dirs,\
+-		$(JAVADOC) -J-Xmx120m -use -splitindex \
+		$(JAVADOC) -J-Xmx120m -use -splitindex -Xdoclint:none \
+ 		-windowtitle "Java UNO Runtime Reference" \
+ 		-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
+ 		-tag attention:a:"Attention:" \
--- a/misc/libreoffice/patches/patch-solenv_bin_ooinstall
+++ b/misc/libreoffice/patches/patch-solenv_bin_ooinstall
@@ -0,0 +1,19 @@
+$NetBSD: patch-solenv_bin_ooinstall,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- solenv/bin/ooinstall.orig	2015-07-31 00:32:43.000000000 +0000
+++ solenv/bin/ooinstall
+@@ -87,10 +87,10 @@ if ($is_windows) {
+ # make distro-pack-install shufle with the SDK installation to make it LSB compliant
+ # it creates symlinks from the orignal path to /usr/share; they are not valid with $DESTDIR
+ # and potential second ooinstall call fails with strange error messages if the old tree is still there
+-if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
+-    print "Cleaning destdir...\n";
+-    system ("rm -rf \"$ENV{DESTDIR}\"") && die "Failed to clean up destdir: $!";
+-}
+#if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
+#    print "Cleaning destdir...\n";
+#    system ("rm -rf \"$ENV{DESTDIR}\"") && die "Failed to clean up destdir: $!";
+#}
+ 
+ print "Running LibreOffice installer\n";
+ 
--- a/misc/libreoffice/patches/patch-solenv_gbuild_AllLangResTarget.mk
+++ b/misc/libreoffice/patches/patch-solenv_gbuild_AllLangResTarget.mk
@@ -0,0 +1,14 @@
+$NetBSD: patch-solenv_gbuild_AllLangResTarget.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+* Fix build. rsc command does not acceprt "-pthread", it is not needed.
+
+--- solenv/gbuild/AllLangResTarget.mk.orig	2013-08-21 11:40:03.000000000 +0000
+++ solenv/gbuild/AllLangResTarget.mk
+@@ -86,7 +86,6 @@ $(call gb_Helper_abbreviate_dirs,\
+ 	echo "-s \
+ 		$(INCLUDE) \
+ 		-I$(dir $(3)) \
+-		$(DEFS) \
+ 		-fp=$(1) \
+ 		$(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
+ 	$(gb_ResTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
--- a/misc/libreoffice/patches/patch-solenv_gbuild_ExternalProject.mk
+++ b/misc/libreoffice/patches/patch-solenv_gbuild_ExternalProject.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-solenv_gbuild_ExternalProject.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- solenv/gbuild/ExternalProject.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ solenv/gbuild/ExternalProject.mk
+@@ -218,7 +218,7 @@ define gb_ExternalProject_run
+ $(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\
+ 	touch $@,
+ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \
+-	unset Platform && \
+	(unset Platform || true) && \
+ 	$(if $(WRAPPERS),export $(WRAPPERS) &&) \
+ 	$(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \
+ 	$(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log))
--- a/misc/libreoffice/patches/patch-solenv_gbuild_Module.mk
+++ b/misc/libreoffice/patches/patch-solenv_gbuild_Module.mk
@@ -0,0 +1,15 @@
+$NetBSD: patch-solenv_gbuild_Module.mk,v 1.4 2015/08/12 00:57:20 ryoon Exp $
+
+* Disable never-ending test
+
+--- solenv/gbuild/Module.mk.orig	2015-01-22 20:05:28.000000000 +0000
+++ solenv/gbuild/Module.mk
+@@ -114,7 +114,7 @@ $(call gb_Module_get_target,%) :
+ .PHONY : all build build-l10n-only build-non-l10n-only unitcheck slowcheck subsequentcheck perfcheck clean check debugrun help showmodules translations
+ .DEFAULT_GOAL := all
+ 
+-all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck))
+all : build
+ 
+ build-tools : $(gb_BUILD_TOOLS)
+ 	$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
--- a/misc/libreoffice/patches/patch-svx_Executable__gengal.mk
+++ b/misc/libreoffice/patches/patch-svx_Executable__gengal.mk
@@ -0,0 +1,24 @@
+$NetBSD: patch-svx_Executable__gengal.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+https://bugs.documentfoundation.org/show_bug.cgi?id=89551
+
+--- svx/Executable_gengal.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ svx/Executable_gengal.mk
+@@ -74,6 +74,17 @@ $(eval $(call gb_Executable_add_libs,gen
+     -lGL \
+     -lX11 \
+ ))
+$(eval $(call gb_Executable_use_static_libraries,gengal,\
+	glxtest \
+))
+endif
+
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,gengal,\
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+ 
+ $(eval $(call gb_Executable_use_static_libraries,gengal,\
+ 	glxtest \
--- a/misc/libreoffice/patches/patch-sysui_desktop_share_create_tree.sh
+++ b/misc/libreoffice/patches/patch-sysui_desktop_share_create_tree.sh
@@ -0,0 +1,22 @@
+$NetBSD: patch-sysui_desktop_share_create_tree.sh,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- sysui/desktop/share/create_tree.sh.orig	2015-02-20 17:33:24.000000000 +0000
+++ sysui/desktop/share/create_tree.sh
+@@ -63,7 +63,7 @@ test -n "${OFFICE_PREFIX}" && office_pre
+ office_root=${office_prefix}/${PREFIX}
+ 
+ #this symlink is needed to have the API boostrap functions running right
+-ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}"
+ln -sf "${INSTALLDIR}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}"
+ 
+ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION}  ; then
+     # compat symlinks
+@@ -79,7 +79,7 @@ chmod 0644 "${DESTDIR}/${PREFIXDIR}/shar
+ 
+ mkdir -p "${DESTDIR}/${PREFIXDIR}/share/applications"
+ for i in `cat launcherlist`; do
+-  ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}"
+  ln -sf "${INSTALLDIR}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}"
+ done
+ 
+ mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata"
--- a/misc/libreoffice/patches/patch-vcl_Executable__icontest.mk
+++ b/misc/libreoffice/patches/patch-vcl_Executable__icontest.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-vcl_Executable__icontest.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Executable_icontest.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Executable_icontest.mk
+@@ -37,6 +37,17 @@ $(eval $(call gb_Executable_add_libs,ico
+ $(eval $(call gb_Executable_use_static_libraries,icontest,\
+ 	glxtest \
+ ))
+else ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,icontest,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,icontest,\
+	glxtest \
+))
+ else ifeq ($(OS),WNT)
+ 
+ $(eval $(call gb_Executable_use_system_win32_libs,icontest,\
--- a/misc/libreoffice/patches/patch-vcl_Executable__mtfdemo.mk
+++ b/misc/libreoffice/patches/patch-vcl_Executable__mtfdemo.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-vcl_Executable__mtfdemo.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Executable_mtfdemo.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Executable_mtfdemo.mk
+@@ -54,4 +54,17 @@ $(eval $(call gb_Executable_use_static_l
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,mtfdemo,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
+	glxtest \
+))
+endif
+
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-vcl_Executable__ui-previewer.mk
+++ b/misc/libreoffice/patches/patch-vcl_Executable__ui-previewer.mk
@@ -0,0 +1,24 @@
+$NetBSD: patch-vcl_Executable__ui-previewer.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+https://bugs.documentfoundation.org/show_bug.cgi?id=89551
+
+--- vcl/Executable_ui-previewer.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Executable_ui-previewer.mk
+@@ -48,4 +48,17 @@ $(eval $(call gb_Executable_use_static_l
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,ui-previewer,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\
+	glxtest \
+))
+endif
+
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-vcl_Executable__vcldemo.mk
+++ b/misc/libreoffice/patches/patch-vcl_Executable__vcldemo.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-vcl_Executable__vcldemo.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Executable_vcldemo.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Executable_vcldemo.mk
+@@ -55,4 +55,17 @@ $(eval $(call gb_Executable_use_static_l
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Executable_add_libs,vcldemo,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,vcldemo,\
+	glxtest \
+))
+endif
+
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-vcl_Librarydesktopdetector.mk
+++ b/misc/libreoffice/patches/patch-vcl_Librarydesktopdetector.mk
@@ -0,0 +1,16 @@
+$NetBSD: patch-vcl_Library__desktop__detector.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Library_desktop_detector.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Library_desktop_detector.mk
+@@ -71,4 +71,11 @@ $(eval $(call gb_Library_add_libs,deskto
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_add_libs,desktop_detector,\
+	-lm \
+	-lpthread \
+))
+endif
+
+ # vim: set noet sw=4 ts=4:
--- a/misc/libreoffice/patches/patch-vcl_Library__vcl.mk
+++ b/misc/libreoffice/patches/patch-vcl_Library__vcl.mk
@@ -0,0 +1,33 @@
+$NetBSD: patch-vcl_Library__vcl.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Library_vcl.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Library_vcl.mk
+@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_custom_head
+ ))
+ 
+ $(eval $(call gb_Library_use_externals,vcl,\
+-	$(if $(filter LINUX MACOSX,$(OS)), \
+	$(if $(filter LINUX MACOSX NETBSD,$(OS)), \
+ 		curl) \
+ 	jpeg \
+ 	$(if $(filter-out WNT,$(OS)), \
+@@ -730,6 +730,19 @@ $(eval $(call gb_Library_add_exception_o
+ ))
+ endif
+ 
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_add_libs,vcl,\
+	-lm \
+	-lpthread \
+    -lGL \
+    -lX11 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+	vcl/opengl/x11/X11DeviceInfo \
+))
+endif
+
+ # Runtime dependency for unit-tests
+ $(eval $(call gb_Library_use_restarget,vcl,vcl))
+ 
--- a/misc/libreoffice/patches/patch-vcl_Module__vcl.mk
+++ b/misc/libreoffice/patches/patch-vcl_Module__vcl.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-vcl_Module__vcl.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+
+--- vcl/Module_vcl.mk.orig	2015-07-31 00:32:43.000000000 +0000
+++ vcl/Module_vcl.mk
+@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,
+         StaticLibrary_vclmain \
+ 		$(if $(ENABLE_HEADLESS),, \
+ 			Executable_ui-previewer) \
+-		$(if $(filter LINUX MACOSX WNT,$(OS)), \
+		$(if $(filter LINUX MACOSX WNT NETBSD,$(OS)), \
+ 			Executable_outdevgrind \
+ 			$(if $(ENABLE_HEADLESS),, \
+ 				Executable_vcldemo \
--- a/misc/libreoffice4-bin/Makefile
+++ b/misc/libreoffice4-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/05/14 18:27:38 bad Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/05 12:34:52 ryoon Exp $

 DISTNAME=		libreoffice4-bin	# overridden below
 PKGNAME=		libreoffice4-bin-${OO_RELEASE}
@@ -20,9 +20,9 @@ CONFLICTS+=		openoffice-linux-[0-9]*
 CONFLICTS+=		libreoffice3-bin-[0-9]*

 OO_VER=			4
-OO_BASEVER=		4.4
-OO_RELEASE=		4.4.3
-OO_RELEASEV=		4.4.3.2
+OO_BASEVER=		${OO_VER}.4
+OO_RELEASE=		${OO_BASEVER}.5
+OO_RELEASEV=		${OO_RELEASE}.2
 PLIST_SUBST+=		VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
--- a/misc/libreoffice4-bin/distinfo
+++ b/misc/libreoffice4-bin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/05/14 18:27:38 bad Exp $
+$NetBSD: distinfo,v 1.12 2015/08/06 23:56:20 ryoon Exp $

-SHA1 (LibreOffice_4.4.3_Linux_x86-64_rpm.tar.gz) = 4023d4983286325da4ce61993ccc2b68065592cc
-RMD160 (LibreOffice_4.4.3_Linux_x86-64_rpm.tar.gz) = ea93df2bd24e113679e2f45d6f522484edf144a5
-Size (LibreOffice_4.4.3_Linux_x86-64_rpm.tar.gz) = 229593995 bytes
-SHA1 (LibreOffice_4.4.3_Linux_x86_rpm.tar.gz) = 4521e98d44c9d86d0d73aafcf503e75cff368a1c
-RMD160 (LibreOffice_4.4.3_Linux_x86_rpm.tar.gz) = 1c7fc1fe9655ae570f675f230b05b69b0972b9ca
-Size (LibreOffice_4.4.3_Linux_x86_rpm.tar.gz) = 213049472 bytes
+SHA1 (LibreOffice_4.4.5_Linux_x86-64_rpm.tar.gz) = e248b5119644a36953b88b2ab362ae626a8df05e
+RMD160 (LibreOffice_4.4.5_Linux_x86-64_rpm.tar.gz) = c4595c2bd15211d2c7e60366e7070752e78bff54
+Size (LibreOffice_4.4.5_Linux_x86-64_rpm.tar.gz) = 229543691 bytes
+SHA1 (LibreOffice_4.4.5_Linux_x86_rpm.tar.gz) = 446332d28edf3e79d3fe5b43ca12c06a9d7678f9
+RMD160 (LibreOffice_4.4.5_Linux_x86_rpm.tar.gz) = 363631892301954a77be673efa12862b67e1ef13
+Size (LibreOffice_4.4.5_Linux_x86_rpm.tar.gz) = 213018700 bytes
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.71 2015/06/12 10:50:34 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2015/09/23 20:47:42 joerg Exp $

-VERREL=		4.4.3
+VERREL=		4.4.5
 VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
@@ -69,7 +69,6 @@ MORE_DISTFILES= \
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip \
 	b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz \
 	c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz \
-	46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 \
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip \
 	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip \
 	e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip \
@@ -129,14 +128,14 @@ HAS_CONFIGURE=		yes
 # Do not use /tmp, outside of WRKSRC.
 CONFIGURE_ENV+=		TMPDIR=${WRKSRC}/tmp

-.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
-CONFIGURE_ARGS+=	--with-parallelism=1
-.else
-# --with-parallelism conficts with -jN.
-MAKE_JOBS_SAFE=		no
+MAKE_JOBS_SAFE=		no # --with-parallelism conficts with -jN
+.if !empty(MAKE_JOBS)
 CONFIGURE_ARGS+=	--with-parallelism=${MAKE_JOBS}
+.else
+CONFIGURE_ARGS+=	--with-parallelism=1
 .endif

+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${PKGNAME_NOREV}
 CONFIGURE_ARGS+=	--disable-ccache
 CONFIGURE_ARGS+=	--enable-dbus
@@ -228,6 +227,14 @@ post-extract:
 	mkdir ${WRKSRC}/tmp
 #	mkdir ${WRKSRC}/${OBJDIR}

+.if !empty(PKG_OPTIONS:Mjava)
+CONFIGURE_ARGS+=	JAVADOC=${TOOLS_DIR}/bin/javadoc
+
+pre-configure:
+	printf '#!/bin/sh\nexec ${PKG_JAVA_HOME}/bin/javadoc -Xdoclint:none "$$@"' > ${TOOLS_DIR}/bin/javadoc
+	${CHMOD} a+x ${TOOLS_DIR}/bin/javadoc
+.endif
+
 do-install:
 	cd ${WRKSRC} && make DESTDIR="${DESTDIR}" PREFIXDIR="${PREFIX}" distro-pack-install
 # make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed.
@@ -256,9 +263,10 @@ do-install:
 .include "../../converters/libvisio/buildlink3.mk"
 .include "../../converters/libwpd/buildlink3.mk"
 .include "../../converters/libwpg/buildlink3.mk"
-.include "../../converters/libwps/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libwps+=	libwps<0.4.0
+.include "../../converters/libwps03/buildlink3.mk"
 .include "../../converters/libmwaw/buildlink3.mk"
-.include "../../converters/orcus/buildlink3.mk"
+.include "../../converters/orcus0.8/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
--- a/misc/libreoffice4/PLIST
+++ b/misc/libreoffice4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/03/12 02:59:04 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.14 2015/07/05 08:27:41 ryoon Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -137,6 +137,7 @@ ${PKGNAME}/program/libepslo.so
 ${PKGNAME}/program/libeptlo.so
 ${PKGNAME}/program/liberalo.so
 ${PKGNAME}/program/libetilo.so
+${PLIST.kde4}${PKGNAME}/program/libkde4be1lo.so
 ${PKGNAME}/program/libevtattlo.so
 ${PKGNAME}/program/libexplo.so
 ${PKGNAME}/program/libexpwraplo.so
@@ -8926,6 +8927,115 @@ ${PKGNAME}/share/config/soffice.cfg/modules/scalc/ui/validationhelptabpage.ui
 ${PKGNAME}/share/config/soffice.cfg/modules/scalc/ui/xmlsourcedialog.ui
 ${PKGNAME}/share/config/soffice.cfg/modules/scalc/ui/ztestdialog.ui
 ${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/griddialog.ui
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/af.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/am.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ar.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/as.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ast.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/be.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/bg.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/bn-IN.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/bn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/bo.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/br.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/brx.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/bs.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ca-valencia.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ca.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/cs.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/cy.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/da.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/de.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/dgo.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/dz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/el.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/en-GB.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/en-ZA.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/eo.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/es.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/et.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/eu.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/fa.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/fi.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/fr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ga.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/gd.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/gl.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/gu.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/he.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/hi.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/hr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/hu.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/id.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/is.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/it.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ja.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ka.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/kk.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/km.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/kmr-Latn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/kn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ko.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/kok.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ks.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/lb.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/lo.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/lt.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/lv.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/mai.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/mk.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ml.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/mn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/mni.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/mr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/my.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/nb.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ne.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/nl.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/nn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/nr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/nso.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/oc.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/om.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/or.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/pa-IN.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/pl.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/pt-BR.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/pt.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ro.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ru.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/rw.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sa-IN.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sat.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sd.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/si.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sid.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sk.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sl.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sq.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sr-Latn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ss.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/st.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sv.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/sw-TZ.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ta.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/te.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/tg.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/th.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/tn.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/tr.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ts.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/tt.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ug.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/uk.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/uz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/ve.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/vi.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/xh.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/zh-CN.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/zh-TW.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/res/zu.zip
 ${PKGNAME}/share/config/soffice.cfg/modules/scanner/ui/sanedialog.ui
 ${PKGNAME}/share/config/soffice.cfg/modules/schart/menubar/menubar.xml
 ${PKGNAME}/share/config/soffice.cfg/modules/schart/statusbar/statusbar.xml
@@ -14029,83 +14139,3 @@ share/mimelnk/application/libreoffice-spreadsheet-template.desktop
 share/mimelnk/application/libreoffice-spreadsheet.desktop
 share/mimelnk/application/libreoffice-text-template.desktop
 share/mimelnk/application/libreoffice-text.desktop
-@pkgdir share/applications
-@pkgdir ${PKGNAME}/share/uno_packages/cache/uno_packages
-@pkgdir ${PKGNAME}/share/autotext/zu
-@pkgdir ${PKGNAME}/share/autotext/xh
-@pkgdir ${PKGNAME}/share/autotext/ve
-@pkgdir ${PKGNAME}/share/autotext/uz
-@pkgdir ${PKGNAME}/share/autotext/uk
-@pkgdir ${PKGNAME}/share/autotext/ug
-@pkgdir ${PKGNAME}/share/autotext/tt
-@pkgdir ${PKGNAME}/share/autotext/ts
-@pkgdir ${PKGNAME}/share/autotext/tn
-@pkgdir ${PKGNAME}/share/autotext/th
-@pkgdir ${PKGNAME}/share/autotext/tg
-@pkgdir ${PKGNAME}/share/autotext/te
-@pkgdir ${PKGNAME}/share/autotext/ta
-@pkgdir ${PKGNAME}/share/autotext/sw-TZ
-@pkgdir ${PKGNAME}/share/autotext/st
-@pkgdir ${PKGNAME}/share/autotext/ss
-@pkgdir ${PKGNAME}/share/autotext/sr-Latn
-@pkgdir ${PKGNAME}/share/autotext/sr
-@pkgdir ${PKGNAME}/share/autotext/sq
-@pkgdir ${PKGNAME}/share/autotext/sid
-@pkgdir ${PKGNAME}/share/autotext/si
-@pkgdir ${PKGNAME}/share/autotext/sd
-@pkgdir ${PKGNAME}/share/autotext/sat
-@pkgdir ${PKGNAME}/share/autotext/sa-IN
-@pkgdir ${PKGNAME}/share/autotext/rw
-@pkgdir ${PKGNAME}/share/autotext/pa-IN
-@pkgdir ${PKGNAME}/share/autotext/or
-@pkgdir ${PKGNAME}/share/autotext/om
-@pkgdir ${PKGNAME}/share/autotext/oc
-@pkgdir ${PKGNAME}/share/autotext/nso
-@pkgdir ${PKGNAME}/share/autotext/nr
-@pkgdir ${PKGNAME}/share/autotext/nn
-@pkgdir ${PKGNAME}/share/autotext/ne
-@pkgdir ${PKGNAME}/share/autotext/nb
-@pkgdir ${PKGNAME}/share/autotext/my
-@pkgdir ${PKGNAME}/share/autotext/mr
-@pkgdir ${PKGNAME}/share/autotext/mni
-@pkgdir ${PKGNAME}/share/autotext/ml
-@pkgdir ${PKGNAME}/share/autotext/mk
-@pkgdir ${PKGNAME}/share/autotext/mai
-@pkgdir ${PKGNAME}/share/autotext/lv
-@pkgdir ${PKGNAME}/share/autotext/lo
-@pkgdir ${PKGNAME}/share/autotext/lb
-@pkgdir ${PKGNAME}/share/autotext/ks
-@pkgdir ${PKGNAME}/share/autotext/kok
-@pkgdir ${PKGNAME}/share/autotext/kn
-@pkgdir ${PKGNAME}/share/autotext/kmr-Latn
-@pkgdir ${PKGNAME}/share/autotext/kk
-@pkgdir ${PKGNAME}/share/autotext/ka
-@pkgdir ${PKGNAME}/share/autotext/id
-@pkgdir ${PKGNAME}/share/autotext/hi
-@pkgdir ${PKGNAME}/share/autotext/he
-@pkgdir ${PKGNAME}/share/autotext/gu
-@pkgdir ${PKGNAME}/share/autotext/gl
-@pkgdir ${PKGNAME}/share/autotext/gd
-@pkgdir ${PKGNAME}/share/autotext/ga
-@pkgdir ${PKGNAME}/share/autotext/eu
-@pkgdir ${PKGNAME}/share/autotext/et
-@pkgdir ${PKGNAME}/share/autotext/eo
-@pkgdir ${PKGNAME}/share/autotext/el
-@pkgdir ${PKGNAME}/share/autotext/dz
-@pkgdir ${PKGNAME}/share/autotext/dgo
-@pkgdir ${PKGNAME}/share/autotext/cy
-@pkgdir ${PKGNAME}/share/autotext/ca-valencia
-@pkgdir ${PKGNAME}/share/autotext/bs
-@pkgdir ${PKGNAME}/share/autotext/brx
-@pkgdir ${PKGNAME}/share/autotext/br
-@pkgdir ${PKGNAME}/share/autotext/bo
-@pkgdir ${PKGNAME}/share/autotext/bn-IN
-@pkgdir ${PKGNAME}/share/autotext/bn
-@pkgdir ${PKGNAME}/share/autotext/be
-@pkgdir ${PKGNAME}/share/autotext/ast
-@pkgdir ${PKGNAME}/share/autotext/as
-@pkgdir ${PKGNAME}/share/autotext/ar
-@pkgdir ${PKGNAME}/share/autotext/am
-@pkgdir ${PKGNAME}/share/autotext/af
-@pkgdir ${PKGNAME}/presets/uno_packages
-@pkgdir ${PKGNAME}/presets/psprint
--- a/misc/libreoffice4/PLIST.java
+++ b/misc/libreoffice4/PLIST.java
@@ -1,14 +1,28 @@
-@comment $NetBSD: PLIST.java,v 1.8 2015/03/12 15:01:25 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.9 2015/07/30 21:56:30 ryoon Exp $
 ${PKGNAME}/program/classes/ScriptFramework.jar
 ${PKGNAME}/program/classes/ScriptProviderForBeanShell.jar
 ${PKGNAME}/program/classes/ScriptProviderForJava.jar
 ${PKGNAME}/program/classes/XMergeBridge.jar
 ${PKGNAME}/program/classes/bsh.jar
+${PKGNAME}/program/classes/commons-logging-1.2.jar
 ${PKGNAME}/program/classes/commonwizards.jar
+${PKGNAME}/program/classes/flow-engine.jar
+${PKGNAME}/program/classes/flute-1.1.6.jar
 ${PKGNAME}/program/classes/form.jar
+${PKGNAME}/program/classes/libbase-1.1.6.jar
+${PKGNAME}/program/classes/libfonts-1.1.6.jar
+${PKGNAME}/program/classes/libformula-1.1.7.jar
+${PKGNAME}/program/classes/liblayout.jar
+${PKGNAME}/program/classes/libloader-1.1.6.jar
+${PKGNAME}/program/classes/librepository-1.1.6.jar
+${PKGNAME}/program/classes/libserializer-1.1.6.jar
+${PKGNAME}/program/classes/libxml-1.1.7.jar
 ${PKGNAME}/program/classes/officebean.jar
 ${PKGNAME}/program/classes/query.jar
 ${PKGNAME}/program/classes/report.jar
+${PKGNAME}/program/classes/reportbuilder.jar
+${PKGNAME}/program/classes/reportbuilderwizard.jar
+${PKGNAME}/program/classes/sac.jar
 ${PKGNAME}/program/classes/sdbc_hsqldb.jar
 ${PKGNAME}/program/classes/smoketest.jar
 ${PKGNAME}/program/classes/table.jar
@@ -17,6 +31,9 @@ ${PKGNAME}/program/classes/xmerge.jar
 ${PKGNAME}/program/libhsqldb.so
 ${PKGNAME}/program/libjdbclo.so
 ${PKGNAME}/program/libofficebean.so
+${PKGNAME}/program/librptlo.so
+${PKGNAME}/program/librptuilo.so
+${PKGNAME}/program/librptxmllo.so
 ${PKGNAME}/program/services/scriptproviderforbeanshell.rdb
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/capitalise.bsh
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/parcel-descriptor.xml
@@ -2720,6 +2737,48 @@ ${PKGNAME}/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
 ${PKGNAME}/share/extensions/wiki-publisher/mediawiki.jar
 ${PKGNAME}/share/extensions/wiki-publisher/registration/LICENSE
 ${PKGNAME}/share/extensions/wiki-publisher/templates/MediaWiki/mediawiki.ott
+${PKGNAME}/share/man/man1/libreoffice.1
+${PKGNAME}/share/man/man1/libreoffice.1.gz
+${PKGNAME}/share/man/man1/lobase.1
+${PKGNAME}/share/man/man1/lobase.1.gz
+${PKGNAME}/share/man/man1/localc.1
+${PKGNAME}/share/man/man1/localc.1.gz
+${PKGNAME}/share/man/man1/lodraw.1
+${PKGNAME}/share/man/man1/lodraw.1.gz
+${PKGNAME}/share/man/man1/loffice.1
+${PKGNAME}/share/man/man1/loffice.1.gz
+${PKGNAME}/share/man/man1/lofromtemplate.1
+${PKGNAME}/share/man/man1/lofromtemplate.1.gz
+${PKGNAME}/share/man/man1/loimpress.1
+${PKGNAME}/share/man/man1/loimpress.1.gz
+${PKGNAME}/share/man/man1/lomath.1
+${PKGNAME}/share/man/man1/lomath.1.gz
+${PKGNAME}/share/man/man1/loweb.1
+${PKGNAME}/share/man/man1/loweb.1.gz
+${PKGNAME}/share/man/man1/lowriter.1
+${PKGNAME}/share/man/man1/lowriter.1.gz
+${PKGNAME}/share/man/man1/oobase.1
+${PKGNAME}/share/man/man1/oobase.1.gz
+${PKGNAME}/share/man/man1/oocalc.1
+${PKGNAME}/share/man/man1/oocalc.1.gz
+${PKGNAME}/share/man/man1/oodraw.1
+${PKGNAME}/share/man/man1/oodraw.1.gz
+${PKGNAME}/share/man/man1/ooffice.1
+${PKGNAME}/share/man/man1/ooffice.1.gz
+${PKGNAME}/share/man/man1/oofromtemplate.1
+${PKGNAME}/share/man/man1/oofromtemplate.1.gz
+${PKGNAME}/share/man/man1/ooimpress.1
+${PKGNAME}/share/man/man1/ooimpress.1.gz
+${PKGNAME}/share/man/man1/oomath.1
+${PKGNAME}/share/man/man1/oomath.1.gz
+${PKGNAME}/share/man/man1/ooweb.1
+${PKGNAME}/share/man/man1/ooweb.1.gz
+${PKGNAME}/share/man/man1/oowriter.1
+${PKGNAME}/share/man/man1/oowriter.1.gz
+${PKGNAME}/share/man/man1/unopkg.1
+${PKGNAME}/share/man/man1/unopkg.1.gz
+${PKGNAME}/share/registry/reportbuilder.xcd
+${PKGNAME}/share/template/common/wizard/report/default.otr
 ${PKGNAME}/ure/bin/javaldx
 ${PKGNAME}/ure/lib/JREProperties.class
 ${PKGNAME}/ure/lib/libjava_uno.so
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2015/05/12 23:17:07 ryoon Exp $
+$NetBSD: distinfo,v 1.43 2015/09/23 20:45:50 joerg Exp $

 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -57,9 +57,6 @@ Size (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610
 SHA1 (libreoffice/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz) = 8a5d58aa4bb8752375eff51db9f701c269d1831e
 RMD160 (libreoffice/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz) = b89878cad47646db5562d76c81f458612a58433c
 Size (libreoffice/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz) = 4910188 bytes
-SHA1 (libreoffice/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2) = 04acc2c13485f8b9e714a5d2b4eb3e77f643d23e
-RMD160 (libreoffice/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2) = 140bfb05af718d59474dd9992b6af794ff0ca99f
-Size (libreoffice/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2) = 474208 bytes
 SHA1 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 84b40d7f8bb0cd085dd70b3abed197133d761557
 RMD160 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 99ee3851f3f1ae9a431541de5765312f01ef19d7
 Size (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 2285857 bytes
@@ -135,28 +132,36 @@ Size (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 b
 SHA1 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 5ecb895ffc1eff2c381fa78d2197d0c57422b3df
 RMD160 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 575a7daf02efbab9ea972e03a6870f7f13112806
 Size (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 bytes
-SHA1 (libreoffice/libreoffice-4.4.3.2.tar.xz) = 0b7b553d72de80b21d4055502fddbc7dee7289c3
-RMD160 (libreoffice/libreoffice-4.4.3.2.tar.xz) = e308d8ef4ca0cde5c6a7b0aa2192b49046ba4758
-Size (libreoffice/libreoffice-4.4.3.2.tar.xz) = 164320100 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-4.4.3.2.tar.xz) = 831a4fa23d674f9084053893a98e3e57762b21c1
-RMD160 (libreoffice/libreoffice-dictionaries-4.4.3.2.tar.xz) = e29131ff8a04fd9895acef24b2bbb8d6ebdaf447
-Size (libreoffice/libreoffice-dictionaries-4.4.3.2.tar.xz) = 37088104 bytes
-SHA1 (libreoffice/libreoffice-help-4.4.3.2.tar.xz) = bbbf93f224ebc0aa3c06c52d5aef855d4c2df7c1
-RMD160 (libreoffice/libreoffice-help-4.4.3.2.tar.xz) = 5047edfebc90c7efc862a21a35ec7f532cbe8052
-Size (libreoffice/libreoffice-help-4.4.3.2.tar.xz) = 1875884 bytes
-SHA1 (libreoffice/libreoffice-translations-4.4.3.2.tar.xz) = 3067f3c05c0b717237429c88070f026c01d84363
-RMD160 (libreoffice/libreoffice-translations-4.4.3.2.tar.xz) = 5dd6c52ea57585acad36b98247531e74f8f049fb
-Size (libreoffice/libreoffice-translations-4.4.3.2.tar.xz) = 127857520 bytes
+SHA1 (libreoffice/libreoffice-4.4.5.2.tar.xz) = dca6d5f31facfa28661909700e1eba5e69da9d2a
+RMD160 (libreoffice/libreoffice-4.4.5.2.tar.xz) = 46ba5f44652f69a249f3134cdffbc6a6abb6e779
+Size (libreoffice/libreoffice-4.4.5.2.tar.xz) = 164472672 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-4.4.5.2.tar.xz) = 1d5844b77cae947f1827bc520d376faf59c43dd5
+RMD160 (libreoffice/libreoffice-dictionaries-4.4.5.2.tar.xz) = f4cdf7695c390a5c01e668da50a7bda948b011ec
+Size (libreoffice/libreoffice-dictionaries-4.4.5.2.tar.xz) = 37163812 bytes
+SHA1 (libreoffice/libreoffice-help-4.4.5.2.tar.xz) = b6e28c5944072a478237c97188dbbdd5a271c867
+RMD160 (libreoffice/libreoffice-help-4.4.5.2.tar.xz) = 4ccf48f60fbba4a1ec796c46eee026661ee44260
+Size (libreoffice/libreoffice-help-4.4.5.2.tar.xz) = 1876044 bytes
+SHA1 (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = fd2acb72f1109f78d38663f3089f48c7aebbea8c
+RMD160 (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = 5b7ee3094d78013ea8eb6c743e1b499d512f31dd
+Size (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = 127872924 bytes
 SHA1 (patch-Makefile.in) = e34092a731f4da0d8c048945c75287327b6b9cb2
 SHA1 (patch-bin_distro-install-desktop-integration) = 78921a0fb6db8b87f5d64c09579dc6f9211949b5
-SHA1 (patch-configure.ac) = 271be73ef8ed5e507660098a92b98eeca85bb62f
+SHA1 (patch-configure.ac) = ff940ab10b913d24bc6b7a8e7c2f8f3c16673ab7
 SHA1 (patch-desktop_Library__sofficeapp.mk) = e445b1a265fadf4f83f1c40bc541c11c26860352
+SHA1 (patch-external_jfreereport_java_sac_build.xml) = 675a37dcf3a813f890ec2c28cb7c6b0948610445
+SHA1 (patch-external_libebook_ExternalProject__libebook.mk) = a9c2f7d30cf8efc7acea4d4a0523bad801c9b930
+SHA1 (patch-external_libmspub_ExternalProject__libmspub.mk) = 4c3555003d53c896935b74251847711b67eaa18d
+SHA1 (patch-external_liborcus_ExternalProject__liborcus.mk) = 637058d2c5e930db086238773ccb926997a1de46
+SHA1 (patch-external_librevenge_ExternalProject__librevenge.mk) = 334e4295af4a59459c304ff2d20176d16c07477c
 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
+SHA1 (patch-odk_CustomTarget__javadoc.mk) = e4ba79d7109b51d44338353790b7587d8d0a4dda
 SHA1 (patch-solenv_bin_ooinstall) = 3c9be63acc0af31ca0509f6546ae02ac53aff878
 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
 SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb
 SHA1 (patch-solenv_gbuild_ExternalProject.mk) = dd55f3e5fd17f6060898c68a7e1d97e647d4b5b1
 SHA1 (patch-solenv_gbuild_Module.mk) = 729f051341b21325537a7f9902e7283caa66a456
+SHA1 (patch-solenv_gbuild_platform_com__GCC__defs.mk) = 72e53e2f554714878853b4998fcac4ac20560e18
+SHA1 (patch-solenv_gbuild_platform_com__MSC__defs.mk) = 4d91f1ba84cee9cf1503736c41548e96507d6a1a
 SHA1 (patch-svx_Executable__gengal.mk) = 45de03599790cabea05539b4bb9fd01098c25eb8
 SHA1 (patch-sw_Executable__tiledrendering.mk) = a1a4c520582772526d821a78e42a23e182cdfba1
 SHA1 (patch-sysui_desktop_share_create_tree.sh) = 338cb0f157ea9b49965aa7b31350173b8b7557a6
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2015/03/16 18:16:26 ryoon Exp $
+# $NetBSD: options.mk,v 1.11 2015/07/30 21:56:30 ryoon Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-jdk-home=${PKG_JAVA_HOME} \
 			--without-system-beanshell \
 			--enable-scripting-beanshell \
-			--disable-report-builder \
-			--with-system-hsqldb
+			--with-system-hsqldb \
+			--without-system-jfreereport
 PLIST_SRC+=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
 .  if !empty(PKG_JVM:Mopenjdk7)
 CONFIGURE_ARGS+=	--disable-scripting-javascript
--- a/Show More
+++ b/Show More