Update to 0.12.1

Changelog:
May 2014 update 0.12.1
-------------------------------------------------

This is a stability improvement release and we suggest to use it instead of 0.12

Bug fixes:
  reassign tags to changesets when performing merging of old and new history during incremental reindex fixes #819
  create file which stores the latest cached revision also when renamed file handling is disabled fixes #818
  Made the limitations on JavaDB versions explicit

6 files changed, 23 insertions, 38 deletions

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 1badeeea3b4..79bdee4bf23 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2014/04/09 07:27:06 obache Exp $
+# $NetBSD: Makefile,v 1.33 2014/10/06 13:36:43 ryoon Exp $
 
-DISTNAME=	OpenGrok-0.12-rc5
+DISTNAME=	OpenGrok-0.12.1
 PKGNAME=	${DISTNAME:tl:S/-rc/rc/}
-PKGREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	-https://github.com/OpenGrok/OpenGrok/archive/0.12-rc5.tar.gz
+MASTER_SITES=	-https://github.com/OpenGrok/OpenGrok/archive/0.12.1.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://opengrok.github.io/OpenGrok/
diff --git a/devel/opengrok/PLIST b/devel/opengrok/PLIST
index e687de47ec5..deca1b6f02d 100644
--- a/devel/opengrok/PLIST
+++ b/devel/opengrok/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2013/12/31 22:56:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/10/06 13:36:43 ryoon Exp $
 share/examples/opengrok/paths.tsv
 share/opengrok/README.txt
 share/opengrok/bin/OpenGrok
 share/opengrok/lib/lib/ant.jar
 share/opengrok/lib/lib/bcel-5.2.jar
 share/opengrok/lib/lib/jrcs.jar
-share/opengrok/lib/lib/lucene-analyzers-common-4.6.0.jar
-share/opengrok/lib/lib/lucene-core-4.6.0.jar
-share/opengrok/lib/lib/lucene-queryparser-4.6.0.jar
-share/opengrok/lib/lib/lucene-suggest-4.6.0.jar
+share/opengrok/lib/lib/lucene-analyzers-common-4.7.1.jar
+share/opengrok/lib/lib/lucene-core-4.7.1.jar
+share/opengrok/lib/lib/lucene-queryparser-4.7.1.jar
+share/opengrok/lib/lib/lucene-suggest-4.7.1.jar
 share/opengrok/lib/lib/servlet-api.jar
 share/opengrok/lib/lib/swing-layout-0.9.jar
 share/opengrok/lib/opengrok.jar
diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo
index 76a076f59b8..d07ae76815b 100644
--- a/devel/opengrok/distinfo
+++ b/devel/opengrok/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/12/31 22:56:12 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2014/10/06 13:36:43 ryoon Exp $
 
-SHA1 (OpenGrok-0.12-rc5.tar.gz) = 0e52ae39f9c470949c83cc4d9cf8a7c3f1610818
-RMD160 (OpenGrok-0.12-rc5.tar.gz) = d4163cac0b399b49ad810d2ff4bca0f9e32771cf
-Size (OpenGrok-0.12-rc5.tar.gz) = 1534049 bytes
-SHA1 (patch-OpenGrok) = 0771b0aec425538b9141addfa6c9a040b1562614
-SHA1 (patch-build.xml) = ff098c5c024c74c0ff59575d67b232d9425b5d21
-SHA1 (patch-web_WEB-INF_web.xml) = 1cae9b9e2d3863406a9cb0ca34f3d1693e276dc2
+SHA1 (OpenGrok-0.12.1.tar.gz) = 68a959ba5c5c23188e02f14ff023265111c86b36
+RMD160 (OpenGrok-0.12.1.tar.gz) = 93f35c977da7c1b860c485f07b3ee69697778f10
+Size (OpenGrok-0.12.1.tar.gz) = 1557993 bytes
+SHA1 (patch-OpenGrok) = 3626793fca6f62a4e9da2ff23ccc20e1ec82087b
+SHA1 (patch-web_WEB-INF_web.xml) = 41ef040c1ddecd3ee6893f6ac2eb560190b85822
diff --git a/devel/opengrok/patches/patch-OpenGrok b/devel/opengrok/patches/patch-OpenGrok
index 9b5ad505717..f5b79b3ae69 100644
--- a/devel/opengrok/patches/patch-OpenGrok
+++ b/devel/opengrok/patches/patch-OpenGrok
@@ -1,8 +1,8 @@
-$NetBSD: patch-OpenGrok,v 1.1 2013/12/31 22:56:12 ryoon Exp $
+$NetBSD: patch-OpenGrok,v 1.2 2014/10/06 13:36:43 ryoon Exp $
 
---- OpenGrok.orig	2012-03-30 13:36:59.000000000 +0000
+--- OpenGrok.orig	2014-04-29 11:05:25.000000000 +0000
 +++ OpenGrok
-@@ -121,7 +121,7 @@ DefaultInstanceConfiguration()
+@@ -145,7 +145,7 @@ DefaultInstanceConfiguration()
      # operating systems, if you have any reasonably generic
      # improvements please feel free to submit a patch.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-OpenGrok,v 1.1 2013/12/31 22:56:12 ryoon Exp $
  
      LOGGER_CONFIG_FILE="logging.properties"
  
-@@ -247,7 +247,7 @@ DefaultInstanceConfiguration()
+@@ -274,7 +274,7 @@ DefaultInstanceConfiguration()
      WEBAPP_CONFIG=""
      if [ -n "${OPENGROK_WEBAPP_CFGADDR}" ]; then
          WEBAPP_CONFIG_ADDRESS=${OPENGROK_WEBAPP_CFGADDR}
@@ -20,9 +20,9 @@ $NetBSD: patch-OpenGrok,v 1.1 2013/12/31 22:56:12 ryoon Exp $
  	    WEBAPP_CONFIG_ADDRESS=""
  	fi
      else
-@@ -262,15 +262,15 @@ DefaultInstanceConfiguration()
+@@ -296,15 +296,15 @@ DefaultInstanceConfiguration()
      JAVA_OPTS="${JAVA_OPTS:--Xmx2048m}"
- 
+     
      # OPTIONAL: Full Path to History Utilities
 -    HG="`Which hg`"
 -    CVS="`Which cvs`"
diff --git a/devel/opengrok/patches/patch-build.xml b/devel/opengrok/patches/patch-build.xml
deleted file mode 100644
index 969c154c3ae..00000000000
--- a/devel/opengrok/patches/patch-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-build.xml,v 1.1 2013/12/31 22:56:12 ryoon Exp $
-
---- build.xml.orig	2013-12-20 16:10:15.000000000 +0000
-+++ build.xml
-@@ -243,7 +243,7 @@ Copyright (c) 2005, 2011, Oracle and/or 
-     </target>
- 
-     <target name="-update-build-info"
--            depends="-get-changeset-from-command,-get-changeset-from-file">
-+            depends="-get-changeset-from-command">
-         <mkdir dir="${build.classes.dir}/org/opensolaris/opengrok"/>
-         <propertyfile
-             file="${build.classes.dir}/org/opensolaris/opengrok/info.properties">
diff --git a/devel/opengrok/patches/patch-web_WEB-INF_web.xml b/devel/opengrok/patches/patch-web_WEB-INF_web.xml
index e6d61b87b91..c10dd40694d 100644
--- a/devel/opengrok/patches/patch-web_WEB-INF_web.xml
+++ b/devel/opengrok/patches/patch-web_WEB-INF_web.xml
@@ -1,13 +1,13 @@
-$NetBSD: patch-web_WEB-INF_web.xml,v 1.1 2013/12/31 22:56:12 ryoon Exp $
+$NetBSD: patch-web_WEB-INF_web.xml,v 1.2 2014/10/06 13:36:43 ryoon Exp $
 
---- web/WEB-INF/web.xml.orig	2012-03-30 13:36:59.000000000 +0000
+--- web/WEB-INF/web.xml.orig	2014-04-29 11:05:25.000000000 +0000
 +++ web/WEB-INF/web.xml
 @@ -5,7 +5,7 @@
    <description>A wicked fast source browser</description>
    <context-param>
      <param-name>CONFIGURATION</param-name>
 -    <param-value>/var/opengrok/etc/configuration.xml</param-value>
-+    <param-value>@PREFIX@/share/opengrok/var/opengrok/etc/configuration.xml</param-value>
++    <param-value>@PREFIX@/share/var/opengrok/etc/configuration.xml</param-value>
      <description>Full path to the configuration file where OpenGrok can read it's configuration</description>
    </context-param>