- Update to 1.6.1

- Use SIZE in distinfo
- Change mastersite (old one doesn't carry the new version)

PR:		62132
Approved by:	arved (mentor)

8 files changed, 120 insertions, 90 deletions

diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index c4bf7a4f1151..04f8ca24d330 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	kile
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=stable/apps/KDE3.x/office
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	stefan.jahn@nemesis-sektor.de
 COMMENT=	A LaTeX source editor for KDE
@@ -22,9 +21,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-post-extract:
-	@${TOUCH} ${WRKSRC}/config.h.in
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 
diff --git a/editors/kile-kde4/distinfo b/editors/kile-kde4/distinfo
index 82de8d6fad39..c58ea8c57b4d 100644
--- a/editors/kile-kde4/distinfo
+++ b/editors/kile-kde4/distinfo
@@ -1 +1,2 @@
-MD5 (kile-1.6.tar.gz) = bff5a661174f5604b9b2d17c86e2b266
+MD5 (kile-1.6.1.tar.gz) = 0eaf59b2065f8210a4708b773c70e1ee
+SIZE (kile-1.6.1.tar.gz) = 3012551
diff --git a/editors/kile-kde4/files/patch-kilelyxserver.cpp b/editors/kile-kde4/files/patch-kilelyxserver.cpp
deleted file mode 100644
index ce507eb89531..000000000000
--- a/editors/kile-kde4/files/patch-kilelyxserver.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kile/kile/kilelyxserver.cpp.orig	Tue Dec 30 00:41:10 2003
-+++ kile/kile/kilelyxserver.cpp	Tue Dec 30 00:41:29 2003
-@@ -17,7 +17,6 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <error.h>
- #include <stdlib.h> //getenv
- 
- #include "kilelyxserver.h"
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
index 6491570419d1..09a47bff9688 100644
--- a/editors/kile-kde4/pkg-plist
+++ b/editors/kile-kde4/pkg-plist
@@ -2,6 +2,7 @@ bin/kile
 share/applications/kde/kile.desktop
 share/apps/katepart/syntax/bibtex-kile.xml
 share/apps/katepart/syntax/latex-kile.xml
+share/apps/kile/docpartui.rc
 share/apps/kile/kileui.rc
 share/apps/kile/mathsymbols/img1.png
 share/apps/kile/mathsymbols/img10.png
@@ -540,58 +541,81 @@ share/doc/HTML/en/kile/snap_ref_select.png
 share/doc/HTML/en/kile/snap_sidebarmenu.png
 share/doc/HTML/en/kile/snap_structview_label.png
 share/doc/HTML/en/kile/snap_usertag.png
+share/doc/HTML/it/kile/common
+share/doc/HTML/it/kile/index.cache.bz2
+share/doc/HTML/it/kile/index.docbook
+share/doc/HTML/it/kile/latexhelp.html
+share/doc/HTML/it/kile/snap_autocomplete.png
+share/doc/HTML/it/kile/snap_compile_error.png
+share/doc/HTML/it/kile/snap_editusertag.png
+share/doc/HTML/it/kile/snap_encoding.png
+share/doc/HTML/it/kile/snap_kdvi_settings.png
+share/doc/HTML/it/kile/snap_projectview.png
+share/doc/HTML/it/kile/snap_projectview_add.png
+share/doc/HTML/it/kile/snap_ref_choose.png
+share/doc/HTML/it/kile/snap_ref_select.png
+share/doc/HTML/it/kile/snap_sidebarmenu.png
+share/doc/HTML/it/kile/snap_structview_label.png
+share/doc/HTML/it/kile/snap_usertag.png
+share/doc/HTML/sv/kile/common
+share/doc/HTML/sv/kile/index.cache.bz2
+share/doc/HTML/sv/kile/index.docbook
+share/doc/HTML/sv/kile/latexhelp.html
+share/doc/HTML/sv/kile/snap_autocomplete.png
+share/doc/HTML/sv/kile/snap_compile_error.png
+share/doc/HTML/sv/kile/snap_editusertag.png
+share/doc/HTML/sv/kile/snap_encoding.png
+share/doc/HTML/sv/kile/snap_kdvi_settings.png
+share/doc/HTML/sv/kile/snap_projectview.png
+share/doc/HTML/sv/kile/snap_projectview_add.png
+share/doc/HTML/sv/kile/snap_ref_choose.png
+share/doc/HTML/sv/kile/snap_ref_select.png
+share/doc/HTML/sv/kile/snap_sidebarmenu.png
+share/doc/HTML/sv/kile/snap_structview_label.png
+share/doc/HTML/sv/kile/snap_usertag.png
 share/icons/crystalsvg/16x16/apps/kile.png
 share/icons/crystalsvg/22x22/apps/kile.png
 share/icons/crystalsvg/32x32/apps/kile.png
 share/icons/crystalsvg/48x48/apps/kile.png
-share/locale/ca/LC_MESSAGES/kile.mo
-share/locale/cs/LC_MESSAGES/kile.mo
+share/locale/da/LC_MESSAGES/kile.mo
 share/locale/de/LC_MESSAGES/kile.mo
-share/locale/el/LC_MESSAGES/kile.mo
 share/locale/es/LC_MESSAGES/kile.mo
-share/locale/eu/LC_MESSAGES/kile.mo
+share/locale/et/LC_MESSAGES/kile.mo
 share/locale/fr/LC_MESSAGES/kile.mo
 share/locale/hu/LC_MESSAGES/kile.mo
 share/locale/it/LC_MESSAGES/kile.mo
-share/locale/ja/LC_MESSAGES/kile.mo
 share/locale/nl/LC_MESSAGES/kile.mo
-share/locale/pl/LC_MESSAGES/kile.mo
+share/locale/pt/LC_MESSAGES/kile.mo
 share/locale/pt_BR/LC_MESSAGES/kile.mo
-share/locale/ru/LC_MESSAGES/kile.mo
-share/locale/sk/LC_MESSAGES/kile.mo
-share/locale/zh_CN/LC_MESSAGES/kile.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+share/locale/sr/LC_MESSAGES/kile.mo
+share/locale/sv/LC_MESSAGES/kile.mo
+share/mimelnk/text/x-kilepr.desktop
+@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true
+@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
 @unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/it 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/eu 2>/dev/null || true
+@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/et 2>/dev/null || true
 @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
@@ -603,6 +627,10 @@ share/locale/zh_CN/LC_MESSAGES/kile.mo
 @unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/sv/kile
+@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrm share/doc/HTML/it/kile
+@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
 @dirrm share/doc/HTML/en/kile
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index c4bf7a4f1151..04f8ca24d330 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	kile
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=stable/apps/KDE3.x/office
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	stefan.jahn@nemesis-sektor.de
 COMMENT=	A LaTeX source editor for KDE
@@ -22,9 +21,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-post-extract:
-	@${TOUCH} ${WRKSRC}/config.h.in
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 
diff --git a/editors/kile/distinfo b/editors/kile/distinfo
index 82de8d6fad39..c58ea8c57b4d 100644
--- a/editors/kile/distinfo
+++ b/editors/kile/distinfo
@@ -1 +1,2 @@
-MD5 (kile-1.6.tar.gz) = bff5a661174f5604b9b2d17c86e2b266
+MD5 (kile-1.6.1.tar.gz) = 0eaf59b2065f8210a4708b773c70e1ee
+SIZE (kile-1.6.1.tar.gz) = 3012551
diff --git a/editors/kile/files/patch-kilelyxserver.cpp b/editors/kile/files/patch-kilelyxserver.cpp
deleted file mode 100644
index ce507eb89531..000000000000
--- a/editors/kile/files/patch-kilelyxserver.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kile/kile/kilelyxserver.cpp.orig	Tue Dec 30 00:41:10 2003
-+++ kile/kile/kilelyxserver.cpp	Tue Dec 30 00:41:29 2003
-@@ -17,7 +17,6 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <error.h>
- #include <stdlib.h> //getenv
- 
- #include "kilelyxserver.h"
diff --git a/editors/kile/pkg-plist b/editors/kile/pkg-plist
index 6491570419d1..09a47bff9688 100644
--- a/editors/kile/pkg-plist
+++ b/editors/kile/pkg-plist
@@ -2,6 +2,7 @@ bin/kile
 share/applications/kde/kile.desktop
 share/apps/katepart/syntax/bibtex-kile.xml
 share/apps/katepart/syntax/latex-kile.xml
+share/apps/kile/docpartui.rc
 share/apps/kile/kileui.rc
 share/apps/kile/mathsymbols/img1.png
 share/apps/kile/mathsymbols/img10.png
@@ -540,58 +541,81 @@ share/doc/HTML/en/kile/snap_ref_select.png
 share/doc/HTML/en/kile/snap_sidebarmenu.png
 share/doc/HTML/en/kile/snap_structview_label.png
 share/doc/HTML/en/kile/snap_usertag.png
+share/doc/HTML/it/kile/common
+share/doc/HTML/it/kile/index.cache.bz2
+share/doc/HTML/it/kile/index.docbook
+share/doc/HTML/it/kile/latexhelp.html
+share/doc/HTML/it/kile/snap_autocomplete.png
+share/doc/HTML/it/kile/snap_compile_error.png
+share/doc/HTML/it/kile/snap_editusertag.png
+share/doc/HTML/it/kile/snap_encoding.png
+share/doc/HTML/it/kile/snap_kdvi_settings.png
+share/doc/HTML/it/kile/snap_projectview.png
+share/doc/HTML/it/kile/snap_projectview_add.png
+share/doc/HTML/it/kile/snap_ref_choose.png
+share/doc/HTML/it/kile/snap_ref_select.png
+share/doc/HTML/it/kile/snap_sidebarmenu.png
+share/doc/HTML/it/kile/snap_structview_label.png
+share/doc/HTML/it/kile/snap_usertag.png
+share/doc/HTML/sv/kile/common
+share/doc/HTML/sv/kile/index.cache.bz2
+share/doc/HTML/sv/kile/index.docbook
+share/doc/HTML/sv/kile/latexhelp.html
+share/doc/HTML/sv/kile/snap_autocomplete.png
+share/doc/HTML/sv/kile/snap_compile_error.png
+share/doc/HTML/sv/kile/snap_editusertag.png
+share/doc/HTML/sv/kile/snap_encoding.png
+share/doc/HTML/sv/kile/snap_kdvi_settings.png
+share/doc/HTML/sv/kile/snap_projectview.png
+share/doc/HTML/sv/kile/snap_projectview_add.png
+share/doc/HTML/sv/kile/snap_ref_choose.png
+share/doc/HTML/sv/kile/snap_ref_select.png
+share/doc/HTML/sv/kile/snap_sidebarmenu.png
+share/doc/HTML/sv/kile/snap_structview_label.png
+share/doc/HTML/sv/kile/snap_usertag.png
 share/icons/crystalsvg/16x16/apps/kile.png
 share/icons/crystalsvg/22x22/apps/kile.png
 share/icons/crystalsvg/32x32/apps/kile.png
 share/icons/crystalsvg/48x48/apps/kile.png
-share/locale/ca/LC_MESSAGES/kile.mo
-share/locale/cs/LC_MESSAGES/kile.mo
+share/locale/da/LC_MESSAGES/kile.mo
 share/locale/de/LC_MESSAGES/kile.mo
-share/locale/el/LC_MESSAGES/kile.mo
 share/locale/es/LC_MESSAGES/kile.mo
-share/locale/eu/LC_MESSAGES/kile.mo
+share/locale/et/LC_MESSAGES/kile.mo
 share/locale/fr/LC_MESSAGES/kile.mo
 share/locale/hu/LC_MESSAGES/kile.mo
 share/locale/it/LC_MESSAGES/kile.mo
-share/locale/ja/LC_MESSAGES/kile.mo
 share/locale/nl/LC_MESSAGES/kile.mo
-share/locale/pl/LC_MESSAGES/kile.mo
+share/locale/pt/LC_MESSAGES/kile.mo
 share/locale/pt_BR/LC_MESSAGES/kile.mo
-share/locale/ru/LC_MESSAGES/kile.mo
-share/locale/sk/LC_MESSAGES/kile.mo
-share/locale/zh_CN/LC_MESSAGES/kile.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+share/locale/sr/LC_MESSAGES/kile.mo
+share/locale/sv/LC_MESSAGES/kile.mo
+share/mimelnk/text/x-kilepr.desktop
+@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true
+@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
 @unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/it 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/eu 2>/dev/null || true
+@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/et 2>/dev/null || true
 @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
@@ -603,6 +627,10 @@ share/locale/zh_CN/LC_MESSAGES/kile.mo
 @unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/sv/kile
+@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrm share/doc/HTML/it/kile
+@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
 @dirrm share/doc/HTML/en/kile
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true