update to 0.6.1

add WWW: line

PR:		24669
Submitted by:	tkato@prontomail.ne.jp

8 files changed, 109 insertions, 50 deletions

diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile
index d9b1d9cde4c5..dcf4f0fe0337 100644
--- a/devel/ktranslator/Makefile
+++ b/devel/ktranslator/Makefile
@@ -1,30 +1,31 @@
-# New ports collection makefile for:   ktranslator
-# Date created:        23 May 1998
-# Whom:                Hans Petter Bieker <hanspb@persbraten.vgs.no>
+# New ports collection makefile for:	ktranslator
+# Date created:		23 May 1998
+# Whom:			Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ktranslator
-PORTVERSION=	0.4.0
+PORTVERSION=	0.6.1
 CATEGORIES=	devel kde
-MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1/apps/utils
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	Attic/old/1.1.2/apps/utils
+
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11
+		kdecore.3:${PORTSDIR}/x11/kdelibs11
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_QT=		yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
+CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt \
+		--with-extra-includes=${LOCALBASE}/include \
+		--with-extra-libs=${LOCALBASE}/lib
 
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555"
-
-pre-configure:
-		${RM} -rf -- $(WRKSRC)/.deps $(WRKSRC)/config.cache
+post-patch:
+	@cd ${WRKSRC} && aclocal
 
 .include <bsd.port.mk>
diff --git a/devel/ktranslator/distinfo b/devel/ktranslator/distinfo
index cc64e0de0908..84272a3d3c41 100644
--- a/devel/ktranslator/distinfo
+++ b/devel/ktranslator/distinfo
@@ -1 +1 @@
-MD5 (ktranslator-0.4.0.tar.gz) = 266a97fd5901c9619d549f39c0b6a860
+MD5 (ktranslator-0.6.1.tar.gz) = bb86548f6d84bf21394e04dd40f5a7b3
diff --git a/devel/ktranslator/files/patch-aa b/devel/ktranslator/files/patch-aa
deleted file mode 100644
index 34afb9ea5222..000000000000
--- a/devel/ktranslator/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ktranslator/doc/Makefile.in.~1~	Fri Mar 19 16:44:10 1999
-+++ ktranslator/doc/Makefile.in	Fri Mar 19 16:44:10 1999
-@@ -120,7 +120,7 @@
- qt_libraries = @qt_libraries@
- topdir = @topdir@
- 
--data_DATA = index.html logotp3.gif
-+data_DATA = index.html index-1.html index-2.html logotp3.gif
- 
- # this is the directory, where all datas are installed
- # you have given the datas in data_DATA
diff --git a/devel/ktranslator/files/patch-ab b/devel/ktranslator/files/patch-ab
deleted file mode 100644
index 22354e5256c2..000000000000
--- a/devel/ktranslator/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Fri Dec  4 05:13:02 1998
-+++ configure	Tue Feb 15 01:40:25 2000
-@@ -2966,6 +2966,7 @@
-   echo "$ac_t""no" 1>&6
- fi
-  
-+if false; then
- echo $ac_n "checking for giflib""... $ac_c" 1>&6
- echo "configure:2971: checking for giflib" >&5
- if eval "test \"`echo '$''{'ac_cv_lib_gif'+set}'`\" = set"; then
-@@ -3012,6 +3013,7 @@
- 
- else
-   { echo "configure: error: You need giflib23. Please install the kdesupport package" 1>&2; exit 1; }
-+fi
- fi
-  echo $ac_n "checking for jpeglib""... $ac_c" 1>&6
- echo "configure:3018: checking for jpeglib" >&5
diff --git a/devel/ktranslator/files/patch-ac b/devel/ktranslator/files/patch-ac
new file mode 100644
index 000000000000..f0d8cd9ce3c7
--- /dev/null
+++ b/devel/ktranslator/files/patch-ac
@@ -0,0 +1,39 @@
+--- acinclude.m4.orig	Mon Nov  9 09:34:11 1998
++++ acinclude.m4	Tue Jan 23 21:44:18 2001
+@@ -944,36 +944,6 @@
+ LIBS="$ac_libs_safe"
+ ])
+ 
+-AC_DEFUN(AC_FIND_GIF,
+-   [AC_MSG_CHECKING([for giflib])
+-AC_CACHE_VAL(ac_cv_lib_gif,
+-[ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
+-AC_TRY_LINK(dnl
+-[
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-int GifLastError(void);
+-#ifdef __cplusplus
+-}
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-],
+-            [return GifLastError();],
+-            eval "ac_cv_lib_gif=yes",
+-            eval "ac_cv_lib_gif=no")
+-LIBS="$ac_save_LIBS"
+-])dnl
+-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
+-  AC_MSG_RESULT(yes)
+-  AC_DEFINE_UNQUOTED(HAVE_LIBGIF)
+-else
+-  AC_MSG_ERROR(You need giflib23. Please install the kdesupport package)
+-fi
+-])
+-
+ AC_DEFUN(AC_FIND_JPEG,
+    [AC_MSG_CHECKING([for jpeglib])
+ AC_CACHE_VAL(ac_cv_lib_jpeg,
diff --git a/devel/ktranslator/files/patch-ad b/devel/ktranslator/files/patch-ad
new file mode 100644
index 000000000000..d0827effba0e
--- /dev/null
+++ b/devel/ktranslator/files/patch-ad
@@ -0,0 +1,29 @@
+--- ktranslator/TranslData.cpp.orig	Thu Dec 30 20:41:01 1999
++++ ktranslator/TranslData.cpp	Sat Jan 27 03:29:09 2001
+@@ -916,7 +916,7 @@
+ int TranslData::msgListTranslation(QString s,int fla=0)
+ {
+  static QFile *mlf=0;
+- static open=false;
++ static bool open=false;
+  if(open) return -2;
+  open=true;
+   stopSearch=false;
+@@ -1886,7 +1886,7 @@
+    } while(n>0); 
+ //     s.simplifyWhiteSpace();
+ //     warning(s);
+-     spell->check(s);
++     spell->check(s.data());
+ }
+ 
+ void TranslData::spellready(KSpell *)
+@@ -1912,7 +1912,7 @@
+ 		 this, SLOT (spelldone(char *)));
+ 	
+ 	spell->setProgressResolution (2);
+-	//spell->check (text().data());
++	//spell->check (text().ascii());
+          spellnext();	
+       }
+     else
diff --git a/devel/ktranslator/pkg-descr b/devel/ktranslator/pkg-descr
index 300e95e54258..946fb49ea1c1 100644
--- a/devel/ktranslator/pkg-descr
+++ b/devel/ktranslator/pkg-descr
@@ -6,3 +6,5 @@ translat it.
 
 You should set KDEDIR, for example
 % setenv KDEDIR /usr/local
+
+WWW: http://www.geocities.com/bilibao/
diff --git a/devel/ktranslator/pkg-plist b/devel/ktranslator/pkg-plist
index a13837945d9d..96ab7dcafdf0 100644
--- a/devel/ktranslator/pkg-plist
+++ b/devel/ktranslator/pkg-plist
@@ -1,9 +1,26 @@
 bin/ktranslator
-share/applnk/Utilities/ktranslator.kdelnk
-share/doc/HTML/en/ktranslator/index.html
+share/applnk/Development/ktranslator.kdelnk
+share/apps/ktranslator/about.gif
+share/config/ktranslatorrc
 share/doc/HTML/en/ktranslator/index-1.html
 share/doc/HTML/en/ktranslator/index-2.html
-share/doc/HTML/en/ktranslator/logotp3.gif
+share/doc/HTML/en/ktranslator/index-3.html
+share/doc/HTML/en/ktranslator/index-4.html
+share/doc/HTML/en/ktranslator/index-5.html
+share/doc/HTML/en/ktranslator/index-6.html
+share/doc/HTML/en/ktranslator/index.html
+share/icons/ktranslator.xpm
+share/icons/mini/mini-cross.xpm
+share/icons/mini/mini-exclam.xpm
+share/icons/mini/mini-exp.xpm
 share/locale/it/LC_MESSAGES/ktranslator.mo
-share/config/ktranslatorrc
+share/locale/ko/LC_MESSAGES/ktranslator.mo
+share/toolbar/copy-string.xpm
+share/toolbar/cvs.xpm
+share/toolbar/header.xpm
+share/toolbar/mosearch.xpm
+share/toolbar/next-fuzzy.xpm
+share/toolbar/posearch.xpm
+share/toolbar/prev-fuzzy.xpm
+@dirrm share/apps/ktranslator
 @dirrm share/doc/HTML/en/ktranslator