From d1252614215048e822b94df6cd1e90a8767f993e Mon Sep 17 00:00:00 2001 From: lofi Date: Fri, 21 May 2004 22:23:08 +0000 Subject: 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. --- x11-themes/qnxstyle/Makefile | 9 ++++++--- x11-themes/qnxstyle/files/patch-src_Makefile.in | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 x11-themes/qnxstyle/files/patch-src_Makefile.in (limited to 'x11-themes') diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile index ab0f1e58e7d..4511f2062ab 100644 --- a/x11-themes/qnxstyle/Makefile +++ b/x11-themes/qnxstyle/Makefile @@ -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 -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include +post-patch: + @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} + +.include diff --git a/x11-themes/qnxstyle/files/patch-src_Makefile.in b/x11-themes/qnxstyle/files/patch-src_Makefile.in new file mode 100644 index 00000000000..e4e6bc88a88 --- /dev/null +++ b/x11-themes/qnxstyle/files/patch-src_Makefile.in @@ -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 + -- cgit