- Update to version 1.7.1

- Don't install two files which already get installed by x11/kdelibs3 [1]

Submitted by:	pointyhat via kris [1]

8 files changed, 20 insertions, 38 deletions

diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index d0a0bfbac1c8..d64107aeaac7 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kile
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,5 +26,6 @@ USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| syntax||g' ${WRKSRC}/kile/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/editors/kile-kde4/distinfo b/editors/kile-kde4/distinfo
index 24f7aa8bf4b5..60396b447033 100644
--- a/editors/kile-kde4/distinfo
+++ b/editors/kile-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (kile-1.7.tar.bz2) = a9ead1a26e5f4840a0208e9e178f27f5
-SIZE (kile-1.7.tar.bz2) = 1317947
+MD5 (kile-1.7.1.tar.bz2) = 940fba9dc62e2687856885dffccf6e80
+SIZE (kile-1.7.1.tar.bz2) = 1341428
diff --git a/editors/kile-kde4/files/patch-Makefile.in b/editors/kile-kde4/files/patch-Makefile.in
deleted file mode 100644
index d28517ffff23..000000000000
--- a/editors/kile-kde4/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kile/Makefile.in.orig	Sun Oct 17 14:40:24 2004
-+++ kile/Makefile.in	Sun Oct 17 14:40:43 2004
-@@ -572,7 +572,7 @@
- #>- kile_SOURCES = includegraphicsdialog.cpp newfilewizard.cpp managetemplatesdialog.cpp templates.cpp metapostview.cpp usermenudialog.cpp kileconfigdialog.cpp tabdialog.cpp tabbingdialog.cpp symbolview.cpp quickdocumentdialog.cpp kilefileselect.cpp kileapplication.cpp docpart.cpp arraydialog.cpp kile.cpp main.cpp kileactions.cpp kilestdactions.cpp kileinfo.cpp kiledocumentinfo.cpp kileproject.cpp kileprojectdlgs.cpp kileprojectview.cpp kilelistselector.cpp kilelyxserver.cpp latexoutputfilter.cpp outputinfo.cpp latexoutputinfo.cpp outputfilter.cpp kilegrepdialog.cpp kiletool.cpp kilelauncher.cpp kiletoolmanager.cpp kilestdtools.cpp kilelogwidget.cpp kileoutputwidget.cpp kilekonsolewidget.cpp kilewizard.cpp kilestructurewidget.cpp codecompletion.cpp configcodecompletion.cpp kiletoolconfigwidget.cpp kileedit.cpp cleandialog.cpp kilehelp.cpp configstructure.cpp configenvironment.cpp kileappIface.skel convert.cpp helpconfigwidget.ui kiledocmanager.cpp kileviewmanager.cpp kileeventfilter.cpp kileautosavejob.cpp latexconfigwidget.ui kileconfig.kcfgc generalconfigwidget.ui texfilter.cpp kilespell.cpp kileerrorhandler.cpp configcheckerdlg.cpp configcheckerwidget.ui configtester.cpp kilesidebar.cpp toolconfigwidget.ui librarytoolconfigwidget.ui processtoolconfigwidget.ui quicktoolconfigwidget.ui plaintolatexconverter.cpp latextoolconfigwidget.ui newtoolwizard.ui
- #>+ 1
- kile_SOURCES=includegraphicsdialog.cpp newfilewizard.cpp managetemplatesdialog.cpp templates.cpp metapostview.cpp usermenudialog.cpp kileconfigdialog.cpp tabdialog.cpp tabbingdialog.cpp symbolview.cpp quickdocumentdialog.cpp kilefileselect.cpp kileapplication.cpp docpart.cpp arraydialog.cpp kile.cpp main.cpp kileactions.cpp kilestdactions.cpp kileinfo.cpp kiledocumentinfo.cpp kileproject.cpp kileprojectdlgs.cpp kileprojectview.cpp kilelistselector.cpp kilelyxserver.cpp latexoutputfilter.cpp outputinfo.cpp latexoutputinfo.cpp outputfilter.cpp kilegrepdialog.cpp kiletool.cpp kilelauncher.cpp kiletoolmanager.cpp kilestdtools.cpp kilelogwidget.cpp kileoutputwidget.cpp kilekonsolewidget.cpp kilewizard.cpp kilestructurewidget.cpp codecompletion.cpp configcodecompletion.cpp kiletoolconfigwidget.cpp kileedit.cpp cleandialog.cpp kilehelp.cpp configstructure.cpp configenvironment.cpp  convert.cpp  kiledocmanager.cpp kileviewmanager.cpp kileeventfilter.cpp kileautosavejob.cpp    texfilter.cpp kilespell.cpp kileerrorhandler.cpp configcheckerdlg.cpp  configtester.cpp kilesidebar.cpp     plaintolatexconverter.cpp   kileappIface_skel.cpp helpconfigwidget.cpp latexconfigwidget.cpp generalconfigwidget.cpp configcheckerwidget.cpp toolconfigwidget.cpp librarytoolconfigwidget.cpp processtoolconfigwidget.cpp quicktoolconfigwidget.cpp latextoolconfigwidget.cpp newtoolwizard.cpp kileconfig.cpp
--kile_LDADD = -lkdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIBKSPELL2) $(LIB_KHTML)
-+kile_LDADD = -lkdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) -lkspell2 $(LIB_KHTML)
- SUBDIRS = icons pics symbols templates syntax complete help encodings test
- EXTRA_DIST = main.cpp kile.cpp kile.h arraydialog.cpp arraydialog.h \
- 	docpart.cpp docpart.h kileappIface.h kileapplication.cpp kileapplication.h kile.desktop kilefileselect.cpp 	kilefileselect.h kileui.rc docpartui.rc kmultiverttabbar.cpp kmultiverttabbar.h letterdialog.cpp letterdialog.h quickdocumentdialog.cpp quickdocumentdialog.h symbolview.cpp symbolview.h tabbingdialog.cpp tabbingdialog.h tabdialog.cpp \
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
index 4185eaf71adc..f3f30025cf6e 100644
--- a/editors/kile-kde4/pkg-plist
+++ b/editors/kile-kde4/pkg-plist
@@ -1,7 +1,7 @@
 bin/kile
 share/applications/kde/kile.desktop
-share/apps/katepart/syntax/bibtex.xml
-share/apps/katepart/syntax/latex.xml
+share/apps/kconf_update/kile.upd
+share/apps/kconf_update/kile1.6_upd.pl
 share/apps/kile/complete/abbreviation/example.cwl
 share/apps/kile/complete/dictionary/example.cwl
 share/apps/kile/complete/tex/Common.cwl
@@ -630,6 +630,9 @@ share/icons/hicolor/22x22/apps/kile.png
 share/icons/hicolor/32x32/apps/kile.png
 share/icons/hicolor/48x48/apps/kile.png
 share/icons/hicolor/64x64/apps/kile.png
+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/icons/hicolor/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
@@ -680,8 +683,7 @@ share/icons/hicolor/64x64/apps/kile.png
 @dirrm share/apps/kile/complete/abbreviation
 @dirrm share/apps/kile/complete
 @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/kconf_update 2>/dev/null || true
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applications/kde 2>/dev/null || true
 @unexec rmdir %D/share/applications 2>/dev/null || true
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index d0a0bfbac1c8..d64107aeaac7 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kile
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,5 +26,6 @@ USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| syntax||g' ${WRKSRC}/kile/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/editors/kile/distinfo b/editors/kile/distinfo
index 24f7aa8bf4b5..60396b447033 100644
--- a/editors/kile/distinfo
+++ b/editors/kile/distinfo
@@ -1,2 +1,2 @@
-MD5 (kile-1.7.tar.bz2) = a9ead1a26e5f4840a0208e9e178f27f5
-SIZE (kile-1.7.tar.bz2) = 1317947
+MD5 (kile-1.7.1.tar.bz2) = 940fba9dc62e2687856885dffccf6e80
+SIZE (kile-1.7.1.tar.bz2) = 1341428
diff --git a/editors/kile/files/patch-Makefile.in b/editors/kile/files/patch-Makefile.in
deleted file mode 100644
index d28517ffff23..000000000000
--- a/editors/kile/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kile/Makefile.in.orig	Sun Oct 17 14:40:24 2004
-+++ kile/Makefile.in	Sun Oct 17 14:40:43 2004
-@@ -572,7 +572,7 @@
- #>- kile_SOURCES = includegraphicsdialog.cpp newfilewizard.cpp managetemplatesdialog.cpp templates.cpp metapostview.cpp usermenudialog.cpp kileconfigdialog.cpp tabdialog.cpp tabbingdialog.cpp symbolview.cpp quickdocumentdialog.cpp kilefileselect.cpp kileapplication.cpp docpart.cpp arraydialog.cpp kile.cpp main.cpp kileactions.cpp kilestdactions.cpp kileinfo.cpp kiledocumentinfo.cpp kileproject.cpp kileprojectdlgs.cpp kileprojectview.cpp kilelistselector.cpp kilelyxserver.cpp latexoutputfilter.cpp outputinfo.cpp latexoutputinfo.cpp outputfilter.cpp kilegrepdialog.cpp kiletool.cpp kilelauncher.cpp kiletoolmanager.cpp kilestdtools.cpp kilelogwidget.cpp kileoutputwidget.cpp kilekonsolewidget.cpp kilewizard.cpp kilestructurewidget.cpp codecompletion.cpp configcodecompletion.cpp kiletoolconfigwidget.cpp kileedit.cpp cleandialog.cpp kilehelp.cpp configstructure.cpp configenvironment.cpp kileappIface.skel convert.cpp helpconfigwidget.ui kiledocmanager.cpp kileviewmanager.cpp kileeventfilter.cpp kileautosavejob.cpp latexconfigwidget.ui kileconfig.kcfgc generalconfigwidget.ui texfilter.cpp kilespell.cpp kileerrorhandler.cpp configcheckerdlg.cpp configcheckerwidget.ui configtester.cpp kilesidebar.cpp toolconfigwidget.ui librarytoolconfigwidget.ui processtoolconfigwidget.ui quicktoolconfigwidget.ui plaintolatexconverter.cpp latextoolconfigwidget.ui newtoolwizard.ui
- #>+ 1
- kile_SOURCES=includegraphicsdialog.cpp newfilewizard.cpp managetemplatesdialog.cpp templates.cpp metapostview.cpp usermenudialog.cpp kileconfigdialog.cpp tabdialog.cpp tabbingdialog.cpp symbolview.cpp quickdocumentdialog.cpp kilefileselect.cpp kileapplication.cpp docpart.cpp arraydialog.cpp kile.cpp main.cpp kileactions.cpp kilestdactions.cpp kileinfo.cpp kiledocumentinfo.cpp kileproject.cpp kileprojectdlgs.cpp kileprojectview.cpp kilelistselector.cpp kilelyxserver.cpp latexoutputfilter.cpp outputinfo.cpp latexoutputinfo.cpp outputfilter.cpp kilegrepdialog.cpp kiletool.cpp kilelauncher.cpp kiletoolmanager.cpp kilestdtools.cpp kilelogwidget.cpp kileoutputwidget.cpp kilekonsolewidget.cpp kilewizard.cpp kilestructurewidget.cpp codecompletion.cpp configcodecompletion.cpp kiletoolconfigwidget.cpp kileedit.cpp cleandialog.cpp kilehelp.cpp configstructure.cpp configenvironment.cpp  convert.cpp  kiledocmanager.cpp kileviewmanager.cpp kileeventfilter.cpp kileautosavejob.cpp    texfilter.cpp kilespell.cpp kileerrorhandler.cpp configcheckerdlg.cpp  configtester.cpp kilesidebar.cpp     plaintolatexconverter.cpp   kileappIface_skel.cpp helpconfigwidget.cpp latexconfigwidget.cpp generalconfigwidget.cpp configcheckerwidget.cpp toolconfigwidget.cpp librarytoolconfigwidget.cpp processtoolconfigwidget.cpp quicktoolconfigwidget.cpp latextoolconfigwidget.cpp newtoolwizard.cpp kileconfig.cpp
--kile_LDADD = -lkdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIBKSPELL2) $(LIB_KHTML)
-+kile_LDADD = -lkdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) -lkspell2 $(LIB_KHTML)
- SUBDIRS = icons pics symbols templates syntax complete help encodings test
- EXTRA_DIST = main.cpp kile.cpp kile.h arraydialog.cpp arraydialog.h \
- 	docpart.cpp docpart.h kileappIface.h kileapplication.cpp kileapplication.h kile.desktop kilefileselect.cpp 	kilefileselect.h kileui.rc docpartui.rc kmultiverttabbar.cpp kmultiverttabbar.h letterdialog.cpp letterdialog.h quickdocumentdialog.cpp quickdocumentdialog.h symbolview.cpp symbolview.h tabbingdialog.cpp tabbingdialog.h tabdialog.cpp \
diff --git a/editors/kile/pkg-plist b/editors/kile/pkg-plist
index 4185eaf71adc..f3f30025cf6e 100644
--- a/editors/kile/pkg-plist
+++ b/editors/kile/pkg-plist
@@ -1,7 +1,7 @@
 bin/kile
 share/applications/kde/kile.desktop
-share/apps/katepart/syntax/bibtex.xml
-share/apps/katepart/syntax/latex.xml
+share/apps/kconf_update/kile.upd
+share/apps/kconf_update/kile1.6_upd.pl
 share/apps/kile/complete/abbreviation/example.cwl
 share/apps/kile/complete/dictionary/example.cwl
 share/apps/kile/complete/tex/Common.cwl
@@ -630,6 +630,9 @@ share/icons/hicolor/22x22/apps/kile.png
 share/icons/hicolor/32x32/apps/kile.png
 share/icons/hicolor/48x48/apps/kile.png
 share/icons/hicolor/64x64/apps/kile.png
+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/icons/hicolor/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
@@ -680,8 +683,7 @@ share/icons/hicolor/64x64/apps/kile.png
 @dirrm share/apps/kile/complete/abbreviation
 @dirrm share/apps/kile/complete
 @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/kconf_update 2>/dev/null || true
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applications/kde 2>/dev/null || true
 @unexec rmdir %D/share/applications 2>/dev/null || true