Update to 1.1.0 (almost working PR from under my desk)

Based on PR:	ports/77248
Submitted by:	maintainer

4 files changed, 26 insertions, 17 deletions

diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 1e20ef464a5f..4edfe79bf566 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kscope
-PORTVERSION=	1.0
+PORTVERSION=	1.1.0
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/
@@ -27,10 +27,8 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
 MAKE_ENV=	EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CXXFLAGS="${PTHREAD_CFLAGS}"
 CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
 
-post-patch:
-	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/devel/kscope/distinfo b/devel/kscope/distinfo
index a3284f85ae16..f91166a1e75f 100644
--- a/devel/kscope/distinfo
+++ b/devel/kscope/distinfo
@@ -1,2 +1,2 @@
-MD5 (kscope-1.0.tar.gz) = f6dbd3916b6dc3b85472a3207fa12a00
-SIZE (kscope-1.0.tar.gz) = 980422
+MD5 (kscope-1.1.0.tar.gz) = 2307f182f84fee474ff8bc1630cf3b3c
+SIZE (kscope-1.1.0.tar.gz) = 999787
diff --git a/devel/kscope/files/patch-inline b/devel/kscope/files/patch-inline
new file mode 100644
index 000000000000..ff9e3ef6ad3b
--- /dev/null
+++ b/devel/kscope/files/patch-inline
@@ -0,0 +1,22 @@
+--- src/kscope.h.orig	Wed Mar  9 18:30:41 2005
++++ src/kscope.h	Wed Mar  9 18:30:52 2005
+@@ -145,7 +145,7 @@
+ 	bool getSymbol(uint&, QString&, bool bPrompt = true);
+ 	EditorPage* addEditor(const QString&s);
+ 	EditorPage* createEditorPage();
+-	inline bool isAutoRebuildEnabled();
++	bool isAutoRebuildEnabled();
+ 
+ private slots:
+ 	// Menu actions
+--- src/kscope.cpp.orig	Wed Mar  9 18:30:35 2005
++++ src/kscope.cpp	Wed Mar  9 18:31:08 2005
+@@ -1126,7 +1126,7 @@
+  * @return	true if database auto-rebuild is enabled for the current project,
+  *			false otherwise
+  */
+-inline bool KScope::isAutoRebuildEnabled()
++bool KScope::isAutoRebuildEnabled()
+ {
+ 	return (m_pProjMgr->getAutoRebuildTime() >= 0);
+ }
diff --git a/devel/kscope/files/patch-src_Makefile.in b/devel/kscope/files/patch-src_Makefile.in
deleted file mode 100644
index 269191c9ff37..000000000000
--- a/devel/kscope/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue Jun 22 17:58:35 2004
-+++ src/Makefile.in	Tue Jun 22 18:01:18 2004
-@@ -277,7 +277,7 @@
- #>+ 1
- kscope_SOURCES=main.cpp kscope.cpp calltreedlg.cpp calltreedlg.h cscopefrontend.cpp cscopefrontend.h ctagsfrontend.cpp ctagsfrontend.h ctagslist.cpp ctagslist.h dirscanner.cpp dirscanner.h editormanager.cpp editormanager.h editorpage.cpp editorpage.h editortabs.cpp editortabs.h filelist.cpp filelist.h frontend.cpp frontend.h kscopeconfig.cpp kscopeconfig.h kscope.h kscopepixmaps.cpp kscopepixmaps.h newprojectdlg.cpp newprojectdlg.h openprojectdlg.cpp openprojectdlg.h prefcolor.cpp prefcolor.h preferencesdlg.cpp preferencesdlg.h preffrontend.cpp preffrontend.h progressdlg.cpp progressdlg.h projectfilesdlg.cpp projectfilesdlg.h projectmanager.cpp projectmanager.h querypage.cpp querypage.h querywidget.cpp querywidget.h scanprogressdlg.cpp scanprogressdlg.h searchlist.cpp searchlist.h        tabwidget.cpp tabbar.cpp  cscopemsgdlg.cpp positionhistory.cpp  positionhistorydlg.cpp calltreelayout.cpp newprojectlayout.cpp openprojectlayout.cpp prefcolorlayout.cpp preffrontendlayout.cpp projectfileslayout.cpp scanprogresslayout.cpp cscopemsglayout.cpp positionhistorylayout.cpp
- kscope_LDFLAGS = $(KDE_RPATH) $(all_libraries)
--kscope_LDADD = -lktexteditor $(LIB_KDEUI)
-+kscope_LDADD = -lktexteditor $(LIB_KDEUI) $(LIBPTHREAD)
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities