Attachment #52058 for bug #78914

View | Details | Raw Unified | Return to bug 78914
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/sysutils/luma/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= luma	8	PORTNAME= luma
9	PORTVERSION= 2.1	9	PORTVERSION= 2.1.3
10	CATEGORIES= sysutils net-mgmt	10	CATEGORIES= sysutils net-mgmt
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	# MASTER_SITES= http://home.tu-clausthal.de/~ifwd/luma/	12	# MASTER_SITES= http://home.tu-clausthal.de/~ifwd/luma/

Lines 1-2 Link Here

(-)/usr/ports/sysutils/luma/distinfo (-2 / +2 lines)
1	MD5 (luma-2.1.tar.bz2) = 165740a12ddef4dabd4d3dba94b250df	1	MD5 (luma-2.1.3.tar.bz2) = 7975b3d8b5fa0f96ca08a3c1e8e7002b
2	SIZE (luma-2.1.tar.bz2) = 507632	2	SIZE (luma-2.1.3.tar.bz2) = 574532




--- 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:
-        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 @@
+		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 @@
     helpString = """Install options:
  --prefix=PATH \t\t Install path (default is /usr/local)
  --compile-only \t Just compile source files. No installation.

  \n"""
  
     print helpString
@@ -183,7 +184,7 @@
         return
         
     for x in sys.argv[1:]:
-        if x == "--compile-only":
+        if x == "--compile-only" or x == "build":
             global compileOnly
             compileOnly = True
         elif x[:9] == "--prefix=":
@@ -191,7 +192,7 @@
             prefixDir = x[9:]
             if (prefixDir[-1] == "/") and (len(prefixDir) > 1):
                 prefixDir = prefixDir[:-1]




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

%%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

%%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

@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

Return to bug 78914

Lines 1-41 Link Here

(-)/usr/ports/sysutils/luma/files/patch-install.py (-38 / +12 lines)
1	--- install.py.orig Mon Dec 13 00:45:57 2004	1	--- install.py.orig Wed Mar 16 13:36:15 2005
2	+++ install.py Tue Dec 14 13:28:05 2004	2	+++ install.py Wed Mar 16 13:40:43 2005
3	@@ -99,26 +99,15 @@	3	@@ -99,7 +99,7 @@
4	print "Copy program files...\n"	4	print "Copy program files...\n"
5		5
6	try:	6	try:
7	- a = Popen3("cp -R bin " + prefixDir)	7	- for tmpDir in ["bin", "lib", "share"]:
8	- while a.poll() == -1:	8	+ for tmpDir in ["bin", "lib", "share", "man"]:
9	- pass	9	a = Popen3("cp -R " + tmpDir + " " + prefixDir)
10	- if a.poll() > 0:	10	while a.poll() == -1:
11	- raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"	11	pass
12	+ for idir in ["bin", "lib", "share", "man"]:	12	@@ -146,6 +146,7 @@
13	+ a = Popen3("cp -R " + idir + " " + prefixDir)
14	+ while a.poll() == -1:
15	+ pass
16	+ if a.poll() > 0:
17	+ raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
18
19	- a = Popen3("cp -R lib " + prefixDir)
20	- while a.poll() == -1:
21	- pass
22	- if a.poll() > 0:
23	- raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
24	-
25	- a = Popen3("cp -R share " + prefixDir)
26	- while a.poll() == -1:
27	- pass
28	- if a.poll() > 0:
29	- raise "CopyError", "Error!!! Could not copy File. Maybe wrong permissions?"
30	-
31	- print "Finished copying program files.\n"
32	- print "LUMA installed succesfully! :)"
33	+ print "Finished copying program files.\n"
34	+ print "LUMA installed succesfully! :)"
35
36	except "CopyError", errorMessage:
37	print errorMessage
38	@@ -157,6 +146,7 @@
39	helpString = """Install options:	13	helpString = """Install options:
40	--prefix=PATH \t\t Install path (default is /usr/local)	14	--prefix=PATH \t\t Install path (default is /usr/local)
41	--compile-only \t Just compile source files. No installation.	15	--compile-only \t Just compile source files. No installation.
Lines 43-58 Link Here
43	\n"""	17	\n"""
44		18
45	print helpString	19	print helpString
46	@@ -194,7 +184,7 @@	20	@@ -183,7 +184,7 @@
47	return	21	return
48		22
49	for x in sys.argv[1:]:	23	for x in sys.argv[1:]:
50	- if x == "--compile-only":	24	- if x == "--compile-only":
51	+ if (x == "--compile-only") or (x == "build"):	25	+ if x == "--compile-only" or x == "build":
52	global compileOnly	26	global compileOnly
53	compileOnly = True	27	compileOnly = True
54	elif x[:9] == "--prefix=":	28	elif x[:9] == "--prefix=":
55	@@ -202,7 +192,7 @@	29	@@ -191,7 +192,7 @@
56	prefixDir = x[9:]	30	prefixDir = x[9:]
57	if (prefixDir[-1] == "/") and (len(prefixDir) > 1):	31	if (prefixDir[-1] == "/") and (len(prefixDir) > 1):
58	prefixDir = prefixDir[:-1]	32	prefixDir = prefixDir[:-1]

Lines 233-245 Link Here

(-)/usr/ports/sysutils/luma/pkg-plist (-3 / +16 lines)
233	lib/luma/plugins/schemabrowser/SchemaViewDesign.py	233	lib/luma/plugins/schemabrowser/SchemaViewDesign.py
234	lib/luma/plugins/schemabrowser/SchemaViewDesign.pyc	234	lib/luma/plugins/schemabrowser/SchemaViewDesign.pyc
235	lib/luma/plugins/schemabrowser/SchemaViewDesign.ui	235	lib/luma/plugins/schemabrowser/SchemaViewDesign.ui
236	lib/luma/plugins/schemabrowser/SearchView.py
237	lib/luma/plugins/schemabrowser/SearchView.pyc
238	lib/luma/plugins/schemabrowser/__init__.py	236	lib/luma/plugins/schemabrowser/__init__.py
239	lib/luma/plugins/schemabrowser/__init__.pyc	237	lib/luma/plugins/schemabrowser/__init__.pyc
240	lib/luma/plugins/schemabrowser/plugin.meta	238	lib/luma/plugins/schemabrowser/plugin.meta
241	lib/luma/plugins/schemabrowser/schemabrowser.py	239	lib/luma/plugins/schemabrowser/schemabrowser.py
242	lib/luma/plugins/schemabrowser/schemabrowser.pyc	240	lib/luma/plugins/schemabrowser/schemabrowser.pyc
		241	lib/luma/plugins/schemaeditor/schemaeditor.pyc
		242	lib/luma/plugins/schemaeditor/SchemaEditorDesign.py
		243	lib/luma/plugins/schemaeditor/SchemaEditorDesign.ui
		244	lib/luma/plugins/schemaeditor/__init__.py
		245	lib/luma/plugins/schemaeditor/plugin.meta
		246	lib/luma/plugins/schemaeditor/schemaeditor.py
		247	lib/luma/plugins/schemaeditor/SchemaEditor.pyc
		248	lib/luma/plugins/schemaeditor/SchemaEditorDesign.pyc
		249	lib/luma/plugins/schemaeditor/__init__.pyc
		250	lib/luma/plugins/schemaeditor/SchemaEditor.py
243	lib/luma/plugins/template_plugin/AddAttributeDialog.py	251	lib/luma/plugins/template_plugin/AddAttributeDialog.py
244	lib/luma/plugins/template_plugin/AddAttributeDialog.pyc	252	lib/luma/plugins/template_plugin/AddAttributeDialog.pyc
245	lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py	253	lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py
Lines 304-309 Link Here
304	%%DATADIR%%/i18n/luma_es.qm	312	%%DATADIR%%/i18n/luma_es.qm
305	%%DATADIR%%/i18n/luma_fr.qm	313	%%DATADIR%%/i18n/luma_fr.qm
306	%%DATADIR%%/i18n/luma_no.qm	314	%%DATADIR%%/i18n/luma_no.qm
		315	%%DATADIR%%/i18n/luma_no_NY.qm
307	%%DATADIR%%/i18n/luma_ru.qm	316	%%DATADIR%%/i18n/luma_ru.qm
308	%%DATADIR%%/i18n/luma_sv.qm	317	%%DATADIR%%/i18n/luma_sv.qm
309	%%DATADIR%%/i18n/no.png	318	%%DATADIR%%/i18n/no.png
Lines 341-352 Link Here
341	%%DATADIR%%/icons/folder.png	350	%%DATADIR%%/icons/folder.png
342	%%DATADIR%%/icons/help.png	351	%%DATADIR%%/icons/help.png
343	%%DATADIR%%/icons/language.png	352	%%DATADIR%%/icons/language.png
		353	%%DATADIR%%/icons/LOGO.README
344	%%DATADIR%%/icons/luma-128.png	354	%%DATADIR%%/icons/luma-128.png
345	%%DATADIR%%/icons/luma-16.png	355	%%DATADIR%%/icons/luma-16.png
346	%%DATADIR%%/icons/luma-22.png	356	%%DATADIR%%/icons/luma-22.png
347	%%DATADIR%%/icons/luma-32.png	357	%%DATADIR%%/icons/luma-32.png
348	%%DATADIR%%/icons/luma-48.png	358	%%DATADIR%%/icons/luma-48.png
349	%%DATADIR%%/icons/luma-64.png	359	%%DATADIR%%/icons/luma-64.png
		360	%%DATADIR%%/icons/luma-250.png
		361	%%DATADIR%%/icons/luma-350.png
350	%%DATADIR%%/icons/luma-blau.eps	362	%%DATADIR%%/icons/luma-blau.eps
351	%%DATADIR%%/icons/mainwin/bookmark.png	363	%%DATADIR%%/icons/mainwin/bookmark.png
352	%%DATADIR%%/icons/mainwin/configure.png	364	%%DATADIR%%/icons/mainwin/configure.png
Lines 418-429 Link Here
418	@dirrm lib/luma/base/utils	430	@dirrm lib/luma/base/utils
419	@dirrm lib/luma/base	431	@dirrm lib/luma/base
420	@dirrm lib/luma/environment	432	@dirrm lib/luma/environment
421	@dirrm lib/luma/plugins/schemabrowser
422	@dirrm lib/luma/plugins/addressbook	433	@dirrm lib/luma/plugins/addressbook
423	@dirrm lib/luma/plugins/admin_utils	434	@dirrm lib/luma/plugins/admin_utils
424	@dirrm lib/luma/plugins/browser_plugin	435	@dirrm lib/luma/plugins/browser_plugin
425	@dirrm lib/luma/plugins/mass_creation_plugin	436	@dirrm lib/luma/plugins/mass_creation_plugin
426	@dirrm lib/luma/plugins/search_plugin	437	@dirrm lib/luma/plugins/search_plugin
		438	@dirrm lib/luma/plugins/schemabrowser
		439	@dirrm lib/luma/plugins/schemaeditor
427	@dirrm lib/luma/plugins/template_plugin	440	@dirrm lib/luma/plugins/template_plugin
428	@dirrm lib/luma/plugins/usermanagement	441	@dirrm lib/luma/plugins/usermanagement
429	@dirrm lib/luma/plugins	442	@dirrm lib/luma/plugins