1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

Remove inclusion of "${PORTSDIR}/x11/kde3/Makefile.kde", fix PTHREAD_LIBS

safeness, fix compilation where needed.

Committers: Please do NOT include Makefile.kde or commit new ports which do
so. It's for use with the core KDE ports maintained by kde@freebsd.org ONLY.
This commit is contained in:
Michael Nottebrock 2004-05-21 22:23:08 +00:00
parent 7b44b26175
commit 258a678bde
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109667
14 changed files with 97 additions and 39 deletions

View File

@ -20,8 +20,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>

View File

@ -21,8 +21,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>

View File

@ -20,7 +20,10 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= 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|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -17,7 +17,10 @@ COMMENT= A sokoban game for KDE3
USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= 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|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
--- src/Makefile.in.orig Fri May 21 22:37:02 2004
+++ src/Makefile.in Fri May 21 22:37:18 2004
@@ -248,7 +248,7 @@
easysok_SOURCES = dummy.cpp
easysok_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-easysok_LDADD = easysok.la $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_MNG) -lkdeprint
+easysok_LDADD = easysok.la $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_MNG) -lkdeprint $(LIBPTHREAD)
easysok_la_SOURCES = atomic_move.cpp move.cpp movements.cpp hash.cpp map.cpp \
compressed_map.cpp level.cpp collection.cpp collection_holder.cpp \

View File

@ -18,7 +18,10 @@ COMMENT= KDE puzzle game
USE_BZIP2= yes
USE_KDELIBS_VER= 3
GNU_CONFIGURE= 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|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -19,16 +19,11 @@ LIB_DEPENDS= artsmodules.0:${PORTSDIR}/multimedia/kdemultimedia3
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 253
USE_AUTOHEADER= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
.include <bsd.port.pre.mk>
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
post-patch:
@${REINPLACE_CMD} -e 's| -pedantic||g ; \
s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/aclocal.m4
@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -20,7 +20,10 @@ RUN_DEPENDS= barcode:${PORTSDIR}/graphics/barcode
USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= 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|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
--- kbarcode/Makefile.in.orig Fri May 21 23:23:23 2004
+++ kbarcode/Makefile.in Fri May 21 23:24:01 2004
@@ -259,7 +259,7 @@
# the application source, library search path, and link libraries
kbarcode_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) $(LIB_KDEUI)
+kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIBPTHREAD)
noinst_HEADERS = barcodecache.h barcodecombo.h barcodedialog.h barcodedialogs.h commands.h configdialog.h confwizard.h csvimportdlg.h databasebrowser.h definition.h definitiondialog.h dsmainwindow.h dsrichtext.h kbarcode.h label.h labeleditor.h labelprinter.h labelutils.h mimesources.h multilineeditdlg.h mybarcode.h mycanvasitem.h mycanvasview.h mydatatable.h newlabel.h previewdialog.h printersettings.h printlabeldlg.h rectsettingsdlg.h smalldialogs.h sqltables.h tokenprovider.h xmlutils.h zplutils.h
kbarcode_SOURCES = barcodecombo.cpp barcodecache.cpp barcodedialog.cpp barcodedialogs.cpp commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp databasebrowser.cpp definition.cpp definitiondialog.cpp dsmainwindow.cpp dsrichtext.cpp kbarcode.cpp label.cpp labeleditor.cpp labelprinter.cpp labelutils.cpp main.cpp mimesources.cpp multilineeditdlg.cpp mybarcode.cpp mycanvasitem.cpp mycanvasview.cpp mydatatable.cpp newlabel.cpp previewdialog.cpp printersettings.cpp printlabeldlg.cpp rectsettingsdlg.cpp smalldialogs.cpp sqltables.cpp tokenprovider.cpp xmlutils.cpp zplutils.cpp

View File

@ -19,7 +19,10 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= 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|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -22,11 +22,14 @@ USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
PLIST_FILES= lib/kde3/plugins/styles/qnx.so \
lib/kde3/plugins/styles/qnx.la \
share/apps/kstyle/themes/qnx.themerc
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
--- src/Makefile.in.orig Sat May 22 00:01:43 2004
+++ src/Makefile.in Sat May 22 00:02:13 2004
@@ -228,7 +228,7 @@
noinst_HEADERS = qnx.h
kde_style_LTLIBRARIES = qnx.la
qnx_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdefx -module
-qnx_la_LIBADD =
+qnx_la_LIBADD = $(LIBPTHREAD)
qnx_la_SOURCES = qnx.cpp
#>- qnx_la_METASOURCES = AUTO

View File

@ -22,11 +22,14 @@ USE_KDELIBS_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
PLIST_FILES= lib/kde3/plugins/styles/qnx.so \
lib/kde3/plugins/styles/qnx.la \
share/apps/kstyle/themes/qnx.themerc
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>

View File

@ -0,0 +1,11 @@
--- src/Makefile.in.orig Sat May 22 00:01:43 2004
+++ src/Makefile.in Sat May 22 00:02:13 2004
@@ -228,7 +228,7 @@
noinst_HEADERS = qnx.h
kde_style_LTLIBRARIES = qnx.la
qnx_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdefx -module
-qnx_la_LIBADD =
+qnx_la_LIBADD = $(LIBPTHREAD)
qnx_la_SOURCES = qnx.cpp
#>- qnx_la_METASOURCES = AUTO