- Update to 2.1.3.

PR:		ports/78914
Submitted by:	maintainer

4 files changed, 31 insertions, 44 deletions

diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index b2a460260964..8fc55b679d2a 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	luma
-PORTVERSION=	2.1
+PORTVERSION=	2.1.3
 CATEGORIES=	sysutils net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 # MASTER_SITES=	http://home.tu-clausthal.de/~ifwd/luma/
diff --git a/sysutils/luma/distinfo b/sysutils/luma/distinfo
index 44aaf840338e..6840fbd72759 100644
--- a/sysutils/luma/distinfo
+++ b/sysutils/luma/distinfo
@@ -1,2 +1,2 @@
-MD5 (luma-2.1.tar.bz2) = 165740a12ddef4dabd4d3dba94b250df
-SIZE (luma-2.1.tar.bz2) = 507632
+MD5 (luma-2.1.3.tar.bz2) = 7975b3d8b5fa0f96ca08a3c1e8e7002b
+SIZE (luma-2.1.3.tar.bz2) = 574532
diff --git a/sysutils/luma/files/patch-install.py b/sysutils/luma/files/patch-install.py
index 48346dc78c35..4d201a299a06 100644
--- a/sysutils/luma/files/patch-install.py
+++ b/sysutils/luma/files/patch-install.py
@@ -1,41 +1,15 @@
---- install.py.orig	Mon Dec 13 00:45:57 2004
-+++ install.py	Tue Dec 14 13:28:05 2004
-@@ -99,26 +99,15 @@
+--- install.py.orig	Wed Mar 16 13:36:15 2005
++++ install.py	Wed Mar 16 13:40:43 2005
+@@ -99,7 +99,7 @@
      print "Copy program files...\n"
      
      try:
--        a = Popen3("cp -R bin " + prefixDir)
--        while a.poll() == -1:
--            pass
--        if a.poll() > 0:
--            raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
-+	for idir in ["bin", "lib", "share", "man"]:
-+		a = Popen3("cp -R " + idir + " " + prefixDir)
-+		while a.poll() == -1:
-+			pass
-+			if a.poll() > 0:
-+				raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
- 
--        a = Popen3("cp -R lib " + prefixDir)
--        while a.poll() == -1:
--            pass
--        if a.poll() > 0:
--            raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
--
--        a = Popen3("cp -R share " + prefixDir)
--        while a.poll() == -1:
--            pass
--        if a.poll() > 0:
--            raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
--
--        print "Finished copying program files.\n"
--        print "LUMA installed succesfully! :)"
-+	print "Finished copying program files.\n"
-+	print "LUMA installed succesfully! :)"
-         
-     except "CopyError", errorMessage:
-         print errorMessage
-@@ -157,6 +146,7 @@
+-        for tmpDir in ["bin", "lib", "share"]:
++        for tmpDir in ["bin", "lib", "share", "man"]:
+             a = Popen3("cp -R " + tmpDir + " " + prefixDir)
+             while a.poll() == -1:
+                 pass
+@@ -146,6 +146,7 @@
      helpString = """Install options:
   --prefix=PATH \t\t Install path (default is /usr/local)
   --compile-only \t Just compile source files. No installation.
@@ -43,16 +17,16 @@
   \n"""
   
      print helpString
-@@ -194,7 +184,7 @@
+@@ -183,7 +184,7 @@
          return
          
      for x in sys.argv[1:]:
 -        if x == "--compile-only":
-+        if (x == "--compile-only") or (x == "build"):
++        if x == "--compile-only" or x == "build":
              global compileOnly
              compileOnly = True
          elif x[:9] == "--prefix=":
-@@ -202,7 +192,7 @@
+@@ -191,7 +192,7 @@
              prefixDir = x[9:]
              if (prefixDir[-1] == "/") and (len(prefixDir) > 1):
                  prefixDir = prefixDir[:-1]
diff --git a/sysutils/luma/pkg-plist b/sysutils/luma/pkg-plist
index 6bd5033c773f..f105f10c502a 100644
--- a/sysutils/luma/pkg-plist
+++ b/sysutils/luma/pkg-plist
@@ -233,13 +233,21 @@ lib/luma/plugins/schemabrowser/SchemaView.pyc
 lib/luma/plugins/schemabrowser/SchemaViewDesign.py
 lib/luma/plugins/schemabrowser/SchemaViewDesign.pyc
 lib/luma/plugins/schemabrowser/SchemaViewDesign.ui
-lib/luma/plugins/schemabrowser/SearchView.py
-lib/luma/plugins/schemabrowser/SearchView.pyc
 lib/luma/plugins/schemabrowser/__init__.py
 lib/luma/plugins/schemabrowser/__init__.pyc
 lib/luma/plugins/schemabrowser/plugin.meta
 lib/luma/plugins/schemabrowser/schemabrowser.py
 lib/luma/plugins/schemabrowser/schemabrowser.pyc
+lib/luma/plugins/schemaeditor/schemaeditor.pyc
+lib/luma/plugins/schemaeditor/SchemaEditorDesign.py
+lib/luma/plugins/schemaeditor/SchemaEditorDesign.ui
+lib/luma/plugins/schemaeditor/__init__.py
+lib/luma/plugins/schemaeditor/plugin.meta
+lib/luma/plugins/schemaeditor/schemaeditor.py
+lib/luma/plugins/schemaeditor/SchemaEditor.pyc
+lib/luma/plugins/schemaeditor/SchemaEditorDesign.pyc
+lib/luma/plugins/schemaeditor/__init__.pyc
+lib/luma/plugins/schemaeditor/SchemaEditor.py
 lib/luma/plugins/template_plugin/AddAttributeDialog.py
 lib/luma/plugins/template_plugin/AddAttributeDialog.pyc
 lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py
@@ -304,6 +312,7 @@ lib/luma/plugins/usermanagement/usermanagement_plugin.pyc
 %%DATADIR%%/i18n/luma_es.qm
 %%DATADIR%%/i18n/luma_fr.qm
 %%DATADIR%%/i18n/luma_no.qm
+%%DATADIR%%/i18n/luma_no_NY.qm
 %%DATADIR%%/i18n/luma_ru.qm
 %%DATADIR%%/i18n/luma_sv.qm
 %%DATADIR%%/i18n/no.png
@@ -341,12 +350,15 @@ lib/luma/plugins/usermanagement/usermanagement_plugin.pyc
 %%DATADIR%%/icons/folder.png
 %%DATADIR%%/icons/help.png
 %%DATADIR%%/icons/language.png
+%%DATADIR%%/icons/LOGO.README
 %%DATADIR%%/icons/luma-128.png
 %%DATADIR%%/icons/luma-16.png
 %%DATADIR%%/icons/luma-22.png
 %%DATADIR%%/icons/luma-32.png
 %%DATADIR%%/icons/luma-48.png
 %%DATADIR%%/icons/luma-64.png
+%%DATADIR%%/icons/luma-250.png
+%%DATADIR%%/icons/luma-350.png
 %%DATADIR%%/icons/luma-blau.eps
 %%DATADIR%%/icons/mainwin/bookmark.png
 %%DATADIR%%/icons/mainwin/configure.png
@@ -418,12 +430,13 @@ lib/luma/plugins/usermanagement/usermanagement_plugin.pyc
 @dirrm lib/luma/base/utils
 @dirrm lib/luma/base
 @dirrm lib/luma/environment
-@dirrm lib/luma/plugins/schemabrowser
 @dirrm lib/luma/plugins/addressbook
 @dirrm lib/luma/plugins/admin_utils
 @dirrm lib/luma/plugins/browser_plugin
 @dirrm lib/luma/plugins/mass_creation_plugin
 @dirrm lib/luma/plugins/search_plugin
+@dirrm lib/luma/plugins/schemabrowser
+@dirrm lib/luma/plugins/schemaeditor
 @dirrm lib/luma/plugins/template_plugin
 @dirrm lib/luma/plugins/usermanagement
 @dirrm lib/luma/plugins