From 8698ef94d2762c64ec67beb2a84f1f1327bb6bdb Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 14 Feb 2006 23:35:15 +0000 Subject: [PATCH] fix installation of karboncommon --- x11/kde/office3/Makefile | 5 +++-- x11/kde/office3/patches/patch-karbon_Makefile_in | 12 ++++++++++++ x11/kde/office3/pkg/PLIST | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 x11/kde/office3/patches/patch-karbon_Makefile_in diff --git a/x11/kde/office3/Makefile b/x11/kde/office3/Makefile index a3ec8b0f5c7..d66d1957077 100644 --- a/x11/kde/office3/Makefile +++ b/x11/kde/office3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2006/01/13 22:49:56 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2006/02/14 23:35:15 espie Exp $ COMMENT= "office suite for KDE" @@ -7,8 +7,9 @@ VMEM_WARNING= Yes MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.2/src/@} DISTNAME= koffice-1.4.2 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 SHARED_LIBS= karbonbase 3.0 \ + karboncommon 1.0 \ kchartcommon 3.0 \ kdchart 1.0 \ kexicore 1.0 \ diff --git a/x11/kde/office3/patches/patch-karbon_Makefile_in b/x11/kde/office3/patches/patch-karbon_Makefile_in new file mode 100644 index 00000000000..b1370c7e62e --- /dev/null +++ b/x11/kde/office3/patches/patch-karbon_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-karbon_Makefile_in,v 1.1 2006/02/14 23:35:15 espie Exp $ +--- karbon/Makefile.in.orig Tue Feb 14 19:33:00 2006 ++++ karbon/Makefile.in Tue Feb 14 19:33:53 2006 +@@ -352,7 +352,7 @@ SUBDIRS = commands visitors core shapes + # -> I think the whole 'base' stuff can be removed (DF) + #>- lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la + #>+ 1 +-lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la libkdeinit_karbon.la ++lib_LTLIBRARIES = libkarbonbase.la libkarboncommon.la libkdeinit_karbon.la + kde_module_LTLIBRARIES = libkarbonpart.la + + #>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp diff --git a/x11/kde/office3/pkg/PLIST b/x11/kde/office3/pkg/PLIST index 338072a4900..2b3ae24e0ff 100644 --- a/x11/kde/office3/pkg/PLIST +++ b/x11/kde/office3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2006/01/06 12:07:27 espie Exp $ +@comment $OpenBSD: PLIST,v 1.18 2006/02/14 23:35:15 espie Exp $ bin/karbon bin/kchart bin/kexi @@ -452,6 +452,8 @@ ${KDE}/straight_connector.la ${KDE}/straight_connector.so lib/libkarbonbase.la @lib lib/libkarbonbase.so.${LIBkarbonbase_VERSION} +lib/libkarboncommon.la +@lib lib/libkarboncommon.so.${LIBkarboncommon_VERSION} lib/libkchartcommon.la @lib lib/libkchartcommon.so.${LIBkchartcommon_VERSION} lib/libkdchart.la