diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2005-03-21 13:04:04 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2005-03-21 13:04:04 +0000 |
| commit | 3b4c7b7c16bbf4ccabb1375eb5ce9a41ed9999a8 (patch) | |
| tree | 3d862f695f4a67a09215bcd591b285cf43e381ea /x11/kdebase4 | |
| parent | Add kompmgr, a utility need to enable XComposite support in KDE. (diff) | |
Disable building kompmgr, instead RUN_DEPEND on it if xorg is installed.
Fixes kdebase3's pkg-plist and kwin's XComposite support.
Notes
Notes:
svn path=/head/; revision=131831
Diffstat (limited to 'x11/kdebase4')
| -rw-r--r-- | x11/kdebase4/Makefile | 5 | ||||
| -rw-r--r-- | x11/kdebase4/files/patch-kwin_Makefile.in | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 4679a2d4d220..5b2a36ee762e 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -50,6 +51,10 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} == xorg +RUN_DEPENDS= kompmgr:${PORTSDIR}/x11-wm/kompmgr +.endif + .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif diff --git a/x11/kdebase4/files/patch-kwin_Makefile.in b/x11/kdebase4/files/patch-kwin_Makefile.in new file mode 100644 index 000000000000..866922634d9d --- /dev/null +++ b/x11/kdebase4/files/patch-kwin_Makefile.in @@ -0,0 +1,11 @@ +--- kwin/Makefile.in.orig Mon Mar 21 13:23:39 2005 ++++ kwin/Makefile.in Mon Mar 21 13:23:53 2005 +@@ -605,7 +605,7 @@ + xdg_menudir = @xdg_menudir@ + INCLUDES = -I$(srcdir)/lib $(all_includes) + @include_kompmgr_TRUE@KOMPMGR = kompmgr +-SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR) ++SUBDIRS = lib . killer kcmkwin pics clients oldheaders data + #>- lib_LTLIBRARIES = + #>+ 1 + lib_LTLIBRARIES = libkdeinit_kwin.la |