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

3 files changed, 9 insertions, 22 deletions

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>