--- /usr/ports/sysutils/luma/Makefile Thu Dec 16 15:20:19 2004 +++ /usr/ports/sysutils/luma/Makefile Thu Dec 16 15:20:37 2004 @@ -6,7 +6,7 @@ # PORTNAME= luma -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= sysutils net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -27,6 +27,14 @@ PYDISTUTILS_INSTALLARGS= --prefix=${PREFIX} USE_OPENLDAP= yes +MAN1= luma.1 + +.include + do-configure: -.include +pre-install: + ${MV} ${WRKSRC}/share/man ${WRKSRC}/ + ${RM} ${WRKSRC}/lib/luma/base/utils/backend/\.\#mkpasswd.py.1.9 + +.include --- /usr/ports/sysutils/luma/distinfo Thu Dec 16 15:20:19 2004 +++ /usr/ports/sysutils/luma/distinfo Thu Dec 16 15:20:37 2004 @@ -1,2 +1,2 @@ -MD5 (luma-1.5.tar.bz2) = d89c5d2253b407712c87aeb054c27873 -SIZE (luma-1.5.tar.bz2) = 358359 +MD5 (luma-1.6.tar.bz2) = eb6fdd9f2a655666fb1efeda4dbe95d6 +SIZE (luma-1.6.tar.bz2) = 371291 --- /usr/ports/sysutils/luma/files/patch-install.py Thu Dec 16 15:20:19 2004 +++ /usr/ports/sysutils/luma/files/patch-install.py Thu Dec 16 15:20:37 2004 @@ -1,14 +1,49 @@ ---- install.py.orig Tue May 18 22:01:47 2004 -+++ install.py Wed Jun 2 22:09:53 2004 -@@ -137,6 +137,7 @@ +--- install.py.orig Mon Dec 13 00:45:57 2004 ++++ install.py Tue Dec 14 13:28:05 2004 +@@ -99,26 +99,15 @@ + 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 @@ helpString = """Install options: - --prefix=PATH \t\t Install path (e.g. /usr/local) + --prefix=PATH \t\t Install path (default is /usr/local) --compile-only \t Just compile source files. No installation. + build \t The same as --compile-only \n""" + print helpString - sys.exit(1) -@@ -166,7 +167,7 @@ +@@ -194,7 +184,7 @@ return for x in sys.argv[1:]: @@ -17,7 +52,7 @@ global compileOnly compileOnly = True elif x[:9] == "--prefix=": -@@ -174,7 +175,7 @@ +@@ -202,7 +192,7 @@ prefixDir = x[9:] if (prefixDir[-1] == "/") and (len(prefixDir) > 1): prefixDir = prefixDir[:-1] --- /usr/ports/sysutils/luma/pkg-plist Thu Dec 16 15:20:19 2004 +++ /usr/ports/sysutils/luma/pkg-plist Thu Dec 16 15:20:37 2004 @@ -11,6 +11,8 @@ lib/luma/base/backend/ServerList.pyc lib/luma/base/backend/ServerObject.py lib/luma/base/backend/ServerObject.pyc +lib/luma/base/backend/SmartDataObject.py +lib/luma/base/backend/SmartDataObject.pyc lib/luma/base/backend/__init__.py lib/luma/base/backend/__init__.pyc lib/luma/base/gui/AboutDialog.py @@ -245,99 +247,101 @@ lib/luma/plugins/usermanagement/plugin.meta lib/luma/plugins/usermanagement/usermanagement_plugin.py lib/luma/plugins/usermanagement/usermanagement_plugin.pyc -share/luma/doc/massive.help -share/luma/i18n/br.png -share/luma/i18n/de.png -share/luma/i18n/es.png -share/luma/i18n/gb.png -share/luma/i18n/luma_br.qm -share/luma/i18n/luma_de.qm -share/luma/i18n/luma_es.qm -share/luma/i18n/luma_fr.qm -share/luma/i18n/luma_no.qm -share/luma/i18n/luma_ru.qm -share/luma/i18n/luma_sv.qm -share/luma/i18n/no.png -share/luma/i18n/ru.png -share/luma/i18n/sv.png -share/luma/icons/AdvancedObjectWidget/binary.png -share/luma/icons/AdvancedObjectWidget/delete.png -share/luma/icons/AdvancedObjectWidget/displayall.png -share/luma/icons/AdvancedObjectWidget/save.png -share/luma/icons/AdvancedObjectWidget/single.png -share/luma/icons/addattribute.png -share/luma/icons/binary.png -share/luma/icons/clear.png -share/luma/icons/config.png -share/luma/icons/delete.png -share/luma/icons/deleteEntry.png -share/luma/icons/delete_small.png -share/luma/icons/displayall.png -share/luma/icons/edit.png -share/luma/icons/editdelete.png -share/luma/icons/email.png -share/luma/icons/error.png -share/luma/icons/exportBinary.png -share/luma/icons/exportLdif.png -share/luma/icons/final.png -share/luma/icons/folder.png -share/luma/icons/help.png -share/luma/icons/language.png -share/luma/icons/mainwin/bookmark.png -share/luma/icons/mainwin/configure.png -share/luma/icons/mainwin/domtreeviewer.png -share/luma/icons/mainwin/exit.png -share/luma/icons/mainwin/fileclose.png -share/luma/icons/mainwin/gear.png -share/luma/icons/mainwin/reload.png -share/luma/icons/manage.png -share/luma/icons/new.png -share/luma/icons/newEntry.png -share/luma/icons/no.png -share/luma/icons/objectclass.png -share/luma/icons/ok.png -share/luma/icons/password_big.png -share/luma/icons/passwordmedium.png -share/luma/icons/plugins/addressbook/addressbook.png -share/luma/icons/plugins/addressbook/category.png -share/luma/icons/plugins/addressbook/email.png -share/luma/icons/plugins/addressbook/home.png -share/luma/icons/plugins/addressbook/location.png -share/luma/icons/plugins/addressbook/person.png -share/luma/icons/plugins/addressbook/personal.png -share/luma/icons/plugins/addressbook/phone.png -share/luma/icons/plugins/addressbook/url.png -share/luma/icons/plugins/addressbook/work.png -share/luma/icons/plugins/admin_utils/admin_utils.png -share/luma/icons/plugins/admin_utils/date.png -share/luma/icons/plugins/admin_utils/secure.png -share/luma/icons/plugins/browser_plugin/plugin.png -share/luma/icons/plugins/mass_creation_plugin/massive_users.png -share/luma/icons/plugins/search_plugin/plugin.png -share/luma/icons/plugins/template_plugin/add.png -share/luma/icons/plugins/template_plugin/down.png -share/luma/icons/plugins/template_plugin/plugin.png -share/luma/icons/plugins/template_plugin/remove.png -share/luma/icons/plugins/template_plugin/up.png -share/luma/icons/plugins/usermanagement/email.png -share/luma/icons/plugins/usermanagement/entry.png -share/luma/icons/plugins/usermanagement/group.png -share/luma/icons/plugins/usermanagement/groupbig.png -share/luma/icons/plugins/usermanagement/home.png -share/luma/icons/plugins/usermanagement/password.png -share/luma/icons/plugins/usermanagement/shell.png -share/luma/icons/plugins/usermanagement/usermanagement.png -share/luma/icons/reload.png -share/luma/icons/save.png -share/luma/icons/secure.png -share/luma/icons/server.png -share/luma/icons/single.png -share/luma/icons/tip.png -share/luma/icons/view_icon.png -share/luma/icons/view_tree.png -share/luma/icons/warning.png -share/luma/icons/world.png -share/luma/icons/worldmedium.png +%%DATADIR%%/doc/massive.help +%%DATADIR%%/i18n/br.png +%%DATADIR%%/i18n/de.png +%%DATADIR%%/i18n/es.png +%%DATADIR%%/i18n/gb.png +%%DATADIR%%/i18n/luma_br.qm +%%DATADIR%%/i18n/luma_de.qm +%%DATADIR%%/i18n/luma_es.qm +%%DATADIR%%/i18n/luma_fr.qm +%%DATADIR%%/i18n/luma_no.qm +%%DATADIR%%/i18n/luma_ru.qm +%%DATADIR%%/i18n/luma_sv.qm +%%DATADIR%%/i18n/no.png +%%DATADIR%%/i18n/ru.png +%%DATADIR%%/i18n/sv.png +%%DATADIR%%/icons/AdvancedObjectWidget/binary.png +%%DATADIR%%/icons/AdvancedObjectWidget/delete.png +%%DATADIR%%/icons/AdvancedObjectWidget/displayall.png +%%DATADIR%%/icons/AdvancedObjectWidget/save.png +%%DATADIR%%/icons/AdvancedObjectWidget/single.png +%%DATADIR%%/icons/addattribute.png +%%DATADIR%%/icons/binary.png +%%DATADIR%%/icons/clear.png +%%DATADIR%%/icons/config.png +%%DATADIR%%/icons/delete.png +%%DATADIR%%/icons/deleteEntry.png +%%DATADIR%%/icons/delete_small.png +%%DATADIR%%/icons/displayall.png +%%DATADIR%%/icons/edit.png +%%DATADIR%%/icons/editdelete.png +%%DATADIR%%/icons/email.png +%%DATADIR%%/icons/error.png +%%DATADIR%%/icons/exportBinary.png +%%DATADIR%%/icons/exportLdif.png +%%DATADIR%%/icons/final.png +%%DATADIR%%/icons/folder.png +%%DATADIR%%/icons/help.png +%%DATADIR%%/icons/language.png +%%DATADIR%%/icons/mainwin/bookmark.png +%%DATADIR%%/icons/mainwin/configure.png +%%DATADIR%%/icons/mainwin/domtreeviewer.png +%%DATADIR%%/icons/mainwin/exit.png +%%DATADIR%%/icons/mainwin/fileclose.png +%%DATADIR%%/icons/mainwin/gear.png +%%DATADIR%%/icons/mainwin/reload.png +%%DATADIR%%/icons/manage.png +%%DATADIR%%/icons/new.png +%%DATADIR%%/icons/newEntry.png +%%DATADIR%%/icons/no.png +%%DATADIR%%/icons/objectclass.png +%%DATADIR%%/icons/ok.png +%%DATADIR%%/icons/password_big.png +%%DATADIR%%/icons/passwordmedium.png +%%DATADIR%%/icons/plugins/addressbook/addressbook.png +%%DATADIR%%/icons/plugins/addressbook/category.png +%%DATADIR%%/icons/plugins/addressbook/email.png +%%DATADIR%%/icons/plugins/addressbook/home.png +%%DATADIR%%/icons/plugins/addressbook/location.png +%%DATADIR%%/icons/plugins/addressbook/person.png +%%DATADIR%%/icons/plugins/addressbook/personal.png +%%DATADIR%%/icons/plugins/addressbook/phone.png +%%DATADIR%%/icons/plugins/addressbook/url.png +%%DATADIR%%/icons/plugins/addressbook/work.png +%%DATADIR%%/icons/plugins/admin_utils/admin_utils.png +%%DATADIR%%/icons/plugins/admin_utils/date.png +%%DATADIR%%/icons/plugins/admin_utils/secure.png +%%DATADIR%%/icons/plugins/browser_plugin/plugin.png +%%DATADIR%%/icons/plugins/mass_creation_plugin/massive_users.png +%%DATADIR%%/icons/plugins/search_plugin/plugin.png +%%DATADIR%%/icons/plugins/template_plugin/add.png +%%DATADIR%%/icons/plugins/template_plugin/down.png +%%DATADIR%%/icons/plugins/template_plugin/plugin.png +%%DATADIR%%/icons/plugins/template_plugin/remove.png +%%DATADIR%%/icons/plugins/template_plugin/up.png +%%DATADIR%%/icons/plugins/usermanagement/email.png +%%DATADIR%%/icons/plugins/usermanagement/entry.png +%%DATADIR%%/icons/plugins/usermanagement/group.png +%%DATADIR%%/icons/plugins/usermanagement/groupbig.png +%%DATADIR%%/icons/plugins/usermanagement/home.png +%%DATADIR%%/icons/plugins/usermanagement/password.png +%%DATADIR%%/icons/plugins/usermanagement/shell.png +%%DATADIR%%/icons/plugins/usermanagement/usermanagement.png +%%DATADIR%%/icons/alias.png +%%DATADIR%%/icons/reload.png +%%DATADIR%%/icons/save.png +%%DATADIR%%/icons/secure.png +%%DATADIR%%/icons/secure-alias.png +%%DATADIR%%/icons/server.png +%%DATADIR%%/icons/single.png +%%DATADIR%%/icons/tip.png +%%DATADIR%%/icons/view_icon.png +%%DATADIR%%/icons/view_tree.png +%%DATADIR%%/icons/warning.png +%%DATADIR%%/icons/world.png +%%DATADIR%%/icons/worldmedium.png @dirrm lib/luma/base/backend @dirrm lib/luma/base/gui @dirrm lib/luma/base/utils/backend @@ -354,17 +358,17 @@ @dirrm lib/luma/plugins/usermanagement @dirrm lib/luma/plugins @dirrm lib/luma -@dirrm share/luma/doc -@dirrm share/luma/i18n -@dirrm share/luma/icons/AdvancedObjectWidget -@dirrm share/luma/icons/mainwin -@dirrm share/luma/icons/plugins/addressbook -@dirrm share/luma/icons/plugins/admin_utils -@dirrm share/luma/icons/plugins/browser_plugin -@dirrm share/luma/icons/plugins/mass_creation_plugin -@dirrm share/luma/icons/plugins/search_plugin -@dirrm share/luma/icons/plugins/template_plugin -@dirrm share/luma/icons/plugins/usermanagement -@dirrm share/luma/icons/plugins -@dirrm share/luma/icons -@dirrm share/luma +@dirrm %%DATADIR%%/doc +@dirrm %%DATADIR%%/i18n +@dirrm %%DATADIR%%/icons/AdvancedObjectWidget +@dirrm %%DATADIR%%/icons/mainwin +@dirrm %%DATADIR%%/icons/plugins/addressbook +@dirrm %%DATADIR%%/icons/plugins/admin_utils +@dirrm %%DATADIR%%/icons/plugins/browser_plugin +@dirrm %%DATADIR%%/icons/plugins/mass_creation_plugin +@dirrm %%DATADIR%%/icons/plugins/search_plugin +@dirrm %%DATADIR%%/icons/plugins/template_plugin +@dirrm %%DATADIR%%/icons/plugins/usermanagement +@dirrm %%DATADIR%%/icons/plugins +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%%