From d412916b3b214f6a5ecf36824bf8b78fbbaf257b Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 23 Apr 2001 21:16:52 +0000 Subject: [PATCH] - USE_MOTIF sneaked in from kdebase2... No need for it. - pixie plugins depend on dlopen recursively grabbing libraries... doesn't work for us, so link the plugins with the library. --- x11/kde/graphics2/Makefile | 3 +-- .../patch-pixie_plugins_magick_Makefile_in | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 x11/kde/graphics2/patches/patch-pixie_plugins_magick_Makefile_in diff --git a/x11/kde/graphics2/Makefile b/x11/kde/graphics2/Makefile index b88cab9a898..e20864baa14 100644 --- a/x11/kde/graphics2/Makefile +++ b/x11/kde/graphics2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/04/22 16:33:16 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2001/04/23 21:16:52 espie Exp $ COMMENT= "X11 toolkit, graphics applications" CATEGORIES= x11 x11/kde @@ -12,7 +12,6 @@ MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${VERSION}/distribution/tar/generic/src/ EXTRACT_SUFX= .tar.bz2 -USE_MOTIF= any LIB_DEPENDS= kdecore.3.::x11/kde/libs2 BUILD_DEPENDS= uic::x11/qt2-designer diff --git a/x11/kde/graphics2/patches/patch-pixie_plugins_magick_Makefile_in b/x11/kde/graphics2/patches/patch-pixie_plugins_magick_Makefile_in new file mode 100644 index 00000000000..43c954258f6 --- /dev/null +++ b/x11/kde/graphics2/patches/patch-pixie_plugins_magick_Makefile_in @@ -0,0 +1,19 @@ +$OpenBSD: patch-pixie_plugins_magick_Makefile_in,v 1.1 2001/04/23 21:16:53 espie Exp $ +--- pixie/plugins/magick/Makefile.in.orig Mon Apr 23 20:47:47 2001 ++++ pixie/plugins/magick/Makefile.in Mon Apr 23 20:48:57 2001 +@@ -231,13 +231,12 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../../.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libkif_magick_la_DEPENDENCIES = ../../../libminimagick/libminimagick.la \ +-../../libifplugin/libkifplugin.la ++libkif_magick_la_DEPENDENCIES = ../../../libminimagick/libminimagick.la + #>- libkif_magick_la_OBJECTS = dialog.lo magick.lo + #>+ 4 + libkif_magick_la_final_OBJECTS = libkif_magick_la.all_cpp.lo + libkif_magick_la_nofinal_OBJECTS = dialog.lo magick.lo +-@KDE_USE_FINAL_FALSE@libkif_magick_la_OBJECTS = $(libkif_magick_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_FALSE@libkif_magick_la_OBJECTS = $(libkif_magick_la_nofinal_OBJECTS) ../../libifplugin/ifplugin.lo + @KDE_USE_FINAL_TRUE@libkif_magick_la_OBJECTS = $(libkif_magick_la_final_OBJECTS) + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)