Update to 1.6

PR:		60708
Submitted by:	Markus Brueffer <brueffer@phoenix-systems.de>
Approved by:	maintainer timeout

4 files changed, 101 insertions, 67 deletions

diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 596b6671677d..5da96abc347c 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kile
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=stable/apps/KDE3.x/office
@@ -21,9 +21,12 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
 post-extract:
-	@${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure
+	@${TOUCH} ${WRKSRC}/config.h.in
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/editors/kile/distinfo b/editors/kile/distinfo
index f98f949f694f..82de8d6fad39 100644
--- a/editors/kile/distinfo
+++ b/editors/kile/distinfo
@@ -1 +1 @@
-MD5 (kile-1.5.2.tar.gz) = 4a188a32d4f041fed9738b464a79e0b6
+MD5 (kile-1.6.tar.gz) = bff5a661174f5604b9b2d17c86e2b266
diff --git a/editors/kile/files/patch-kilelyxserver.cpp b/editors/kile/files/patch-kilelyxserver.cpp
new file mode 100644
index 000000000000..ce507eb89531
--- /dev/null
+++ b/editors/kile/files/patch-kilelyxserver.cpp
@@ -0,0 +1,10 @@
+--- 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 697dc56c1795..6491570419d1 100644
--- a/editors/kile/pkg-plist
+++ b/editors/kile/pkg-plist
@@ -1,5 +1,7 @@
 bin/kile
-share/applnk/Applications/kile.desktop
+share/applications/kde/kile.desktop
+share/apps/katepart/syntax/bibtex-kile.xml
+share/apps/katepart/syntax/latex-kile.xml
 share/apps/kile/kileui.rc
 share/apps/kile/mathsymbols/img1.png
 share/apps/kile/mathsymbols/img10.png
@@ -341,10 +343,43 @@ share/apps/kile/mathsymbols/img39greek.png
 share/apps/kile/mathsymbols/img3greek.png
 share/apps/kile/mathsymbols/img4.png
 share/apps/kile/mathsymbols/img40.png
+share/apps/kile/mathsymbols/img401.png
+share/apps/kile/mathsymbols/img402.png
+share/apps/kile/mathsymbols/img403.png
+share/apps/kile/mathsymbols/img404.png
+share/apps/kile/mathsymbols/img405.png
+share/apps/kile/mathsymbols/img406.png
+share/apps/kile/mathsymbols/img407.png
+share/apps/kile/mathsymbols/img408.png
+share/apps/kile/mathsymbols/img409.png
 share/apps/kile/mathsymbols/img40greek.png
 share/apps/kile/mathsymbols/img41.png
+share/apps/kile/mathsymbols/img410.png
+share/apps/kile/mathsymbols/img411.png
+share/apps/kile/mathsymbols/img412.png
+share/apps/kile/mathsymbols/img413.png
+share/apps/kile/mathsymbols/img414.png
+share/apps/kile/mathsymbols/img415.png
+share/apps/kile/mathsymbols/img416.png
+share/apps/kile/mathsymbols/img417.png
+share/apps/kile/mathsymbols/img418.png
+share/apps/kile/mathsymbols/img419.png
 share/apps/kile/mathsymbols/img42.png
+share/apps/kile/mathsymbols/img420.png
+share/apps/kile/mathsymbols/img421.png
+share/apps/kile/mathsymbols/img422.png
+share/apps/kile/mathsymbols/img423.png
+share/apps/kile/mathsymbols/img424.png
+share/apps/kile/mathsymbols/img425.png
+share/apps/kile/mathsymbols/img426.png
+share/apps/kile/mathsymbols/img427.png
+share/apps/kile/mathsymbols/img428.png
+share/apps/kile/mathsymbols/img429.png
 share/apps/kile/mathsymbols/img43.png
+share/apps/kile/mathsymbols/img430.png
+share/apps/kile/mathsymbols/img431.png
+share/apps/kile/mathsymbols/img432.png
+share/apps/kile/mathsymbols/img433.png
 share/apps/kile/mathsymbols/img44.png
 share/apps/kile/mathsymbols/img45.png
 share/apps/kile/mathsymbols/img46.png
@@ -414,6 +449,7 @@ share/apps/kile/mathsymbols/img99.png
 share/apps/kile/mathsymbols/img9greek.png
 share/apps/kile/pics/acute.png
 share/apps/kile/pics/bar.png
+share/apps/kile/pics/bibtex.png
 share/apps/kile/pics/breve.png
 share/apps/kile/pics/chapter.png
 share/apps/kile/pics/check.png
@@ -427,6 +463,7 @@ share/apps/kile/pics/dvisearch.png
 share/apps/kile/pics/enumerate.png
 share/apps/kile/pics/errornext.png
 share/apps/kile/pics/errorprev.png
+share/apps/kile/pics/file.png
 share/apps/kile/pics/grave.png
 share/apps/kile/pics/hat.png
 share/apps/kile/pics/include.png
@@ -437,21 +474,25 @@ share/apps/kile/pics/kile_splash.png
 share/apps/kile/pics/l2h.png
 share/apps/kile/pics/latex.png
 share/apps/kile/pics/master.png
+share/apps/kile/pics/masteritem.png
 share/apps/kile/pics/math1.png
 share/apps/kile/pics/math2.png
 share/apps/kile/pics/math3.png
 share/apps/kile/pics/math4.png
 share/apps/kile/pics/math5.png
+share/apps/kile/pics/math6.png
 share/apps/kile/pics/mathmode.png
 share/apps/kile/pics/metapost.png
 share/apps/kile/pics/modified.png
 share/apps/kile/pics/newline.png
 share/apps/kile/pics/output_win.png
 share/apps/kile/pics/part.png
+share/apps/kile/pics/projectitem.png
 share/apps/kile/pics/ps2pdf.png
 share/apps/kile/pics/puissance.png
 share/apps/kile/pics/quick.png
 share/apps/kile/pics/racine.png
+share/apps/kile/pics/relation.png
 share/apps/kile/pics/section.png
 share/apps/kile/pics/smallfrac.png
 share/apps/kile/pics/structure.png
@@ -465,12 +506,16 @@ share/apps/kile/pics/type_Empty.png
 share/apps/kile/pics/type_Letter.png
 share/apps/kile/pics/type_Project.png
 share/apps/kile/pics/type_Report.png
+share/apps/kile/pics/usertag.png
+share/apps/kile/pics/usertool.png
 share/apps/kile/pics/vec.png
 share/apps/kile/pics/viewdvi.png
 share/apps/kile/pics/viewhtml.png
 share/apps/kile/pics/viewlog.png
 share/apps/kile/pics/viewpdf.png
 share/apps/kile/pics/viewps.png
+share/apps/kile/pics/warnnext.png
+share/apps/kile/pics/warnprev.png
 share/apps/kile/pics/watchfile.png
 share/apps/kile/pics/xfig.png
 share/apps/kile/pics/xgfe.png
@@ -480,42 +525,27 @@ share/apps/kile/templates/template_Letter.tex
 share/apps/kile/templates/template_Report.tex
 share/doc/HTML/en/kile/TODO
 share/doc/HTML/en/kile/common
-share/doc/HTML/en/kile/doc1.png
-share/doc/HTML/en/kile/doc10.png
-share/doc/HTML/en/kile/doc11.png
-share/doc/HTML/en/kile/doc12.png
-share/doc/HTML/en/kile/doc2.png
-share/doc/HTML/en/kile/doc3.png
-share/doc/HTML/en/kile/doc4.png
-share/doc/HTML/en/kile/doc5.png
-share/doc/HTML/en/kile/doc6.png
-share/doc/HTML/en/kile/doc7.png
-share/doc/HTML/en/kile/doc8.png
-share/doc/HTML/en/kile/doc9.png
-share/doc/HTML/en/kile/enc1.png
 share/doc/HTML/en/kile/index.cache.bz2
 share/doc/HTML/en/kile/index.docbook
-share/doc/HTML/sv/kile/common
-share/doc/HTML/sv/kile/doc1.png
-share/doc/HTML/sv/kile/doc10.png
-share/doc/HTML/sv/kile/doc11.png
-share/doc/HTML/sv/kile/doc12.png
-share/doc/HTML/sv/kile/doc2.png
-share/doc/HTML/sv/kile/doc3.png
-share/doc/HTML/sv/kile/doc5.png
-share/doc/HTML/sv/kile/doc6.png
-share/doc/HTML/sv/kile/doc9.png
-share/doc/HTML/sv/kile/enc1.png
-share/doc/HTML/sv/kile/index.cache.bz2
-share/doc/HTML/sv/kile/index.docbook
-share/icons/hicolor/16x16/apps/kile.png
-share/icons/hicolor/22x22/apps/kile.png
-share/icons/hicolor/32x32/apps/kile.png
-share/icons/hicolor/48x48/apps/kile.png
-share/locale/bg/LC_MESSAGES/kile.mo
+share/doc/HTML/en/kile/latexhelp.html
+share/doc/HTML/en/kile/snap_autocomplete.png
+share/doc/HTML/en/kile/snap_compile_error.png
+share/doc/HTML/en/kile/snap_editusertag.png
+share/doc/HTML/en/kile/snap_encoding.png
+share/doc/HTML/en/kile/snap_kdvi_settings.png
+share/doc/HTML/en/kile/snap_projectview.png
+share/doc/HTML/en/kile/snap_projectview_add.png
+share/doc/HTML/en/kile/snap_ref_choose.png
+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/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
@@ -525,26 +555,21 @@ 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/pt/LC_MESSAGES/kile.mo
+share/locale/pl/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/sv/LC_MESSAGES/kile.mo
-share/locale/tr/LC_MESSAGES/kile.mo
-@unexec rmdir %D/share/nls/en_US.US-ASCII 2>/dev/null || true
-@unexec rmdir %D/share/nls/POSIX 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 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
+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
 @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/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 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/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
@@ -563,27 +588,21 @@ share/locale/tr/LC_MESSAGES/kile.mo
 @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/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 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/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 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
+@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
+@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/en/kile
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
@@ -591,6 +610,8 @@ share/locale/tr/LC_MESSAGES/kile.mo
 @dirrm share/apps/kile/pics
 @dirrm share/apps/kile/mathsymbols
 @dirrm share/apps/kile
+@unexec rmdir %D/share/apps/katepart/syntax 2>/dev/null || true
+@unexec rmdir %D/share/apps/katepart 2>/dev/null || true
 @unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true