update to 0.3.4.

PR:		24877
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 61 insertions, 18 deletions

diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index a37672d9382c..8be924f7e433 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -6,20 +6,27 @@
 #
 
 PORTNAME=	ksamba
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	net kde
-MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/apps/network
+MASTER_SITES=	${MASTER_SITE_KDE} \
+		http://www.kneschke.de/projekte/ksamba/download/
+MASTER_SITE_SUBDIR=	unstable/apps/network
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11 \
-		kfile.3:${PORTSDIR}/x11/kdelibs11
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 
 USE_QT=		yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555"
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" \
+		MOC="${X11BASE}/bin/moc"
+CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt
+
+post-extract:
+	@${RM} -f ${WRKSRC}/config.cache
+	@${RM} -f ${WRKSRC}/ksamba/*.moc
+
+post-patch:
+	@cd ${WRKSRC} && aclocal
 
 .include <bsd.port.mk>
diff --git a/net/ksamba/distinfo b/net/ksamba/distinfo
index 96aedb0cd023..a63156921f49 100644
--- a/net/ksamba/distinfo
+++ b/net/ksamba/distinfo
@@ -1 +1 @@
-MD5 (ksamba-0.3.3.tar.gz) = b831c0932cf6e88ded6944c9284f80fa
+MD5 (ksamba-0.3.4.tar.gz) = 370ee880e7ea043536ef297cf3943e1f
diff --git a/net/ksamba/files/patch-ac b/net/ksamba/files/patch-ac
new file mode 100644
index 000000000000..12056bd61160
--- /dev/null
+++ b/net/ksamba/files/patch-ac
@@ -0,0 +1,20 @@
+--- configure.in.orig	Tue Oct 19 17:06:17 1999
++++ configure.in	Thu Feb  1 21:41:32 2001
+@@ -44,7 +44,6 @@
+ AC_PATH_KDE dnl check X, Qt and KDE
+ AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for FreeBSD
+ AC_SUBST(LIBCOMPAT)
+-AC_FIND_GIF dnl only needed, if you need gif, but doesn't hurt
+ AC_FIND_JPEG dnl only needed, if you need jpeg, but doesn't hurt
+ 
+ AC_CHECK_RPATH
+@@ -74,4 +73,9 @@
+ dnl add here all your Makefiles
+ AC_OUTPUT(Makefile \
+ 	ksamba/Makefile \
++	ksamba/doc/Makefile \
++	ksamba/doc/de/Makefile \
++	ksamba/doc/en/Makefile \
++	ksamba/pics/Makefile \
++	ksamba/pics/icons/Makefile \
+ 	po/Makefile)
diff --git a/net/ksamba/files/patch-ad b/net/ksamba/files/patch-ad
new file mode 100644
index 000000000000..315bb99e4e79
--- /dev/null
+++ b/net/ksamba/files/patch-ad
@@ -0,0 +1,13 @@
+--- ksamba/Makefile.am.orig	Tue Oct 19 16:53:55 1999
++++ ksamba/Makefile.am	Thu Feb  1 22:16:01 2001
+@@ -208,10 +208,6 @@
+ newserviceData.moc:newserviceData.h
+ 	$(MOC) newserviceData.h -o newserviceData.moc
+ 
+-install-data-local: 
+-	$(mkinstalldirs) $(APPSDIR)
+-	$(INSTALL_DATA) ksamba.kdelnk $(APPSDIR)
+-
+ 
+ 
+ 
diff --git a/net/ksamba/pkg-descr b/net/ksamba/pkg-descr
index 3f81f0328497..102e075b033b 100644
--- a/net/ksamba/pkg-descr
+++ b/net/ksamba/pkg-descr
@@ -1 +1,3 @@
 KDE/Q program to setup/configure samba
+
+WWW: http://www.kneschke.de/projekte/ksamba/
diff --git a/net/ksamba/pkg-plist b/net/ksamba/pkg-plist
index 5dab6f04a266..67e2360e13fe 100644
--- a/net/ksamba/pkg-plist
+++ b/net/ksamba/pkg-plist
@@ -1,16 +1,17 @@
 bin/ksamba
-share/apps/ksamba/pics/pageadd.xpm
-share/apps/ksamba/pics/pageremove.xpm
+share/applnk/Utilities/ksamba.kdelnk
 share/apps/ksamba/pics/folder.xpm
 share/apps/ksamba/pics/folder_inactive.xpm
+share/apps/ksamba/pics/pageadd.xpm
+share/apps/ksamba/pics/pageremove.xpm
 share/apps/ksamba/pics/printer.xpm
 share/apps/ksamba/pics/printer_inactive.xpm
-share/doc/HTML/en/ksamba/index.html
 share/doc/HTML/de/ksamba/index.html
-share/locale/de/LC_MESSAGES/ksamba.mo
+share/doc/HTML/en/ksamba/index.html
 share/icons/ksamba.xpm
-share/applnk/Network/ksamba.kdelnk
-@dirrm share/apps/ksamba/pics
-@dirrm share/apps/ksamba
+share/locale/de/LC_MESSAGES/ksamba.mo
+share/locale/hr/LC_MESSAGES/ksamba.mo
 @dirrm share/doc/HTML/en/ksamba
 @dirrm share/doc/HTML/de/ksamba
+@dirrm share/apps/ksamba/pics
+@dirrm share/apps/ksamba