Update pkg-plist with new files

Fix location of manpage installation to also fix package errors

6 files changed, 60 insertions, 2 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 461a806184cd..d6bd4af498b1 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	samba
 PORTVERSION=	3.0a13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -39,7 +40,7 @@ CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
-		--exec-prefix=${PREFIX} --with-pam
+		--exec-prefix=${PREFIX} --with-pam --without-manpages-langs
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/samba-devel/files/patch-installman.sh b/net/samba-devel/files/patch-installman.sh
new file mode 100644
index 000000000000..1f36ba28c922
--- /dev/null
+++ b/net/samba-devel/files/patch-installman.sh
@@ -0,0 +1,11 @@
+--- script/installman.sh.orig	Fri Jan 18 21:59:14 2002
++++ script/installman.sh	Fri Jan 18 21:59:40 2002
+@@ -22,7 +22,7 @@
+ 	echo Installing \"$lang\" man pages in $MANDIR/lang/$lang
+     fi
+ 
+-    langdir=$MANDIR/lang/$lang
++    langdir=$MANDIR
+     for d in $MANDIR $MANDIR/lang $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
+ 	if [ ! -d $d ]; then
+ 	    mkdir $d
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index ac565a754fb6..f01982bf14f0 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -70,14 +70,17 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html
 %%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_unicodemap.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
 %%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
@@ -86,6 +89,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbgroupedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -152,6 +156,14 @@ share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
 share/examples/samba/VFS/audit.c
 share/examples/samba/VFS/skel.c
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/export2_smbpasswd.pl
+share/examples/samba/LDAP/export_smbpasswd.pl
+share/examples/samba/LDAP/import2_smbpasswd.pl
+share/examples/samba/LDAP/import_smbpasswd.pl
+share/examples/samba/LDAP/ldapchpasswd
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba.schema
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
@@ -207,16 +219,20 @@ share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
 share/swat/help/make_unicodemap.1.html
 share/swat/help/msdfs_setup.html
+share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/pdbedit.8.html
 share/swat/help/printer_driver2.html
 share/swat/help/rpcclient.1.html
+share/swat/help/Samba-LDAP-HOWTO.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
 share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
+share/swat/help/smbgroupedit.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -441,6 +457,7 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/lang/tr
 @dirrm share/swat/lang
 @dirrm share/swat
+@dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 461a806184cd..d6bd4af498b1 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	samba
 PORTVERSION=	3.0a13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -39,7 +40,7 @@ CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
-		--exec-prefix=${PREFIX} --with-pam
+		--exec-prefix=${PREFIX} --with-pam --without-manpages-langs
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/samba3/files/patch-installman.sh b/net/samba3/files/patch-installman.sh
new file mode 100644
index 000000000000..1f36ba28c922
--- /dev/null
+++ b/net/samba3/files/patch-installman.sh
@@ -0,0 +1,11 @@
+--- script/installman.sh.orig	Fri Jan 18 21:59:14 2002
++++ script/installman.sh	Fri Jan 18 21:59:40 2002
+@@ -22,7 +22,7 @@
+ 	echo Installing \"$lang\" man pages in $MANDIR/lang/$lang
+     fi
+ 
+-    langdir=$MANDIR/lang/$lang
++    langdir=$MANDIR
+     for d in $MANDIR $MANDIR/lang $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
+ 	if [ ! -d $d ]; then
+ 	    mkdir $d
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index ac565a754fb6..f01982bf14f0 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -70,14 +70,17 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html
 %%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/make_unicodemap.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
 %%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
@@ -86,6 +89,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbgroupedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -152,6 +156,14 @@ share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
 share/examples/samba/VFS/audit.c
 share/examples/samba/VFS/skel.c
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/export2_smbpasswd.pl
+share/examples/samba/LDAP/export_smbpasswd.pl
+share/examples/samba/LDAP/import2_smbpasswd.pl
+share/examples/samba/LDAP/import_smbpasswd.pl
+share/examples/samba/LDAP/ldapchpasswd
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba.schema
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
@@ -207,16 +219,20 @@ share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
 share/swat/help/make_unicodemap.1.html
 share/swat/help/msdfs_setup.html
+share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/pdbedit.8.html
 share/swat/help/printer_driver2.html
 share/swat/help/rpcclient.1.html
+share/swat/help/Samba-LDAP-HOWTO.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
 share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
+share/swat/help/smbgroupedit.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -441,6 +457,7 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/lang/tr
 @dirrm share/swat/lang
 @dirrm share/swat
+@dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf