Minor fixes:

- Bump PORTREVISION with a PLIST bugfix.
- Compile fix in kpackage relating to rpm.

Submitted by:	Alan Eldridge <alane@geeksrus.net>

4 files changed, 88 insertions, 2 deletions

diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 785aeb0246c8..84f031f9ac50 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -29,4 +29,9 @@ CONFIGURE_ARGS+=--enable-final
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
+post-patch:
+	@cd ${WRKSRC}/kpackage; \
+	${PERL} -pi -e 's@^typedef[ \t]+__off64.*\n@@' \
+		rpm*.h rpm*.c rpm*.cpp
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index f8499b354419..175fdae56cbe 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -1,9 +1,12 @@
+@comment files/links
 bin/kcron
 bin/kpackage
+bin/kuser
 bin/kwuftpd
 bin/secpolicy
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
+share/applnk/System/kuser.desktop
 share/applnk/System/kwuftpd.desktop
 share/apps/kpackage/kpackageui.rc
 share/apps/kpackage/pics/bnew.png
@@ -29,6 +32,15 @@ share/apps/kpackage/pics/supdated.png
 share/apps/kpackage/pics/tick.png
 share/apps/kpackage/toolbar/ftin.xpm
 share/apps/kpackage/toolbar/ftout.xpm
+share/apps/kuser/icons/hicolor/22x22/actions/add_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/add_user.png
+share/apps/kuser/icons/hicolor/22x22/actions/delete_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/delete_user.png
+share/apps/kuser/icons/hicolor/22x22/actions/edit_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/edit_user.png
+share/apps/kuser/kuserui.rc
+share/apps/kuser/pics/group.png
+share/apps/kuser/pics/user.png
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
@@ -37,6 +49,9 @@ share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
+share/doc/HTML/en/kdat/common
+share/doc/HTML/en/kdat/index.cache.bz2
+share/doc/HTML/en/kdat/index.docbook
 share/doc/HTML/en/kpackage/common
 share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
@@ -46,6 +61,7 @@ share/doc/HTML/en/ksysv/index.docbook
 share/doc/HTML/en/kuser/common
 share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
+share/doc/HTML/en/kuser/kuser.png
 share/doc/HTML/en/kwuftpd/common
 share/doc/HTML/en/kwuftpd/directories.png
 share/doc/HTML/en/kwuftpd/index.cache.bz2
@@ -59,19 +75,41 @@ share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
 share/icons/hicolor/16x16/apps/kcron.png
 share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/16x16/apps/kuser.png
 share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
+share/icons/hicolor/48x48/apps/kuser.png
 share/mimelnk/application/x-debian-package.desktop
+@comment directories
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
 @dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksysv
 @dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/apps/kuser/pics
+@dirrm share/apps/kuser/icons/hicolor/22x22/actions
+@dirrm share/apps/kuser/icons/hicolor/22x22
+@dirrm share/apps/kuser/icons/hicolor
+@dirrm share/apps/kuser/icons
+@dirrm share/apps/kuser
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
+@dirrm share/apps
 @dirrm share/applnk/System
 @dirrm share/applnk
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 785aeb0246c8..84f031f9ac50 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -29,4 +29,9 @@ CONFIGURE_ARGS+=--enable-final
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
+post-patch:
+	@cd ${WRKSRC}/kpackage; \
+	${PERL} -pi -e 's@^typedef[ \t]+__off64.*\n@@' \
+		rpm*.h rpm*.c rpm*.cpp
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index f8499b354419..175fdae56cbe 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -1,9 +1,12 @@
+@comment files/links
 bin/kcron
 bin/kpackage
+bin/kuser
 bin/kwuftpd
 bin/secpolicy
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
+share/applnk/System/kuser.desktop
 share/applnk/System/kwuftpd.desktop
 share/apps/kpackage/kpackageui.rc
 share/apps/kpackage/pics/bnew.png
@@ -29,6 +32,15 @@ share/apps/kpackage/pics/supdated.png
 share/apps/kpackage/pics/tick.png
 share/apps/kpackage/toolbar/ftin.xpm
 share/apps/kpackage/toolbar/ftout.xpm
+share/apps/kuser/icons/hicolor/22x22/actions/add_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/add_user.png
+share/apps/kuser/icons/hicolor/22x22/actions/delete_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/delete_user.png
+share/apps/kuser/icons/hicolor/22x22/actions/edit_group.png
+share/apps/kuser/icons/hicolor/22x22/actions/edit_user.png
+share/apps/kuser/kuserui.rc
+share/apps/kuser/pics/group.png
+share/apps/kuser/pics/user.png
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
@@ -37,6 +49,9 @@ share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
+share/doc/HTML/en/kdat/common
+share/doc/HTML/en/kdat/index.cache.bz2
+share/doc/HTML/en/kdat/index.docbook
 share/doc/HTML/en/kpackage/common
 share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
@@ -46,6 +61,7 @@ share/doc/HTML/en/ksysv/index.docbook
 share/doc/HTML/en/kuser/common
 share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
+share/doc/HTML/en/kuser/kuser.png
 share/doc/HTML/en/kwuftpd/common
 share/doc/HTML/en/kwuftpd/directories.png
 share/doc/HTML/en/kwuftpd/index.cache.bz2
@@ -59,19 +75,41 @@ share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
 share/icons/hicolor/16x16/apps/kcron.png
 share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/16x16/apps/kuser.png
 share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
+share/icons/hicolor/48x48/apps/kuser.png
 share/mimelnk/application/x-debian-package.desktop
+@comment directories
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
 @dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksysv
 @dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/apps/kuser/pics
+@dirrm share/apps/kuser/icons/hicolor/22x22/actions
+@dirrm share/apps/kuser/icons/hicolor/22x22
+@dirrm share/apps/kuser/icons/hicolor
+@dirrm share/apps/kuser/icons
+@dirrm share/apps/kuser
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
+@dirrm share/apps
 @dirrm share/applnk/System
 @dirrm share/applnk