Bump PKGREVISION

* Accept python27
* Support debug build and target for debugging
Mostly from richard@.

6 files changed, 126 insertions, 15 deletions

diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 6a94646371b..4d3e1a415b6 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2014/06/18 09:28:16 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2014/06/22 23:59:35 ryoon Exp $
 
 VER=		4.2.4.2
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/4.2.4/
 EXTRACT_SUFX=	.tar.xz
@@ -26,8 +26,6 @@ CHECK_SHLIBS_SUPPORTED=	no
 
 DIST_SUBDIR=	libreoffice
 
-PYTHON_VERSIONS_ACCEPTED=	33
-
 LO_BOOTSTRAP=	${DISTNAME}
 LO_COMPONENTS=	dictionaries help translations
 
@@ -198,6 +196,11 @@ 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}
diff --git a/misc/libreoffice4/PLIST.debug b/misc/libreoffice4/PLIST.debug
new file mode 100644
index 00000000000..d8ee1514326
--- /dev/null
+++ b/misc/libreoffice4/PLIST.debug
@@ -0,0 +1,86 @@
+@comment $NetBSD: PLIST.debug,v 1.1 2014/06/22 23:59:35 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/spaqtz.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/textconversiondlgsqtz.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/modules/BasicIDE/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/modules/scalc/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/swriter/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/sfx/ui/res/qtz.zip
+${PKGNAME}/share/config/soffice.cfg/spa/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
+@pkgdir ${PKGNAME}/share/autotext/qtz
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index 3d954483fe3..a9731d9c0c2 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2014/06/03 03:21:39 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2014/06/22 23:59:35 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -138,9 +138,9 @@ Size (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 127819696 bytes
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx) = b7eb550e24f6fa5ff5a6c4121836803360a0883f
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 5e02fb3bf5b446ed705b1ca4d6e38d9d3dbd73b6
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = b01d697451973a873247a370ebec2cd5c3a8029d
-SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 2becfe2404078ad6729c236dcc39994dc277eca6
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = de4e7978cd364d3aff5d1495199f60759c53380e
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17
-SHA1 (patch-configure.ac) = 63ebfaae5d119dad6ce87d221fc71598b25f0b93
+SHA1 (patch-configure.ac) = 181d1b37eebe892cb0999d55c0d0de0ce286a332
 SHA1 (patch-connectivity_source_parse_sqlbison.y) = 2dd006e2a039a4dddaca4357466bb45f3a1e0cd1
 SHA1 (patch-i18npool_CustomTarget__collator.mk) = 8d5304470e47f48e0febdbe0072bf99016334828
 SHA1 (patch-i18npool_Library__collator__data.mk) = a50574288ed7d6ad0bf45b6f0c30ad63a4043721
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk
index ca8e6b66a1b..c45d0f46d7c 100644
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/03 03:21:39 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2014/06/22 23:59:35 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-system-hsqldb
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
-PLIST_SRC+=		${PLIST_SRC_DFLT:Q} PLIST.java
+PLIST_SRC+=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
 PLIST.java=		yes
 .else
 CONFIGURE_ARGS+=	--without-java
@@ -41,6 +41,7 @@ CONFIGURE_ARGS+=	--without-java
 .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
diff --git a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx
index b1f8ede0c82..16cd632fa3b 100644
--- a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.4 2014/06/01 14:31:08 ryoon Exp $
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.5 2014/06/22 23:59:36 ryoon Exp $
 
 --- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig	2014-04-30 19:49:45.000000000 +0000
 +++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -35,16 +35,16 @@ $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.4 2014/
  namespace CPPU_CURRENT_NAMESPACE
  {
  
-@@ -101,6 +127,9 @@ extern "C" void __cxa_throw(
-     __attribute__((noreturn));
+@@ -102,6 +128,9 @@ extern "C" void __cxa_throw(
  }
  #endif
-+
+ 
 +
 +#endif
- 
++
  namespace CPPU_CURRENT_NAMESPACE
  {
+ 
 @@ -110,7 +139,11 @@ void raiseException(
      uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
  //==================================================================================================
diff --git a/misc/libreoffice4/patches/patch-configure.ac b/misc/libreoffice4/patches/patch-configure.ac
index cafc984a5b3..0d24b68a5bc 100644
--- a/misc/libreoffice4/patches/patch-configure.ac
+++ b/misc/libreoffice4/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.4 2014/06/01 14:31:08 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.5 2014/06/22 23:59:36 ryoon Exp $
 
 * Improve portability, replace == with =
 * Detect pkgsrc apache-ant library
@@ -24,6 +24,27 @@ $NetBSD: patch-configure.ac,v 1.4 2014/06/01 14:31:08 ryoon Exp $
          dnl gcc#19664, gcc#22482, rhbz#162935
          AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
          AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
+@@ -7986,7 +7988,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
+             AC_MSG_RESULT([internal])
+@@ -8039,9 +8041,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'));"`
 @@ -8929,7 +8931,7 @@ SYSTEM_GENBRK=
  SYSTEM_GENCCODE=
  SYSTEM_GENCMN=