Tune PAX arguments for installation so that print-PLIST target is usable.

Install example configuration file to PLIST.
Sort PLIST.

Bump PKGREVISION to 3.
Approved by maintainer.

2 files changed, 92 insertions, 90 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 5ac6d5d5dd9..c8584f07c54 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/14 23:06:47 seb Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/
 
@@ -63,6 +63,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${TURBADIR}
 	${INSTALL_DATA_DIR} ${TURBADIR}/config
+	${INSTALL_DATA} ${WRKSRC}/turba.conf.dist ${EGDIR}/turba.conf
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/LDAP ${DOCDIR}
@@ -74,7 +75,7 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && ${PAX} -rw . ${TURBADIR}/${d}
+		cd ${WRKSRC}/${d} && ${PAX} -rwpma . ${TURBADIR}/${d}
 .	endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${TURBADIR}/config
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index be09e6bafdf..4223fd4d155 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/13 17:13:58 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/14 23:06:47 seb Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
 share/doc/turba/RELEASE_NOTES
 share/doc/turba/UPGRADING
+share/examples/turba/turba.conf
 share/horde/turba/add.php
 share/horde/turba/browse.php
 share/horde/turba/config/attributes.php.dist
@@ -155,95 +156,95 @@ share/horde/turba/themes/graphics/new.png
 share/horde/turba/themes/graphics/turba.png
 share/horde/turba/themes/screen.css
 share/horde/turba/vcard.php
-@dirrm share/horde/turba/config
-@dirrm share/horde/turba/lib/Block
-@dirrm share/horde/turba/lib/Driver
-@dirrm share/horde/turba/lib
-@dirrm share/horde/turba/locale/ar_SY/LC_MESSAGES
-@dirrm share/horde/turba/locale/ar_SY
-@dirrm share/horde/turba/locale/bg_BG/LC_MESSAGES
-@dirrm share/horde/turba/locale/bg_BG
-@dirrm share/horde/turba/locale/ca_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/ca_ES
-@dirrm share/horde/turba/locale/cs_CZ/LC_MESSAGES
-@dirrm share/horde/turba/locale/cs_CZ
-@dirrm share/horde/turba/locale/da_DK/LC_MESSAGES
-@dirrm share/horde/turba/locale/da_DK
-@dirrm share/horde/turba/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/turba/locale/de_DE
-@dirrm share/horde/turba/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/turba/locale/el_GR
-@dirrm share/horde/turba/locale/en_US
-@dirrm share/horde/turba/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/es_ES
-@dirrm share/horde/turba/locale/et_EE/LC_MESSAGES
-@dirrm share/horde/turba/locale/et_EE
-@dirrm share/horde/turba/locale/fa_IR/LC_MESSAGES
-@dirrm share/horde/turba/locale/fa_IR
-@dirrm share/horde/turba/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/turba/locale/fi_FI
-@dirrm share/horde/turba/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/turba/locale/fr_FR
-@dirrm share/horde/turba/locale/gl_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/gl_ES
-@dirrm share/horde/turba/locale/hu_HU/LC_MESSAGES
-@dirrm share/horde/turba/locale/hu_HU
-@dirrm share/horde/turba/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/turba/locale/it_IT
-@dirrm share/horde/turba/locale/ja_JP/LC_MESSAGES
-@dirrm share/horde/turba/locale/ja_JP
-@dirrm share/horde/turba/locale/ko_KR/LC_MESSAGES
-@dirrm share/horde/turba/locale/ko_KR
-@dirrm share/horde/turba/locale/lt_LT/LC_MESSAGES
-@dirrm share/horde/turba/locale/lt_LT
-@dirrm share/horde/turba/locale/lv_LV/LC_MESSAGES
-@dirrm share/horde/turba/locale/lv_LV
-@dirrm share/horde/turba/locale/mk_MK/LC_MESSAGES
-@dirrm share/horde/turba/locale/mk_MK
-@dirrm share/horde/turba/locale/nb_NO/LC_MESSAGES
-@dirrm share/horde/turba/locale/nb_NO
-@dirrm share/horde/turba/locale/nl_NL/LC_MESSAGES
-@dirrm share/horde/turba/locale/nl_NL
-@dirrm share/horde/turba/locale/nn_NO/LC_MESSAGES
-@dirrm share/horde/turba/locale/nn_NO
-@dirrm share/horde/turba/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/turba/locale/pl_PL
-@dirrm share/horde/turba/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/turba/locale/pt_BR
-@dirrm share/horde/turba/locale/pt_PT/LC_MESSAGES
-@dirrm share/horde/turba/locale/pt_PT
-@dirrm share/horde/turba/locale/ro_RO/LC_MESSAGES
-@dirrm share/horde/turba/locale/ro_RO
-@dirrm share/horde/turba/locale/ru_RU/LC_MESSAGES
-@dirrm share/horde/turba/locale/ru_RU
-@dirrm share/horde/turba/locale/sk_SK/LC_MESSAGES
-@dirrm share/horde/turba/locale/sk_SK
-@dirrm share/horde/turba/locale/sl_SI/LC_MESSAGES
-@dirrm share/horde/turba/locale/sl_SI
-@dirrm share/horde/turba/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/turba/locale/sv_SE
-@dirrm share/horde/turba/locale/tr_TR/LC_MESSAGES
-@dirrm share/horde/turba/locale/tr_TR
-@dirrm share/horde/turba/locale/uk_UA/LC_MESSAGES
-@dirrm share/horde/turba/locale/uk_UA
-@dirrm share/horde/turba/locale/zh_CN/LC_MESSAGES
-@dirrm share/horde/turba/locale/zh_CN
-@dirrm share/horde/turba/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/turba/locale/zh_TW
-@dirrm share/horde/turba/locale
-@dirrm share/horde/turba/po
-@dirrm share/horde/turba/scripts/ldap
-@dirrm share/horde/turba/scripts/sql
-@dirrm share/horde/turba/scripts/upgrades
-@dirrm share/horde/turba/scripts
-@dirrm share/horde/turba/templates/block
-@dirrm share/horde/turba/templates/browse
-@dirrm share/horde/turba/templates/data
-@dirrm share/horde/turba/templates/prefs
-@dirrm share/horde/turba/templates
 @dirrm share/horde/turba/themes/graphics/menu
 @dirrm share/horde/turba/themes/graphics
 @dirrm share/horde/turba/themes
+@dirrm share/horde/turba/templates/prefs
+@dirrm share/horde/turba/templates/data
+@dirrm share/horde/turba/templates/browse
+@dirrm share/horde/turba/templates/block
+@dirrm share/horde/turba/templates
+@dirrm share/horde/turba/scripts/upgrades
+@dirrm share/horde/turba/scripts/sql
+@dirrm share/horde/turba/scripts/ldap
+@dirrm share/horde/turba/scripts
+@dirrm share/horde/turba/po
+@dirrm share/horde/turba/locale/zh_TW/LC_MESSAGES
+@dirrm share/horde/turba/locale/zh_TW
+@dirrm share/horde/turba/locale/zh_CN/LC_MESSAGES
+@dirrm share/horde/turba/locale/zh_CN
+@dirrm share/horde/turba/locale/uk_UA/LC_MESSAGES
+@dirrm share/horde/turba/locale/uk_UA
+@dirrm share/horde/turba/locale/tr_TR/LC_MESSAGES
+@dirrm share/horde/turba/locale/tr_TR
+@dirrm share/horde/turba/locale/sv_SE/LC_MESSAGES
+@dirrm share/horde/turba/locale/sv_SE
+@dirrm share/horde/turba/locale/sl_SI/LC_MESSAGES
+@dirrm share/horde/turba/locale/sl_SI
+@dirrm share/horde/turba/locale/sk_SK/LC_MESSAGES
+@dirrm share/horde/turba/locale/sk_SK
+@dirrm share/horde/turba/locale/ru_RU/LC_MESSAGES
+@dirrm share/horde/turba/locale/ru_RU
+@dirrm share/horde/turba/locale/ro_RO/LC_MESSAGES
+@dirrm share/horde/turba/locale/ro_RO
+@dirrm share/horde/turba/locale/pt_PT/LC_MESSAGES
+@dirrm share/horde/turba/locale/pt_PT
+@dirrm share/horde/turba/locale/pt_BR/LC_MESSAGES
+@dirrm share/horde/turba/locale/pt_BR
+@dirrm share/horde/turba/locale/pl_PL/LC_MESSAGES
+@dirrm share/horde/turba/locale/pl_PL
+@dirrm share/horde/turba/locale/nn_NO/LC_MESSAGES
+@dirrm share/horde/turba/locale/nn_NO
+@dirrm share/horde/turba/locale/nl_NL/LC_MESSAGES
+@dirrm share/horde/turba/locale/nl_NL
+@dirrm share/horde/turba/locale/nb_NO/LC_MESSAGES
+@dirrm share/horde/turba/locale/nb_NO
+@dirrm share/horde/turba/locale/mk_MK/LC_MESSAGES
+@dirrm share/horde/turba/locale/mk_MK
+@dirrm share/horde/turba/locale/lv_LV/LC_MESSAGES
+@dirrm share/horde/turba/locale/lv_LV
+@dirrm share/horde/turba/locale/lt_LT/LC_MESSAGES
+@dirrm share/horde/turba/locale/lt_LT
+@dirrm share/horde/turba/locale/ko_KR/LC_MESSAGES
+@dirrm share/horde/turba/locale/ko_KR
+@dirrm share/horde/turba/locale/ja_JP/LC_MESSAGES
+@dirrm share/horde/turba/locale/ja_JP
+@dirrm share/horde/turba/locale/it_IT/LC_MESSAGES
+@dirrm share/horde/turba/locale/it_IT
+@dirrm share/horde/turba/locale/hu_HU/LC_MESSAGES
+@dirrm share/horde/turba/locale/hu_HU
+@dirrm share/horde/turba/locale/gl_ES/LC_MESSAGES
+@dirrm share/horde/turba/locale/gl_ES
+@dirrm share/horde/turba/locale/fr_FR/LC_MESSAGES
+@dirrm share/horde/turba/locale/fr_FR
+@dirrm share/horde/turba/locale/fi_FI/LC_MESSAGES
+@dirrm share/horde/turba/locale/fi_FI
+@dirrm share/horde/turba/locale/fa_IR/LC_MESSAGES
+@dirrm share/horde/turba/locale/fa_IR
+@dirrm share/horde/turba/locale/et_EE/LC_MESSAGES
+@dirrm share/horde/turba/locale/et_EE
+@dirrm share/horde/turba/locale/es_ES/LC_MESSAGES
+@dirrm share/horde/turba/locale/es_ES
+@dirrm share/horde/turba/locale/en_US
+@dirrm share/horde/turba/locale/el_GR/LC_MESSAGES
+@dirrm share/horde/turba/locale/el_GR
+@dirrm share/horde/turba/locale/de_DE/LC_MESSAGES
+@dirrm share/horde/turba/locale/de_DE
+@dirrm share/horde/turba/locale/da_DK/LC_MESSAGES
+@dirrm share/horde/turba/locale/da_DK
+@dirrm share/horde/turba/locale/cs_CZ/LC_MESSAGES
+@dirrm share/horde/turba/locale/cs_CZ
+@dirrm share/horde/turba/locale/ca_ES/LC_MESSAGES
+@dirrm share/horde/turba/locale/ca_ES
+@dirrm share/horde/turba/locale/bg_BG/LC_MESSAGES
+@dirrm share/horde/turba/locale/bg_BG
+@dirrm share/horde/turba/locale/ar_SY/LC_MESSAGES
+@dirrm share/horde/turba/locale/ar_SY
+@dirrm share/horde/turba/locale
+@dirrm share/horde/turba/lib/Driver
+@dirrm share/horde/turba/lib/Block
+@dirrm share/horde/turba/lib
+@dirrm share/horde/turba/config
 @dirrm share/horde/turba
 @dirrm share/examples/turba
 @dirrm share/doc/turba