3 files changed, 152 insertions, 412 deletions

diff --git a/net/phamm/Makefile b/net/phamm/Makefile
index 8ccadac885bd..2fa3cb990feb 100644
--- a/net/phamm/Makefile
+++ b/net/phamm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	phamm
-PORTVERSION=	0.4.11
-PORTREVISION=	3
+PORTVERSION=	0.5.18
 CATEGORIES=	net www
 MASTER_SITES=	http://open.rhx.it/phamm/
 
@@ -17,6 +16,8 @@ COMMENT=	Front-end written in PHP to manage virtual service
 NO_BUILD=	yes
 USE_PHP=	gettext ldap openssl pcre session
 
+USE_GETTEXT=	yes
+
 PHAMMDIR?=	www/${PORTNAME}
 SCHEMADIR=	${WRKSRC}/schema
 
@@ -24,8 +25,7 @@ SUB_FILES=	pkg-message
 SUB_LIST=	PHAMMDIR=${PHAMMDIR} PKGNAME=${PKGNAME}
 PLIST_SUB=	PHAMMDIR=${PHAMMDIR}
 
-PORTDOCS=	AUTHORS CHANGELOG INSTALL README README.plugins \
-		DOCS.LICENSE IMAGES.LICENSE LICENSE THANKS
+PORTDOCS=	CHANGELOG INSTALL README LICENSE THANKS
 
 .include <bsd.port.pre.mk>
 
@@ -35,12 +35,6 @@ do-install:
 	@${CP} -Rv ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${CP} -Rv ${SCHEMADIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/index.php ${PREFIX}/${PHAMMDIR}
-	@${INSTALL_DATA} ${WRKSRC}/en_GB.php ${PREFIX}/${PHAMMDIR}
-	@${INSTALL_DATA} ${WRKSRC}/config.inc.php.template \
-		${PREFIX}/${PHAMMDIR}/config.inc.php.sample
-	@[ -f ${PREFIX}/${PHAMMDIR}/config.inc.php ] || \
-		${INSTALL_DATA} ${WRKSRC}/config.inc.php.template \
-		${PREFIX}/${PHAMMDIR}/config.inc.php
 	@for d in `${FIND}  ${WRKSRC} -type d -depth 1 | ${SORT} -r | \
 	${EGREP} -v '(examples|cfg|schema|debian|server)'` ; do \
 		${CP} -Rv $$d ${PREFIX}/${PHAMMDIR}; \
diff --git a/net/phamm/distinfo b/net/phamm/distinfo
index c884324d4d22..86a11984ba5a 100644
--- a/net/phamm/distinfo
+++ b/net/phamm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phamm-0.4.11.tar.gz) = 2c4e1090c6d5df7fc209679f93e26f6f02c24af53af9615238cd3014f17a0f66
-SIZE (phamm-0.4.11.tar.gz) = 162324
+SHA256 (phamm-0.5.18.tar.gz) = 8b3b030ed77372bc201b8bc8f635c3e6ba12f833a76364d20d370cbad1effa8b
+SIZE (phamm-0.5.18.tar.gz) = 132628
diff --git a/net/phamm/pkg-plist b/net/phamm/pkg-plist
index b8d99a113a49..e2f9b10c7b86 100644
--- a/net/phamm/pkg-plist
+++ b/net/phamm/pkg-plist
@@ -1,420 +1,166 @@
-@unexec if cmp -s %D/%%PHAMMDIR%%/config.inc.php %D/%%PHAMMDIR%%/config.inc.php.sample ; then rm -f %D/%%PHAMMDIR%%/config.inc.php ; fi
-%%PHAMMDIR%%/config.inc.php.sample
-@exec [ -f %B/config.inc.php ] || cp -f %B/%f %B/config.inc.php
-%%EXAMPLESDIR%%/CVS/Entries
-%%EXAMPLESDIR%%/CVS/Entries.Log
-%%EXAMPLESDIR%%/CVS/Repository
-%%EXAMPLESDIR%%/CVS/Root
-%%EXAMPLESDIR%%/amavisd.conf
-%%EXAMPLESDIR%%/authldaprc
-%%EXAMPLESDIR%%/dovecot-ldap.conf
-%%EXAMPLESDIR%%/dovecot.conf
-%%EXAMPLESDIR%%/fork/CVS/Entries
-%%EXAMPLESDIR%%/fork/CVS/Repository
-%%EXAMPLESDIR%%/fork/CVS/Root
-%%EXAMPLESDIR%%/fork/fork.pl
-%%EXAMPLESDIR%%/gnarwl.cfg
-%%EXAMPLESDIR%%/main.cf
-%%EXAMPLESDIR%%/main.cf.mxbackup
-%%EXAMPLESDIR%%/main.cf.mxbackup.withoutprimary
-%%EXAMPLESDIR%%/master.cf
-%%EXAMPLESDIR%%/pdns.conf
-%%EXAMPLESDIR%%/pdns.local
-%%EXAMPLESDIR%%/phamm.acl
-%%EXAMPLESDIR%%/phamm.conf
-%%EXAMPLESDIR%%/pureftpd-ldap.conf
-%%EXAMPLESDIR%%/sample-htaccess-apache2
-%%EXAMPLESDIR%%/sample-location-apache2
-%%EXAMPLESDIR%%/sample-mail.ldif
-%%EXAMPLESDIR%%/sample-main.ldif
-%%EXAMPLESDIR%%/sample-pdns.ldif
-%%EXAMPLESDIR%%/sample-pureftpd.ldif
-%%EXAMPLESDIR%%/sample-squid.ldif
-%%EXAMPLESDIR%%/sasl/CVS/Entries
-%%EXAMPLESDIR%%/sasl/CVS/Repository
-%%EXAMPLESDIR%%/sasl/CVS/Root
-%%EXAMPLESDIR%%/sasl/main.cf
-%%EXAMPLESDIR%%/sasl/master.cf
-%%EXAMPLESDIR%%/sasl/saslauthd
-%%EXAMPLESDIR%%/sasl/saslauthd.conf
-%%EXAMPLESDIR%%/sasl/smtpd.conf
-%%EXAMPLESDIR%%/schema/CVS/Entries
-%%EXAMPLESDIR%%/schema/CVS/Repository
-%%EXAMPLESDIR%%/schema/CVS/Root
-%%EXAMPLESDIR%%/schema/ISPEnv2.schema
-%%EXAMPLESDIR%%/schema/amavis.schema
-%%EXAMPLESDIR%%/schema/dnsdomain2.schema
+%%EXAMPLESDIR%%/conf/amavisd-new/50-user
+%%EXAMPLESDIR%%/conf/amavisd-new/amavisd.conf
+%%EXAMPLESDIR%%/conf/apache2.2/htaccess
+%%EXAMPLESDIR%%/conf/courier-authlib-ldap/authldaprc
+%%EXAMPLESDIR%%/conf/cron/phamm
+%%EXAMPLESDIR%%/conf/davical/example.org-conf.php
+%%EXAMPLESDIR%%/conf/dovecot/dovecot-ldap.conf
+%%EXAMPLESDIR%%/conf/dovecot/dovecot.conf
+%%EXAMPLESDIR%%/conf/gnarwl/footer.txt
+%%EXAMPLESDIR%%/conf/gnarwl/gnarwl.cfg
+%%EXAMPLESDIR%%/conf/gnarwl/header.txt
+%%EXAMPLESDIR%%/conf/libnss-ldap/README
+%%EXAMPLESDIR%%/conf/libnss-ldap/libnss-ldap.conf
+%%EXAMPLESDIR%%/conf/pdns-backend-ldap/pdns.conf
+%%EXAMPLESDIR%%/conf/pdns-backend-ldap/pdns.local
+%%EXAMPLESDIR%%/conf/phamm/addressbook.acl
+%%EXAMPLESDIR%%/conf/phamm/global.acl
+%%EXAMPLESDIR%%/conf/phamm/phamm.acl
+%%EXAMPLESDIR%%/conf/postfix/fork.pl
+%%EXAMPLESDIR%%/conf/postfix/main.cf
+%%EXAMPLESDIR%%/conf/postfix/main.cf.mxbackup
+%%EXAMPLESDIR%%/conf/postfix/main.cf.mxbackup.withoutprimary
+%%EXAMPLESDIR%%/conf/postfix/master.cf
+%%EXAMPLESDIR%%/conf/postfix/transport
+%%EXAMPLESDIR%%/conf/pure-ftpd-ldap/pureftpd-ldap.conf
+%%EXAMPLESDIR%%/conf/sasl/main.cf
+%%EXAMPLESDIR%%/conf/sasl/master.cf
+%%EXAMPLESDIR%%/conf/sasl/saslauthd
+%%EXAMPLESDIR%%/conf/sasl/saslauthd.conf
+%%EXAMPLESDIR%%/conf/sasl/smtpd.conf
+%%EXAMPLESDIR%%/conf/slapd/indexing.Debian
+%%EXAMPLESDIR%%/conf/slapd/slapd.conf
+%%EXAMPLESDIR%%/conf/smbldap-tools/smbldap.conf
+%%EXAMPLESDIR%%/conf/smbldap-tools/smbldap_bind.conf
+%%EXAMPLESDIR%%/conf/squid/squid.conf
+%%EXAMPLESDIR%%/ldif/address-book.ldif
+%%EXAMPLESDIR%%/ldif/sample-hosting.ldif
+%%EXAMPLESDIR%%/ldif/sample-mail.ldif
+%%EXAMPLESDIR%%/ldif/sample-main.ldif
+%%EXAMPLESDIR%%/ldif/sample-pdns.ldif
+%%EXAMPLESDIR%%/ldif/sample-pureftpd.ldif
+%%EXAMPLESDIR%%/ldif/sample-squid.ldif
+%%EXAMPLESDIR%%/ldif/smbldap-populate.ldif
+%%EXAMPLESDIR%%/schema/contrib/perversia.net.schema
+%%EXAMPLESDIR%%/schema/phamm-vacation.schema
 %%EXAMPLESDIR%%/schema/phamm.schema
-%%EXAMPLESDIR%%/schema/pureftpd.schema
-%%EXAMPLESDIR%%/schema/radius.schema
-%%EXAMPLESDIR%%/schema/samba.schema
-%%EXAMPLESDIR%%/slapd.conf
-%%EXAMPLESDIR%%/sm-plugin/CVS/Entries
-%%EXAMPLESDIR%%/sm-plugin/CVS/Repository
-%%EXAMPLESDIR%%/sm-plugin/CVS/Root
-%%EXAMPLESDIR%%/smbldap-populate.patch
-%%EXAMPLESDIR%%/smbldap-useradd.patch
-%%EXAMPLESDIR%%/smbldap.conf
-%%EXAMPLESDIR%%/squid.conf
-%%PHAMMDIR%%/CVS/Entries
-%%PHAMMDIR%%/CVS/Entries.Log
-%%PHAMMDIR%%/CVS/Repository
-%%PHAMMDIR%%/CVS/Root
-%%PHAMMDIR%%/DTDs/CVS/Entries
-%%PHAMMDIR%%/DTDs/CVS/Repository
-%%PHAMMDIR%%/DTDs/CVS/Root
-%%PHAMMDIR%%/en_GB.php
-%%PHAMMDIR%%/functions/CVS/Entries
-%%PHAMMDIR%%/functions/CVS/Repository
-%%PHAMMDIR%%/functions/CVS/Root
-%%PHAMMDIR%%/functions/add_domain.php
-%%PHAMMDIR%%/functions/checkAuth.php
-%%PHAMMDIR%%/functions/checkLogin.php
-%%PHAMMDIR%%/functions/checkObject.php
-%%PHAMMDIR%%/functions/checkSyntax.php
-%%PHAMMDIR%%/functions/domain_modify.php
-%%PHAMMDIR%%/functions/form_add_domain.php
-%%PHAMMDIR%%/functions/form_add_domain_2.php
-%%PHAMMDIR%%/functions/form_login.php
-%%PHAMMDIR%%/functions/form_modify.php
-%%PHAMMDIR%%/functions/generic.php
-%%PHAMMDIR%%/functions/host_color.php
-%%PHAMMDIR%%/functions/initials.php
-%%PHAMMDIR%%/functions/isAdmin.php
-%%PHAMMDIR%%/functions/isPostmaster.php
-%%PHAMMDIR%%/functions/language_selector.php
-%%PHAMMDIR%%/functions/loadLanguage.php
-%%PHAMMDIR%%/functions/load_plugins.php
-%%PHAMMDIR%%/functions/menu_plugins.php
-%%PHAMMDIR%%/functions/password_hash.php
-%%PHAMMDIR%%/functions/password_valid.php
-%%PHAMMDIR%%/functions/phamm_date.php
-%%PHAMMDIR%%/functions/phamm_log.php
-%%PHAMMDIR%%/functions/phamm_set_var.php
-%%PHAMMDIR%%/functions/php_error_level.php
-%%PHAMMDIR%%/functions/plugin_templates.php
-%%PHAMMDIR%%/functions/print_message.php
-%%PHAMMDIR%%/functions/randstr.php
-%%PHAMMDIR%%/functions/refresh.php
-%%PHAMMDIR%%/functions/scale_level.php
-%%PHAMMDIR%%/functions/self_values.php
-%%PHAMMDIR%%/functions/true_false_box.php
-%%PHAMMDIR%%/functions/tryBind.php
-%%PHAMMDIR%%/functions/tryLogin.php
-%%PHAMMDIR%%/img/CVS/Entries
-%%PHAMMDIR%%/img/CVS/Repository
-%%PHAMMDIR%%/img/CVS/Root
+%%PHAMMDIR%%/DTD/phamm-plugins.dtd
+%%PHAMMDIR%%/docs/install.xml
+%%PHAMMDIR%%/docs/phamm_history-it.sgml
 %%PHAMMDIR%%/index.php
-%%PHAMMDIR%%/libs/CVS/Entries
-%%PHAMMDIR%%/libs/CVS/Repository
-%%PHAMMDIR%%/libs/CVS/Root
-%%PHAMMDIR%%/locales/CVS/Entries
-%%PHAMMDIR%%/locales/CVS/Entries.Log
-%%PHAMMDIR%%/locales/CVS/Repository
-%%PHAMMDIR%%/locales/CVS/Root
-%%PHAMMDIR%%/locales/README.locales
-%%PHAMMDIR%%/locales/TRANSLATORS
-%%PHAMMDIR%%/locales/check_lang_files.php
-%%PHAMMDIR%%/locales/de_DE.php
-%%PHAMMDIR%%/locales/es_ES.php
-%%PHAMMDIR%%/locales/fr_FR.php
-%%PHAMMDIR%%/locales/hu_HU.php
-%%PHAMMDIR%%/locales/id_ID.php
-%%PHAMMDIR%%/locales/it_IT.php
-%%PHAMMDIR%%/locales/plugins/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/CVS/Entries.Log
-%%PHAMMDIR%%/locales/plugins/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/CVS/Root
-%%PHAMMDIR%%/locales/plugins/mail/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/mail/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/mail/CVS/Root
-%%PHAMMDIR%%/locales/plugins/pdns/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/pdns/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/pdns/CVS/Root
-%%PHAMMDIR%%/locales/plugins/pdns/de_DE.php
-%%PHAMMDIR%%/locales/plugins/pdns/id_ID.php
-%%PHAMMDIR%%/locales/plugins/pdns/it_IT.php
-%%PHAMMDIR%%/locales/plugins/radius/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/radius/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/radius/CVS/Root
-%%PHAMMDIR%%/locales/plugins/radius/en_GB.php
-%%PHAMMDIR%%/locales/plugins/userInfo/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/userInfo/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/userInfo/CVS/Root
-%%PHAMMDIR%%/locales/plugins/vadmin/CVS/Entries
-%%PHAMMDIR%%/locales/plugins/vadmin/CVS/Repository
-%%PHAMMDIR%%/locales/plugins/vadmin/CVS/Root
-%%PHAMMDIR%%/locales/pt_BR.php
-%%PHAMMDIR%%/locales/ru_RU.php
-%%PHAMMDIR%%/plugins/CVS/Entries
-%%PHAMMDIR%%/plugins/CVS/Entries.Log
-%%PHAMMDIR%%/plugins/CVS/Repository
-%%PHAMMDIR%%/plugins/CVS/Root
-%%PHAMMDIR%%/plugins/core/CVS/Entries
-%%PHAMMDIR%%/plugins/core/CVS/Repository
-%%PHAMMDIR%%/plugins/core/CVS/Root
-%%PHAMMDIR%%/plugins/mail/CVS/Entries
-%%PHAMMDIR%%/plugins/mail/CVS/Entries.Log
-%%PHAMMDIR%%/plugins/mail/CVS/Repository
-%%PHAMMDIR%%/plugins/mail/CVS/Root
-%%PHAMMDIR%%/plugins/mail/add_domain.php
-%%PHAMMDIR%%/plugins/mail/config.inc.php
-%%PHAMMDIR%%/plugins/mail/config.inc.php.template
-%%PHAMMDIR%%/plugins/mail/en_GB.php
-%%PHAMMDIR%%/plugins/mail/functions/CVS/Entries
-%%PHAMMDIR%%/plugins/mail/functions/CVS/Repository
-%%PHAMMDIR%%/plugins/mail/functions/CVS/Root
-%%PHAMMDIR%%/plugins/mail/functions/add_alias.php
-%%PHAMMDIR%%/plugins/mail/functions/add_domain_mail.php
-%%PHAMMDIR%%/plugins/mail/functions/add_mail.php
-%%PHAMMDIR%%/plugins/mail/functions/alias_count.php
-%%PHAMMDIR%%/plugins/mail/functions/alias_list.php
-%%PHAMMDIR%%/plugins/mail/functions/alias_modify_group.php
-%%PHAMMDIR%%/plugins/mail/functions/alias_values.php
-%%PHAMMDIR%%/plugins/mail/functions/domain_quota_used.php
-%%PHAMMDIR%%/plugins/mail/functions/domains_list.php
-%%PHAMMDIR%%/plugins/mail/functions/domains_modify_group.php
-%%PHAMMDIR%%/plugins/mail/functions/form_add_alias.php
-%%PHAMMDIR%%/plugins/mail/functions/form_add_alias_2.php
-%%PHAMMDIR%%/plugins/mail/functions/form_add_mail.php
-%%PHAMMDIR%%/plugins/mail/functions/form_add_mail_2.php
-%%PHAMMDIR%%/plugins/mail/functions/is_catch_all.php
-%%PHAMMDIR%%/plugins/mail/functions/is_domain_mail.php
-%%PHAMMDIR%%/plugins/mail/functions/mail_count.php
-%%PHAMMDIR%%/plugins/mail/functions/mail_list.php
-%%PHAMMDIR%%/plugins/mail/functions/mail_modify_group.php
-%%PHAMMDIR%%/plugins/mail/functions/mail_values.php
-%%PHAMMDIR%%/plugins/mail/functions/maildrop_del.php
-%%PHAMMDIR%%/plugins/mail/functions/maildrop_list.php
-%%PHAMMDIR%%/plugins/mail/functions/modify_alias.php
-%%PHAMMDIR%%/plugins/mail/functions/modify_mail.php
-%%PHAMMDIR%%/plugins/mail/functions/quota_formatting.php
-%%PHAMMDIR%%/plugins/mail/info.php
-%%PHAMMDIR%%/plugins/mail/main.php
-%%PHAMMDIR%%/plugins/mail/templates/CVS/Entries
-%%PHAMMDIR%%/plugins/mail/templates/CVS/Repository
-%%PHAMMDIR%%/plugins/mail/templates/CVS/Root
-%%PHAMMDIR%%/plugins/mail/welcome_message.txt
-%%PHAMMDIR%%/plugins/pdns/CVS/Entries
-%%PHAMMDIR%%/plugins/pdns/CVS/Entries.Log
-%%PHAMMDIR%%/plugins/pdns/CVS/Repository
-%%PHAMMDIR%%/plugins/pdns/CVS/Root
-%%PHAMMDIR%%/plugins/pdns/TODO
-%%PHAMMDIR%%/plugins/pdns/add_domain.php
-%%PHAMMDIR%%/plugins/pdns/config.inc.php
-%%PHAMMDIR%%/plugins/pdns/config.inc.php.template
-%%PHAMMDIR%%/plugins/pdns/en_GB.php
-%%PHAMMDIR%%/plugins/pdns/functions.php
-%%PHAMMDIR%%/plugins/pdns/info.php
-%%PHAMMDIR%%/plugins/pdns/main.php
-%%PHAMMDIR%%/plugins/pdns/templates/CVS/Entries
-%%PHAMMDIR%%/plugins/pdns/templates/CVS/Repository
-%%PHAMMDIR%%/plugins/pdns/templates/CVS/Root
-%%PHAMMDIR%%/plugins/pdns/templates/mytemplate.php.template
-%%PHAMMDIR%%/plugins/radius/CVS/Entries
-%%PHAMMDIR%%/plugins/radius/CVS/Entries.Log
-%%PHAMMDIR%%/plugins/radius/CVS/Repository
-%%PHAMMDIR%%/plugins/radius/CVS/Root
-%%PHAMMDIR%%/plugins/radius/README.radius
-%%PHAMMDIR%%/plugins/radius/add_domain.php
-%%PHAMMDIR%%/plugins/radius/config.inc.php.template
-%%PHAMMDIR%%/plugins/radius/en_GB.php
-%%PHAMMDIR%%/plugins/radius/functions/CVS/Entries
-%%PHAMMDIR%%/plugins/radius/functions/CVS/Repository
-%%PHAMMDIR%%/plugins/radius/functions/CVS/Root
-%%PHAMMDIR%%/plugins/radius/functions/account_count.php
-%%PHAMMDIR%%/plugins/radius/functions/account_list.php
-%%PHAMMDIR%%/plugins/radius/functions/account_modify_group.php
-%%PHAMMDIR%%/plugins/radius/functions/account_values.php
-%%PHAMMDIR%%/plugins/radius/functions/add_account.php
-%%PHAMMDIR%%/plugins/radius/functions/add_realm.php
-%%PHAMMDIR%%/plugins/radius/functions/form_add_account.php
-%%PHAMMDIR%%/plugins/radius/functions/form_add_account_2.php
-%%PHAMMDIR%%/plugins/radius/functions/form_add_realm.php
-%%PHAMMDIR%%/plugins/radius/functions/form_add_realm_2.php
-%%PHAMMDIR%%/plugins/radius/functions/is_realm_account.php
-%%PHAMMDIR%%/plugins/radius/functions/modify_account.php
-%%PHAMMDIR%%/plugins/radius/functions/realms_list.php
-%%PHAMMDIR%%/plugins/radius/functions/realms_modify_group.php
-%%PHAMMDIR%%/plugins/radius/info.php
-%%PHAMMDIR%%/plugins/radius/main.php
-%%PHAMMDIR%%/plugins/radius_stats/CVS/Entries
-%%PHAMMDIR%%/plugins/radius_stats/CVS/Entries.Log
-%%PHAMMDIR%%/plugins/radius_stats/CVS/Repository
-%%PHAMMDIR%%/plugins/radius_stats/CVS/Root
-%%PHAMMDIR%%/plugins/radius_stats/README.radius_stats
-%%PHAMMDIR%%/plugins/radius_stats/config.inc.php.template
-%%PHAMMDIR%%/plugins/radius_stats/csv_export.php
-%%PHAMMDIR%%/plugins/radius_stats/en_GB.php
-%%PHAMMDIR%%/plugins/radius_stats/functions/CVS/Entries
-%%PHAMMDIR%%/plugins/radius_stats/functions/CVS/Repository
-%%PHAMMDIR%%/plugins/radius_stats/functions/CVS/Root
-%%PHAMMDIR%%/plugins/radius_stats/functions/form_accounting.php
-%%PHAMMDIR%%/plugins/radius_stats/functions/select_accounting.php
-%%PHAMMDIR%%/plugins/radius_stats/info.php
-%%PHAMMDIR%%/plugins/radius_stats/main.php
-%%PHAMMDIR%%/plugins/rates/CVS/Entries
-%%PHAMMDIR%%/plugins/rates/CVS/Repository
-%%PHAMMDIR%%/plugins/rates/CVS/Root
-%%PHAMMDIR%%/plugins/rates/config.inc.php.template
-%%PHAMMDIR%%/plugins/rates/en_GB.php
-%%PHAMMDIR%%/plugins/rates/functions.php
-%%PHAMMDIR%%/plugins/rates/info.php
-%%PHAMMDIR%%/plugins/rates/main.php
-%%PHAMMDIR%%/plugins/whoami/CVS/Entries
-%%PHAMMDIR%%/plugins/whoami/CVS/Repository
-%%PHAMMDIR%%/plugins/whoami/CVS/Root
-%%PHAMMDIR%%/plugins/whoami/functions.php
-%%PHAMMDIR%%/plugins/whoami/info.php
-%%PHAMMDIR%%/plugins/whoami/main.php
-%%PHAMMDIR%%/style/CVS/Entries
-%%PHAMMDIR%%/style/CVS/Entries.Log
-%%PHAMMDIR%%/style/CVS/Repository
-%%PHAMMDIR%%/style/CVS/Root
-%%PHAMMDIR%%/style/phamm/CVS/Entries
-%%PHAMMDIR%%/style/phamm/CVS/Entries.Log
-%%PHAMMDIR%%/style/phamm/CVS/Repository
-%%PHAMMDIR%%/style/phamm/CVS/Root
-%%PHAMMDIR%%/style/phamm/img/CVS/Entries
-%%PHAMMDIR%%/style/phamm/img/CVS/Repository
-%%PHAMMDIR%%/style/phamm/img/CVS/Root
-%%PHAMMDIR%%/templates/CVS/Entries
-%%PHAMMDIR%%/templates/CVS/Repository
-%%PHAMMDIR%%/templates/CVS/Root
-%%PHAMMDIR%%/tools/CVS/Entries
-%%PHAMMDIR%%/tools/CVS/Repository
-%%PHAMMDIR%%/tools/CVS/Root
-%%PHAMMDIR%%/tools/cleaner-for-demosite.sh
+%%PHAMMDIR%%/lib/common.php
+%%PHAMMDIR%%/lib/locale.php
+%%PHAMMDIR%%/lib/login.php
+%%PHAMMDIR%%/lib/phamm.php
+%%PHAMMDIR%%/lib/plugin.php
+%%PHAMMDIR%%/lib/xhtml.php
+%%PHAMMDIR%%/locales/da_DK/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/de_DE/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/es_ES/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/fr_FR/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/hu_HU/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/it_IT/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/pl_PL/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/ru/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/ru_RU/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/vi/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/locales/vi_VN/LC_MESSAGES/messages.mo
+%%PHAMMDIR%%/plugins/alias.xml
+%%PHAMMDIR%%/plugins/davical.xml
+%%PHAMMDIR%%/plugins/ftp.xml
+%%PHAMMDIR%%/plugins/jabber.xml
+%%PHAMMDIR%%/plugins/mail.xml
+%%PHAMMDIR%%/plugins/person.xml
+%%PHAMMDIR%%/plugins/proxy.xml
+%%PHAMMDIR%%/po/Makefile
+%%PHAMMDIR%%/po/da_DK.po
+%%PHAMMDIR%%/po/de_DE.po
+%%PHAMMDIR%%/po/es_ES.po
+%%PHAMMDIR%%/po/fr_FR.po
+%%PHAMMDIR%%/po/hu_HU.po
+%%PHAMMDIR%%/po/it_IT.po
+%%PHAMMDIR%%/po/phamm.pot
+%%PHAMMDIR%%/po/pl_PL.po
+%%PHAMMDIR%%/po/ru.po
+%%PHAMMDIR%%/po/update-all-mo.sh
+%%PHAMMDIR%%/po/vi_VN.po
+%%PHAMMDIR%%/tools/backup-basedn.sh
+%%PHAMMDIR%%/tools/check_expiration.pl
 %%PHAMMDIR%%/tools/cleaner.sh
-%%PHAMMDIR%%/tools/config.inc.php.live
-%%PHAMMDIR%%/tools/config.live.diff
-%%PHAMMDIR%%/tools/init-ldif
-%%PHAMMDIR%%/tools/insert-ldap
-%%PHAMMDIR%%/tools/mail-all
+%%PHAMMDIR%%/tools/greylist_recipients_whitelists_ldap.pl
+%%PHAMMDIR%%/tools/handle_vacation.sh
+%%PHAMMDIR%%/tools/insert-ldap.sh
+%%PHAMMDIR%%/tools/ldap-schema-manage
+%%PHAMMDIR%%/tools/lib_functions.sh
 %%PHAMMDIR%%/tools/make-mail.sh
-%%PHAMMDIR%%/tools/make_single_lib.sh
-%%PHAMMDIR%%/tools/migrate.sh
-%%PHAMMDIR%%/tools/mod-ldap
-%%PHAMMDIR%%/tools/phamm-rotate
-%%PHAMMDIR%%/tools/save-manager-ldap
-%%PHAMMDIR%%/tools/save-phamm-ldap
-%%PHAMMDIR%%/tools/test.sh
-%%PHAMMDIR%%/tools/virtual.sh
-%%PHAMMDIR%%/web/CVS/Entries
-%%PHAMMDIR%%/web/CVS/Repository
-%%PHAMMDIR%%/web/CVS/Root
-%%PHAMMDIR%%/web/functions.js
-%%PHAMMDIR%%/web/pngfix.js
-%%PHAMMDIR%%/www-data/CVS/Entries
-%%PHAMMDIR%%/www-data/CVS/Entries.Log
-%%PHAMMDIR%%/www-data/CVS/Repository
-%%PHAMMDIR%%/www-data/CVS/Root
-%%PHAMMDIR%%/www-data/img/CVS/Entries
-%%PHAMMDIR%%/www-data/img/CVS/Repository
-%%PHAMMDIR%%/www-data/img/CVS/Root
+%%PHAMMDIR%%/tools/mod-ldap.sh
+%%PHAMMDIR%%/tools/phamm-useradd.pl
+%%PHAMMDIR%%/www-data/functions.js
+%%PHAMMDIR%%/www-data/img/FALSE.png
+%%PHAMMDIR%%/www-data/img/TRUE.png
 %%PHAMMDIR%%/www-data/img/phamm_100.png
 %%PHAMMDIR%%/www-data/img/phamm_icon.png
+%%PHAMMDIR%%/www-data/img/smile.png
+%%PHAMMDIR%%/www-data/img/waiting.png
 %%PHAMMDIR%%/www-data/index.php
-%%PHAMMDIR%%/www-data/logout.php
 %%PHAMMDIR%%/www-data/main.php
-%%PHAMMDIR%%/www-data/robots.txt
-%%PHAMMDIR%%/www-data/setup.php
-%%PHAMMDIR%%/www-data/style/CVS/Entries
-%%PHAMMDIR%%/www-data/style/CVS/Entries.Log
-%%PHAMMDIR%%/www-data/style/CVS/Repository
-%%PHAMMDIR%%/www-data/style/CVS/Root
-%%PHAMMDIR%%/www-data/style/phamm/CVS/Entries
-%%PHAMMDIR%%/www-data/style/phamm/CVS/Entries.Log
-%%PHAMMDIR%%/www-data/style/phamm/CVS/Repository
-%%PHAMMDIR%%/www-data/style/phamm/CVS/Root
-%%PHAMMDIR%%/www-data/style/phamm/footer.html.php
-%%PHAMMDIR%%/www-data/style/phamm/header.html.php
-%%PHAMMDIR%%/www-data/style/phamm/img/CVS/Entries
-%%PHAMMDIR%%/www-data/style/phamm/img/CVS/Repository
-%%PHAMMDIR%%/www-data/style/phamm/img/CVS/Root
 %%PHAMMDIR%%/www-data/style/phamm/img/FALSE.png
 %%PHAMMDIR%%/www-data/style/phamm/img/TRUE.png
 %%PHAMMDIR%%/www-data/style/phamm/img/navigation.png
 %%PHAMMDIR%%/www-data/style/phamm/main.css
-@dirrm %%PHAMMDIR%%/www-data/style/phamm/img/CVS
 @dirrm %%PHAMMDIR%%/www-data/style/phamm/img
-@dirrm %%PHAMMDIR%%/www-data/style/phamm/CVS
 @dirrm %%PHAMMDIR%%/www-data/style/phamm
-@dirrm %%PHAMMDIR%%/www-data/style/CVS
 @dirrm %%PHAMMDIR%%/www-data/style
-@dirrm %%PHAMMDIR%%/www-data/img/CVS
 @dirrm %%PHAMMDIR%%/www-data/img
-@dirrm %%PHAMMDIR%%/www-data/CVS
 @dirrm %%PHAMMDIR%%/www-data
-@dirrm %%PHAMMDIR%%/web/CVS
-@dirrm %%PHAMMDIR%%/web
-@dirrm %%PHAMMDIR%%/tools/CVS
 @dirrm %%PHAMMDIR%%/tools
-@dirrm %%PHAMMDIR%%/templates/CVS
-@dirrm %%PHAMMDIR%%/templates
-@dirrm %%PHAMMDIR%%/style/phamm/img/CVS
-@dirrm %%PHAMMDIR%%/style/phamm/img
-@dirrm %%PHAMMDIR%%/style/phamm/CVS
-@dirrm %%PHAMMDIR%%/style/phamm
-@dirrm %%PHAMMDIR%%/style/CVS
-@dirrm %%PHAMMDIR%%/style
-@dirrm %%PHAMMDIR%%/plugins/whoami/CVS
-@dirrm %%PHAMMDIR%%/plugins/whoami
-@dirrm %%PHAMMDIR%%/plugins/rates/CVS
-@dirrm %%PHAMMDIR%%/plugins/rates
-@dirrm %%PHAMMDIR%%/plugins/radius_stats/functions/CVS
-@dirrm %%PHAMMDIR%%/plugins/radius_stats/functions
-@dirrm %%PHAMMDIR%%/plugins/radius_stats/CVS
-@dirrm %%PHAMMDIR%%/plugins/radius_stats
-@dirrm %%PHAMMDIR%%/plugins/radius/functions/CVS
-@dirrm %%PHAMMDIR%%/plugins/radius/functions
-@dirrm %%PHAMMDIR%%/plugins/radius/CVS
-@dirrm %%PHAMMDIR%%/plugins/radius
-@dirrm %%PHAMMDIR%%/plugins/pdns/templates/CVS
-@dirrm %%PHAMMDIR%%/plugins/pdns/templates
-@dirrm %%PHAMMDIR%%/plugins/pdns/CVS
-@dirrm %%PHAMMDIR%%/plugins/pdns
-@dirrm %%PHAMMDIR%%/plugins/mail/templates/CVS
-@dirrm %%PHAMMDIR%%/plugins/mail/templates
-@dirrm %%PHAMMDIR%%/plugins/mail/functions/CVS
-@dirrm %%PHAMMDIR%%/plugins/mail/functions
-@dirrm %%PHAMMDIR%%/plugins/mail/CVS
-@dirrm %%PHAMMDIR%%/plugins/mail
-@dirrm %%PHAMMDIR%%/plugins/core/CVS
-@dirrm %%PHAMMDIR%%/plugins/core
-@dirrm %%PHAMMDIR%%/plugins/CVS
+@dirrm %%PHAMMDIR%%/po
 @dirrm %%PHAMMDIR%%/plugins
-@dirrm %%PHAMMDIR%%/locales/plugins/vadmin/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins/vadmin
-@dirrm %%PHAMMDIR%%/locales/plugins/userInfo/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins/userInfo
-@dirrm %%PHAMMDIR%%/locales/plugins/radius/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins/radius
-@dirrm %%PHAMMDIR%%/locales/plugins/pdns/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins/pdns
-@dirrm %%PHAMMDIR%%/locales/plugins/mail/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins/mail
-@dirrm %%PHAMMDIR%%/locales/plugins/CVS
-@dirrm %%PHAMMDIR%%/locales/plugins
-@dirrm %%PHAMMDIR%%/locales/CVS
+@dirrm %%PHAMMDIR%%/locales/vi_VN/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/vi_VN
+@dirrm %%PHAMMDIR%%/locales/vi/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/vi
+@dirrm %%PHAMMDIR%%/locales/ru_RU/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/ru_RU
+@dirrm %%PHAMMDIR%%/locales/ru/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/ru
+@dirrm %%PHAMMDIR%%/locales/pl_PL/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/pl_PL
+@dirrm %%PHAMMDIR%%/locales/it_IT/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/it_IT
+@dirrm %%PHAMMDIR%%/locales/hu_HU/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/hu_HU
+@dirrm %%PHAMMDIR%%/locales/fr_FR/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/fr_FR
+@dirrm %%PHAMMDIR%%/locales/es_ES/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/es_ES
+@dirrm %%PHAMMDIR%%/locales/de_DE/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/de_DE
+@dirrm %%PHAMMDIR%%/locales/da_DK/LC_MESSAGES
+@dirrm %%PHAMMDIR%%/locales/da_DK
 @dirrm %%PHAMMDIR%%/locales
-@dirrm %%PHAMMDIR%%/libs/CVS
-@dirrm %%PHAMMDIR%%/libs
-@dirrm %%PHAMMDIR%%/img/CVS
-@dirrm %%PHAMMDIR%%/img
-@dirrm %%PHAMMDIR%%/functions/CVS
-@dirrm %%PHAMMDIR%%/functions
-@dirrm %%PHAMMDIR%%/DTDs/CVS
-@dirrm %%PHAMMDIR%%/DTDs
-@dirrm %%PHAMMDIR%%/CVS
-@dirrmtry %%PHAMMDIR%%
-@dirrm %%EXAMPLESDIR%%/sm-plugin/CVS
-@dirrm %%EXAMPLESDIR%%/sm-plugin
-@dirrm %%EXAMPLESDIR%%/schema/CVS
-@dirrm %%EXAMPLESDIR%%/schema
-@dirrm %%EXAMPLESDIR%%/sasl/CVS
-@dirrm %%EXAMPLESDIR%%/sasl
-@dirrm %%EXAMPLESDIR%%/fork/CVS
-@dirrm %%EXAMPLESDIR%%/fork
-@dirrm %%EXAMPLESDIR%%/CVS
-@dirrm %%EXAMPLESDIR%%
+@dirrm %%PHAMMDIR%%/lib
+@dirrm %%PHAMMDIR%%/docs
+@dirrm %%PHAMMDIR%%/DTD
+@dirrm %%PHAMMDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/schema/contrib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/schema
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ldif
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/squid
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/smbldap-tools
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/slapd
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/sasl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/pure-ftpd-ldap
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/postfix
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/phamm
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/pdns-backend-ldap
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/libnss-ldap
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/gnarwl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/dovecot
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/davical
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/cron
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/courier-authlib-ldap
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/apache2.2
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/amavisd-new
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%