Update to version 0.9.5.

Fix pkglint warnings about whitespace in MESSAGE.
Use pax -s instead of rming unwanted files.

Changes since last packaged version (0.9.4b)
* Version 0.9.5, 2004-12-17
 * Notes:
    This version adds substantial new features and several minor bug fixes as
    well as PHP5 support!
 * Changes:
    - Added PHP5 support using Zend1 compatibility options.
    - Users can now specify a format string for custom display of DNs in the
      tree viewer (see $tree_display_format in config.php.example)
    - If using http auth_type, DNs and passwords are now encrypted int he cookie
      using blowfish.
    - If base entry is missing, phpLDAPadmin will prompt you to create it and
      give you some sane default values to get started.
    - Added index file for viewing of all PLA icons (see
      phpldapadmin/images/index.php)
    - Added custom country flag icons for DNs in the form "c=us"
    - Added more custom icons (ipNetwork, Device, Room)
    - Made it easier to create the base entry of an empty tree.
    - Fixed bug related to predefined search queries with patch from Olivier
      Mounier
    - Added a template for mozillaOrgPerson
    - Improved error handling for non-existent or unreadable template files.
    - "Create new" now displays at the top *and* bottom of the tree viewer list
      if there are more than 10 entries in the container (make it easier for
      users by reducing scrolling)
    - Optimized several pages by closing the session early if not needed.
    - By request, reversed the order of first name / last name in the
      inetOrgPerson template.
    - Added a login_string feature for admins who have all their users in a
      single container, so they can specify a string like
      "uid=,ou=People,dc=example,dc=com" instead of setting up the painful
      login_attr stuff.
    - Changed the delete button to be red (like phpMyAdmin) to make it more
      obvious.
    - Consolidated the links at the top of the tree viewer to make better use
      of real estate.
    - New logo!
    - Patch from Dimitre to fix unique attrs enforcement.
    - Templates can now redirect wherever they want using a hidden form input.
    - Added a "Home" button in the tree viewer to get back to the main PLA page
      if desired.
    - PLA now looks up the gidNumber to display group description and name in
      user accounst.
    - Improved the hint about structural objectClasses in the custom creation
      template
    - Added ability to purge caches (mostly just schema objects) and caches are
      auto-purged when the schema is viewed in the schema browser.
    - Changed the arrow icon next to objectClass values to be an information
      button.
    - Search results can be displayed in table format now.
    - Fixes to LDIF import.
    - Added support for exporting to VCard 2.1 format.
    - Lots of little session fixes.
    - Structural objectClasses are now shown in bold in the custom creation
      template.
    - Fixed lots of bugs, some big some minor:
      1025353      1037715      1029103      1026427      1025353        1020606
      1020376      1010576      1009410      1007281      1007132        1004042
      1002794      1001941      1000185      999605       999170          996842
      995362       995297       995296       994343       993875          992419
      991891       989219       984587       983375       981283          979395
      977598       974369       973520       973323       965165          964410
      962074       959950       958372       957284       954453

4 files changed, 221 insertions, 13 deletions

diff --git a/databases/phpldapadmin/MESSAGE b/databases/phpldapadmin/MESSAGE
index 101b6de4c4b..3fe49666b92 100644
--- a/databases/phpldapadmin/MESSAGE
+++ b/databases/phpldapadmin/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/08/29 15:56:34 recht Exp $
+$NetBSD: MESSAGE,v 1.2 2005/03/26 11:10:10 seb Exp $
 
-To enable this web application, first go to 
+To enable this web application, first go to
 ${PREFIX}/share/phpldapadmin
 
 cp config.php.example config.php
@@ -12,7 +12,7 @@ using an alias , like so:
 
     Alias /ldapadmin /${PREFIX}/share/phpldapadmin
 
-  # strongly recommended 
+  # strongly recommended
     <Location /ldapadmin >
         Require user adminaccount
     </Location>
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index 6050d8f743a..213c6163db9 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/31 23:47:32 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/26 11:10:10 seb Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	databases www
@@ -10,7 +10,7 @@ COMMENT=	Set of PHP-scripts to administer an LDAP directory over the WWW
 
 DEPENDS+=	php-ldap>=4.1.2:../../databases/php-ldap
 
-VERSION=	0.9.4b
+VERSION=	0.9.5
 NO_BUILD=	YES
 NO_BUILDLINK=	YES
 
@@ -18,8 +18,9 @@ INSTALLATION_DIRS=	${PREFIX}/share/phpldapadmin
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
-	cd ${WRKSRC} && ${PAX} \
+	cd ${WRKSRC} && ${PAX}		\
+		-s /\.#//		\
+		-s /\.cvsignore//	\
 		-rwppm . ${PREFIX}/share/phpldapadmin
-	${RM} ${PREFIX}/share/phpldapadmin/.cvsignore
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpldapadmin/PLIST b/databases/phpldapadmin/PLIST
index bb6cb96ccc0..a4fe7b81b65 100644
--- a/databases/phpldapadmin/PLIST
+++ b/databases/phpldapadmin/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/29 15:56:35 recht Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/26 11:10:10 seb Exp $
 share/phpldapadmin/INSTALL
 share/phpldapadmin/LICENSE
 share/phpldapadmin/VERSION
+share/phpldapadmin/VERSION.1.6
 share/phpldapadmin/add_attr.php
 share/phpldapadmin/add_attr_form.php
 share/phpldapadmin/add_oclass.php
 share/phpldapadmin/add_oclass_form.php
 share/phpldapadmin/add_value.php
 share/phpldapadmin/add_value_form.php
+share/phpldapadmin/blowfish.php
 share/phpldapadmin/check_lang_files.php
 share/phpldapadmin/collapse.php
 share/phpldapadmin/common.php
@@ -30,6 +32,7 @@ share/phpldapadmin/doc/README-translation.txt
 share/phpldapadmin/doc/ROADMAP
 share/phpldapadmin/doc/pla-test-i18n.ldif
 share/phpldapadmin/documentation.php
+share/phpldapadmin/donate.php
 share/phpldapadmin/download_binary_attr.php
 share/phpldapadmin/edit.php
 share/phpldapadmin/emuhash_functions.php
@@ -40,45 +43,225 @@ share/phpldapadmin/export.php
 share/phpldapadmin/export_form.php
 share/phpldapadmin/export_functions.php
 share/phpldapadmin/functions.php
+share/phpldapadmin/generic_utils.js
 share/phpldapadmin/header.php
+share/phpldapadmin/help.php
+share/phpldapadmin/ie_png_work_around.js
 share/phpldapadmin/images/add.png
 share/phpldapadmin/images/bug.png
 share/phpldapadmin/images/catalog.png
 share/phpldapadmin/images/children.png
+share/phpldapadmin/images/countries/af.png
+share/phpldapadmin/images/countries/al.png
+share/phpldapadmin/images/countries/am.png
+share/phpldapadmin/images/countries/an.png
+share/phpldapadmin/images/countries/ao.png
+share/phpldapadmin/images/countries/ar.png
+share/phpldapadmin/images/countries/at.png
+share/phpldapadmin/images/countries/au.png
+share/phpldapadmin/images/countries/aw.png
+share/phpldapadmin/images/countries/az.png
+share/phpldapadmin/images/countries/ba.png
+share/phpldapadmin/images/countries/bb.png
+share/phpldapadmin/images/countries/bd.png
+share/phpldapadmin/images/countries/be.png
+share/phpldapadmin/images/countries/bf.png
+share/phpldapadmin/images/countries/bg.png
+share/phpldapadmin/images/countries/bh.png
+share/phpldapadmin/images/countries/bi.png
+share/phpldapadmin/images/countries/bj.png
+share/phpldapadmin/images/countries/bm.png
+share/phpldapadmin/images/countries/bn.png
+share/phpldapadmin/images/countries/bo.png
+share/phpldapadmin/images/countries/br.png
+share/phpldapadmin/images/countries/bs.png
+share/phpldapadmin/images/countries/bt.png
+share/phpldapadmin/images/countries/bw.png
+share/phpldapadmin/images/countries/by.png
+share/phpldapadmin/images/countries/bz.png
+share/phpldapadmin/images/countries/ca.png
+share/phpldapadmin/images/countries/cf.png
+share/phpldapadmin/images/countries/cg.png
+share/phpldapadmin/images/countries/ch.png
+share/phpldapadmin/images/countries/ci.png
+share/phpldapadmin/images/countries/ck.png
+share/phpldapadmin/images/countries/cl.png
+share/phpldapadmin/images/countries/cm.png
+share/phpldapadmin/images/countries/cn.png
+share/phpldapadmin/images/countries/co.png
+share/phpldapadmin/images/countries/cr.png
+share/phpldapadmin/images/countries/cu.png
+share/phpldapadmin/images/countries/cv.png
+share/phpldapadmin/images/countries/cy.png
+share/phpldapadmin/images/countries/cz.png
+share/phpldapadmin/images/countries/de.png
+share/phpldapadmin/images/countries/dk.png
+share/phpldapadmin/images/countries/dz.png
+share/phpldapadmin/images/countries/ec.png
+share/phpldapadmin/images/countries/ee.png
+share/phpldapadmin/images/countries/eg.png
+share/phpldapadmin/images/countries/er.png
+share/phpldapadmin/images/countries/es.png
+share/phpldapadmin/images/countries/et.png
+share/phpldapadmin/images/countries/fi.png
+share/phpldapadmin/images/countries/fj.png
+share/phpldapadmin/images/countries/fo.png
+share/phpldapadmin/images/countries/fr.png
+share/phpldapadmin/images/countries/ga.png
+share/phpldapadmin/images/countries/gb.png
+share/phpldapadmin/images/countries/ge.png
+share/phpldapadmin/images/countries/gi.png
+share/phpldapadmin/images/countries/gl.png
+share/phpldapadmin/images/countries/gp.png
+share/phpldapadmin/images/countries/gr.png
+share/phpldapadmin/images/countries/gt.png
+share/phpldapadmin/images/countries/gu.png
+share/phpldapadmin/images/countries/gy.png
+share/phpldapadmin/images/countries/hk.png
+share/phpldapadmin/images/countries/hr.png
+share/phpldapadmin/images/countries/ht.png
+share/phpldapadmin/images/countries/hu.png
+share/phpldapadmin/images/countries/id.png
+share/phpldapadmin/images/countries/ie.png
+share/phpldapadmin/images/countries/il.png
+share/phpldapadmin/images/countries/in.png
+share/phpldapadmin/images/countries/iq.png
+share/phpldapadmin/images/countries/ir.png
+share/phpldapadmin/images/countries/is.png
+share/phpldapadmin/images/countries/it.png
+share/phpldapadmin/images/countries/jm.png
+share/phpldapadmin/images/countries/jo.png
+share/phpldapadmin/images/countries/jp.png
+share/phpldapadmin/images/countries/ke.png
+share/phpldapadmin/images/countries/kg.png
+share/phpldapadmin/images/countries/kh.png
+share/phpldapadmin/images/countries/ki.png
+share/phpldapadmin/images/countries/kp.png
+share/phpldapadmin/images/countries/kr.png
+share/phpldapadmin/images/countries/ky.png
+share/phpldapadmin/images/countries/kz.png
+share/phpldapadmin/images/countries/lb.png
+share/phpldapadmin/images/countries/lc.png
+share/phpldapadmin/images/countries/lk.png
+share/phpldapadmin/images/countries/lt.png
+share/phpldapadmin/images/countries/lu.png
+share/phpldapadmin/images/countries/lv.png
+share/phpldapadmin/images/countries/ly.png
+share/phpldapadmin/images/countries/ma.png
+share/phpldapadmin/images/countries/mc.png
+share/phpldapadmin/images/countries/md.png
+share/phpldapadmin/images/countries/mg.png
+share/phpldapadmin/images/countries/mn.png
+share/phpldapadmin/images/countries/mo.png
+share/phpldapadmin/images/countries/mp.png
+share/phpldapadmin/images/countries/ms.png
+share/phpldapadmin/images/countries/mt.png
+share/phpldapadmin/images/countries/mx.png
+share/phpldapadmin/images/countries/my.png
+share/phpldapadmin/images/countries/mz.png
+share/phpldapadmin/images/countries/na.png
+share/phpldapadmin/images/countries/nc.png
+share/phpldapadmin/images/countries/nf.png
+share/phpldapadmin/images/countries/nl.png
+share/phpldapadmin/images/countries/no.png
+share/phpldapadmin/images/countries/np.png
+share/phpldapadmin/images/countries/nr.png
+share/phpldapadmin/images/countries/nz.png
+share/phpldapadmin/images/countries/om.png
+share/phpldapadmin/images/countries/pa.png
+share/phpldapadmin/images/countries/pe.png
+share/phpldapadmin/images/countries/pf.png
+share/phpldapadmin/images/countries/ph.png
+share/phpldapadmin/images/countries/pk.png
+share/phpldapadmin/images/countries/pl.png
+share/phpldapadmin/images/countries/pm.png
+share/phpldapadmin/images/countries/pr.png
+share/phpldapadmin/images/countries/pt.png
+share/phpldapadmin/images/countries/py.png
+share/phpldapadmin/images/countries/qa.png
+share/phpldapadmin/images/countries/ro.png
+share/phpldapadmin/images/countries/ru.png
+share/phpldapadmin/images/countries/sa.png
+share/phpldapadmin/images/countries/sb.png
+share/phpldapadmin/images/countries/sd.png
+share/phpldapadmin/images/countries/se.png
+share/phpldapadmin/images/countries/sg.png
+share/phpldapadmin/images/countries/si.png
+share/phpldapadmin/images/countries/sk.png
+share/phpldapadmin/images/countries/sl.png
+share/phpldapadmin/images/countries/so.png
+share/phpldapadmin/images/countries/sr.png
+share/phpldapadmin/images/countries/sy.png
+share/phpldapadmin/images/countries/tc.png
+share/phpldapadmin/images/countries/tg.png
+share/phpldapadmin/images/countries/th.png
+share/phpldapadmin/images/countries/tn.png
+share/phpldapadmin/images/countries/to.png
+share/phpldapadmin/images/countries/tp.png
+share/phpldapadmin/images/countries/tr.png
+share/phpldapadmin/images/countries/tt.png
+share/phpldapadmin/images/countries/tv.png
+share/phpldapadmin/images/countries/tw.png
+share/phpldapadmin/images/countries/tz.png
+share/phpldapadmin/images/countries/ua.png
+share/phpldapadmin/images/countries/ug.png
+share/phpldapadmin/images/countries/us.png
+share/phpldapadmin/images/countries/uy.png
+share/phpldapadmin/images/countries/va.png
+share/phpldapadmin/images/countries/ve.png
+share/phpldapadmin/images/countries/vg.png
+share/phpldapadmin/images/countries/vi.png
+share/phpldapadmin/images/countries/vn.png
+share/phpldapadmin/images/countries/ws.png
+share/phpldapadmin/images/countries/ye.png
+share/phpldapadmin/images/countries/yu.png
+share/phpldapadmin/images/countries/za.png
+share/phpldapadmin/images/countries/zw.png
 share/phpldapadmin/images/country.png
 share/phpldapadmin/images/cut.png
 share/phpldapadmin/images/dc.png
+share/phpldapadmin/images/device.png
+share/phpldapadmin/images/document.png
+share/phpldapadmin/images/door.png
 share/phpldapadmin/images/files.png
 share/phpldapadmin/images/find.png
 share/phpldapadmin/images/folder.png
 share/phpldapadmin/images/go.png
 share/phpldapadmin/images/hard-drive.png
+share/phpldapadmin/images/help.png
+share/phpldapadmin/images/home.png
 share/phpldapadmin/images/host.png
+share/phpldapadmin/images/index.php
+share/phpldapadmin/images/info.png
 share/phpldapadmin/images/ldap-server.png
 share/phpldapadmin/images/light.png
 share/phpldapadmin/images/locality.png
 share/phpldapadmin/images/lock.png
 share/phpldapadmin/images/logo.jpg
 share/phpldapadmin/images/mail.png
+share/phpldapadmin/images/mail_account.png
+share/phpldapadmin/images/mail_alias.png
 share/phpldapadmin/images/minus.png
 share/phpldapadmin/images/move.png
 share/phpldapadmin/images/n.png
+share/phpldapadmin/images/network.png
 share/phpldapadmin/images/nt_machine.png
 share/phpldapadmin/images/nt_user.png
 share/phpldapadmin/images/o.png
 share/phpldapadmin/images/object.png
 share/phpldapadmin/images/ou.png
+share/phpldapadmin/images/paypal-donate.png
 share/phpldapadmin/images/phone.png
 share/phpldapadmin/images/photo.png
 share/phpldapadmin/images/plus.png
 share/phpldapadmin/images/process.png
-share/phpldapadmin/images/question.png
 share/phpldapadmin/images/refresh.png
 share/phpldapadmin/images/rename.png
 share/phpldapadmin/images/save.png
 share/phpldapadmin/images/server-settings.png
 share/phpldapadmin/images/server-small.png
 share/phpldapadmin/images/server.png
+share/phpldapadmin/images/smile.png
 share/phpldapadmin/images/star.png
 share/phpldapadmin/images/terminal.png
 share/phpldapadmin/images/tools-no.png
@@ -86,6 +269,7 @@ share/phpldapadmin/images/tools.png
 share/phpldapadmin/images/trash.png
 share/phpldapadmin/images/uid.png
 share/phpldapadmin/images/uniquegroup.png
+share/phpldapadmin/images/unknown.png
 share/phpldapadmin/images/up.png
 share/phpldapadmin/images/user.png
 share/phpldapadmin/images/warning.png
@@ -94,11 +278,14 @@ share/phpldapadmin/index.php
 share/phpldapadmin/lang/Makefile
 share/phpldapadmin/lang/auto.php
 share/phpldapadmin/lang/ca.php
+share/phpldapadmin/lang/cz.php
 share/phpldapadmin/lang/de.php
 share/phpldapadmin/lang/en.php
 share/phpldapadmin/lang/es.php
 share/phpldapadmin/lang/fr.php
+share/phpldapadmin/lang/hu.php
 share/phpldapadmin/lang/it.php
+share/phpldapadmin/lang/ja.php
 share/phpldapadmin/lang/nl.php
 share/phpldapadmin/lang/pl.php
 share/phpldapadmin/lang/pt-br.php
@@ -109,7 +296,9 @@ share/phpldapadmin/lang/recoded/de.php
 share/phpldapadmin/lang/recoded/en.php
 share/phpldapadmin/lang/recoded/es.php
 share/phpldapadmin/lang/recoded/fr.php
+share/phpldapadmin/lang/recoded/hu.php
 share/phpldapadmin/lang/recoded/it.php
+share/phpldapadmin/lang/recoded/ja.php
 share/phpldapadmin/lang/recoded/nl.php
 share/phpldapadmin/lang/recoded/pl.php
 share/phpldapadmin/lang/recoded/pt-br.php
@@ -129,6 +318,8 @@ share/phpldapadmin/login.php
 share/phpldapadmin/login_form.php
 share/phpldapadmin/logout.php
 share/phpldapadmin/mass_delete.php
+share/phpldapadmin/password_checker.php
+share/phpldapadmin/purge_cache.php
 share/phpldapadmin/rdelete.php
 share/phpldapadmin/refresh.php
 share/phpldapadmin/rename.php
@@ -139,18 +330,31 @@ share/phpldapadmin/search.php
 share/phpldapadmin/search_form_advanced.php
 share/phpldapadmin/search_form_predefined.php
 share/phpldapadmin/search_form_simple.php
+share/phpldapadmin/search_results_list.php
+share/phpldapadmin/search_results_table.php
 share/phpldapadmin/search_util.js
 share/phpldapadmin/server_info.php
 share/phpldapadmin/session_functions.php
 share/phpldapadmin/style.css
 share/phpldapadmin/templates/creation/custom.php
 share/phpldapadmin/templates/creation/new_address_template.php
+share/phpldapadmin/templates/creation/new_alias_template.php
 share/phpldapadmin/templates/creation/new_dns_entry.php
 share/phpldapadmin/templates/creation/new_kolab_template.php
+share/phpldapadmin/templates/creation/new_mozillaOrgPerson_template.php
 share/phpldapadmin/templates/creation/new_nt_machine.php
+share/phpldapadmin/templates/creation/new_organizationalRole.php
 share/phpldapadmin/templates/creation/new_ou_template.php
 share/phpldapadmin/templates/creation/new_posix_group_template.php
+share/phpldapadmin/templates/creation/new_postfix_account_template.php
+share/phpldapadmin/templates/creation/new_postfix_alias_template.php
 share/phpldapadmin/templates/creation/new_security_object_template.php
+share/phpldapadmin/templates/creation/new_sendmail_alias_template.php
+share/phpldapadmin/templates/creation/new_sendmail_cluster_template.php
+share/phpldapadmin/templates/creation/new_sendmail_domain_template.php
+share/phpldapadmin/templates/creation/new_sendmail_relay_template.php
+share/phpldapadmin/templates/creation/new_sendmail_virthost_template.php
+share/phpldapadmin/templates/creation/new_sendmail_virtuser_template.php
 share/phpldapadmin/templates/creation/new_smb3_nt_machine.php
 share/phpldapadmin/templates/creation/new_smb3_user_template.php
 share/phpldapadmin/templates/creation/new_smbgroup_template.php
@@ -158,9 +362,11 @@ share/phpldapadmin/templates/creation/new_smbuser_template.php
 share/phpldapadmin/templates/creation/new_user_template.php
 share/phpldapadmin/templates/modification/default.php
 share/phpldapadmin/templates/modification/group_of_names.php
+share/phpldapadmin/templates/modification/samba_account.php
 share/phpldapadmin/templates/modification/user.php
 share/phpldapadmin/templates/template_config.php
 share/phpldapadmin/tree.php
+share/phpldapadmin/tree_functions.php
 share/phpldapadmin/unit_test.php
 share/phpldapadmin/update.php
 share/phpldapadmin/update_confirm.php
@@ -171,6 +377,7 @@ share/phpldapadmin/welcome.php
 @dirrm share/phpldapadmin/templates
 @dirrm share/phpldapadmin/lang/recoded
 @dirrm share/phpldapadmin/lang
+@dirrm share/phpldapadmin/images/countries
 @dirrm share/phpldapadmin/images
 @dirrm share/phpldapadmin/doc
 @dirrm share/phpldapadmin
diff --git a/databases/phpldapadmin/distinfo b/databases/phpldapadmin/distinfo
index b1bfb20a764..2bb627d115d 100644
--- a/databases/phpldapadmin/distinfo
+++ b/databases/phpldapadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:33:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/26 11:10:10 seb Exp $
 
-SHA1 (phpldapadmin-0.9.4b.tar.gz) = f076e28d5e68591ec360f1bba5d4d9f51f580906
-RMD160 (phpldapadmin-0.9.4b.tar.gz) = 22556ed2c48f82864d913972aeeb2da5c5feba46
-Size (phpldapadmin-0.9.4b.tar.gz) = 375889 bytes
+SHA1 (phpldapadmin-0.9.5.tar.gz) = 79d0abb8b0966e3ed664957fe05e26b1449d150b
+RMD160 (phpldapadmin-0.9.5.tar.gz) = 3c17cfaa76e4e442e5b3f21e111b1fabe458ddde
+Size (phpldapadmin-0.9.5.tar.gz) = 605162 bytes