Remove inclusion of Makefile.kde from all remaining ports not maintained

by kde@

Approved by: maintainer timeout

13 files changed, 76 insertions, 35 deletions

diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index dbef57d5f591..521a894de677 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -28,9 +28,7 @@ MAKE_ENV=	EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
 
-pre-build:
-	${REINPLACE_CMD} "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/Makefile
+post-patch:
+	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/kscope/files/patch-src_Makefile.in b/devel/kscope/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..269191c9ff37
--- /dev/null
+++ b/devel/kscope/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- 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
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index ed326ef53b2c..5f1f55628716 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -27,11 +27,10 @@ UIFILES=kxesearchdialogbase kxeprocinstrdialogbase kxespecprocinstrdialogbase \
 	kxetextviewsettingspage kxetexteditordialogbase
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+	${WRKSRC}/${CONFIGURE_SCRIPT}
 .for i in ${UIFILES}
 	@${RM} ${WRKSRC}/part/$i.h ${WRKSRC}/part/$i.cpp
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 63b1893cdc67..faf7c5c5c33a 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -29,7 +29,8 @@ post-extract:
 	@${TOUCH} ${WRKSRC}/config.h.in
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.pre.mk>
 
@@ -38,5 +39,4 @@ LIB_DEPENDS+=	digikam:${PORTSDIR}/graphics/digikam
 CONFIGURE_ARGS+=	--enable-digiKam-plugin
 .endif
 
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
 .include <bsd.port.post.mk>
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index 25d8af4794f5..7e1b21f94500 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -25,10 +25,11 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--with-freebsd-pthread
+#CONFIGURE_ARGS+=	--with-freebsd-pthread
 
 MAN1=	kvirc.1
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+post-patch:
+	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 25d8af4794f5..7e1b21f94500 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -25,10 +25,11 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--with-freebsd-pthread
+#CONFIGURE_ARGS+=	--with-freebsd-pthread
 
 MAN1=	kvirc.1
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+post-patch:
+	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 4ee170bc9738..c7c1da4f7915 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index b2549f1161d2..e536d0974871 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -29,8 +29,7 @@ post-extract:
 	@${TOUCH} ${WRKSRC}/stamp-h.in
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's/-O2//g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/kmerlin/files/patch-src_Makefile.in b/net-im/kmerlin/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..ef2e48cefb26
--- /dev/null
+++ b/net-im/kmerlin/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Jun 22 19:41:52 2004
++++ src/Makefile.in	Tue Jun 22 19:42:18 2004
+@@ -251,7 +251,7 @@
+ kmerlin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-kmerlin_LDADD = ./setting/libsetting.a ./chat/libchat.a $(LIB_KFILE) $(compat_lib) 
++kmerlin_LDADD = ./setting/libsetting.a ./chat/libchat.a $(LIB_KFILE) $(compat_lib) $(LIBPTHREAD)
+ 
+ # which sources should be compiled for kmerlin
+ #>- kmerlin_SOURCES = main.cpp kmerlin.cpp kmerlinview.cpp kmerliniface.skel kmcontact.cpp kmcontact.h kmservice.h kmservice.cpp kmchatservice.h kmchatservice.cpp qcategorywidget.cpp qcategorywidget.h kmgroup.h kmgroup.cpp connectwidget.ui kmerlinprofile.cpp kmerlinprofile.h kmtextreplace.cpp kmtextreplace.h kmemotionicon.cpp kmemotionicon.h imchatservice.cpp imchatservice.h imfilereceive.cpp imfilereceive.h kmcontactaction.cpp kmcontactaction.h kmerlinnotify.cpp kmerlinnotify.h kmerlindock.h kmerlindock.cpp xautolock.cpp xautolock.h CContactWidget.cpp CContactWidget.h login.ui authdlg.ui authdlg.ui.h login.ui.h groupdlg.ui groupdlg.ui.h
diff --git a/net/kmerlin/files/patch-src_Makefile.in b/net/kmerlin/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..ef2e48cefb26
--- /dev/null
+++ b/net/kmerlin/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Jun 22 19:41:52 2004
++++ src/Makefile.in	Tue Jun 22 19:42:18 2004
+@@ -251,7 +251,7 @@
+ kmerlin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-kmerlin_LDADD = ./setting/libsetting.a ./chat/libchat.a $(LIB_KFILE) $(compat_lib) 
++kmerlin_LDADD = ./setting/libsetting.a ./chat/libchat.a $(LIB_KFILE) $(compat_lib) $(LIBPTHREAD)
+ 
+ # which sources should be compiled for kmerlin
+ #>- kmerlin_SOURCES = main.cpp kmerlin.cpp kmerlinview.cpp kmerliniface.skel kmcontact.cpp kmcontact.h kmservice.h kmservice.cpp kmchatservice.h kmchatservice.cpp qcategorywidget.cpp qcategorywidget.h kmgroup.h kmgroup.cpp connectwidget.ui kmerlinprofile.cpp kmerlinprofile.h kmtextreplace.cpp kmtextreplace.h kmemotionicon.cpp kmemotionicon.h imchatservice.cpp imchatservice.h imfilereceive.cpp imfilereceive.h kmcontactaction.cpp kmcontactaction.h kmerlinnotify.cpp kmerlinnotify.h kmerlindock.h kmerlindock.cpp xautolock.cpp xautolock.h CContactWidget.cpp CContactWidget.h login.ui authdlg.ui authdlg.ui.h login.ui.h groupdlg.ui groupdlg.ui.h
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index 01bb675788ac..bf6d089b1af7 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -21,8 +21,9 @@ CONFLICTS=		kdeutils-3.[2-].*
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_KDELIBS_VER=	3
-_NO_KDE_FIXPTHREAD=	yes
+USE_REINPLACE=		yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/security/kgpg/files/patch-kgpg_kgpg_Makefile.in b/security/kgpg/files/patch-kgpg_kgpg_Makefile.in
new file mode 100644
index 000000000000..f57718f79c60
--- /dev/null
+++ b/security/kgpg/files/patch-kgpg_kgpg_Makefile.in
@@ -0,0 +1,11 @@
+--- kgpg/kgpg/Makefile.in.orig	Tue Jun 22 20:51:40 2004
++++ kgpg/kgpg/Makefile.in	Tue Jun 22 20:52:00 2004
+@@ -249,7 +249,7 @@
+ #>- kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp kgpg.cpp main.cpp popupname.cpp kgpgfast.cpp keygener.cpp kgpgoption.ui kgpginterface.cpp keyservers.cpp keyserver.ui searchres.ui popupimport.cpp kgpgeditor.cpp detailedconsole.cpp kgpglibrary.cpp
+ #>+ 1
+ kgpg_SOURCES=kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp kgpg.cpp main.cpp popupname.cpp kgpgfast.cpp keygener.cpp  kgpginterface.cpp keyservers.cpp   popupimport.cpp kgpgeditor.cpp detailedconsole.cpp kgpglibrary.cpp kgpgoption.cpp keyserver.cpp searchres.cpp
+-kgpg_LDADD = $(LIB_KIO)
++kgpg_LDADD = $(LIB_KIO) $(LIBPTHREAD)
+ 
+ KDE_ICON = kgpg
+ 
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index db4e11e1ffd1..135e73a23c95 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -22,8 +22,7 @@ USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>