diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdebase3/Makefile | 20 | ||||
-rw-r--r-- | x11/kdebase3/PLIST | 20 | ||||
-rw-r--r-- | x11/kdebase3/buildlink3.mk | 6 |
3 files changed, 20 insertions, 26 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 6ba3e5740f6..063c4c42f30 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2004/11/01 16:35:59 gavan Exp $ +# $NetBSD: Makefile,v 1.63 2004/11/08 12:50:18 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop @@ -63,20 +64,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase PKG_SUPPORTED_OPTIONS= samba .include "../../mk/bsd.options.mk" -.if exists(${X11BASE}/include/X11/extensions/Xrandr.h) -HAVE_RANDR!= ${GREP} XRRSetScreenConfigAndRate ${X11BASE}/include/X11/extensions/Xrandr.h; ${ECHO} -.endif -.if defined(HAVE_RANDR) && !empty(HAVE_RANDR) -PLIST_SUBST+= HAVE_RANDR="" -.else -PLIST_SUBST+= HAVE_RANDR="@comment " -.endif - -.if exists(${X11BASE}/lib/libXcursor.so) -PLIST_SUBST+= HAVE_XCURSOR="" -.else -PLIST_SUBST+= HAVE_XCURSOR="@comment " -.endif +BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 .if !empty(PKG_OPTIONS:Msamba) .include "../../net/samba/buildlink3.mk" @@ -139,6 +127,8 @@ post-install: .include "../../databases/openldap/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/xcursor/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index d2a962545ec..232c740c755 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2004/10/13 11:54:11 markd Exp $ +@comment $NetBSD: PLIST,v 1.25 2004/11/08 12:50:18 markd Exp $ bin/appletproxy bin/drkonqi bin/extensionproxy @@ -49,8 +49,8 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss -${HAVE_RANDR}bin/krandrinithack -${HAVE_RANDR}bin/krandrtray +bin/krandrinithack +bin/krandrtray bin/krdb bin/kreadconfig bin/krootimage @@ -141,7 +141,7 @@ lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/childpanel_panelextension.la lib/kde3/clock_panelapplet.la -${HAVE_XCURSOR}lib/kde3/cursorthumbnail.la +lib/kde3/cursorthumbnail.la lib/kde3/djvuthumbnail.la lib/kde3/dockbar_panelextension.la lib/kde3/extensionproxy.la @@ -196,7 +196,7 @@ lib/kde3/kcm_nsplugins.la lib/kde3/kcm_performance.la lib/kde3/kcm_printmgr.la lib/kde3/kcm_privacy.la -${HAVE_RANDR}lib/kde3/kcm_randr.la +lib/kde3/kcm_randr.la lib/kde3/kcm_samba.la lib/kde3/kcm_screensaver.la lib/kde3/kcm_smserver.la @@ -267,7 +267,7 @@ lib/kde3/konqsidebar_web.la lib/kde3/konqueror.la lib/kde3/konsole.la lib/kde3/kprinter.la -${HAVE_RANDR}lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.la lib/kde3/ksmserver.la lib/kde3/ksplashdefault.la lib/kde3/ksplashredmond.la @@ -336,7 +336,7 @@ lib/libkdeinit_kmenuedit.la lib/libkdeinit_konqueror.la lib/libkdeinit_konsole.la lib/libkdeinit_kprinter.la -${HAVE_RANDR}lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.la lib/libkdeinit_ksmserver.la lib/libkdeinit_kwin.la lib/libkdeinit_kwin_rules_dialog.la @@ -418,7 +418,7 @@ share/applications/kde/konsole.desktop share/applications/kde/konsolesu.desktop share/applications/kde/kpager.desktop share/applications/kde/kpersonalizer.desktop -${HAVE_RANDR}share/applications/kde/krandrtray.desktop +share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop share/applications/kde/kthememanager.desktop @@ -993,7 +993,7 @@ share/kde/applnk/.hidden/kwinfocus.desktop share/kde/applnk/.hidden/kwinmoving.desktop share/kde/applnk/.hidden/passwords.desktop share/kde/applnk/.hidden/power.desktop -${HAVE_RANDR}share/kde/applnk/.hidden/randr.desktop +share/kde/applnk/.hidden/randr.desktop share/kde/applnk/.hidden/smb.desktop share/kde/applnk/.hidden/socks.desktop share/kde/applnk/.hidden/userinfo.desktop @@ -3211,7 +3211,7 @@ share/kde/services/ar.protocol share/kde/services/bzip.protocol share/kde/services/bzip2.protocol share/kde/services/cgi.protocol -${HAVE_XCURSOR}share/kde/services/cursorthumbnail.desktop +share/kde/services/cursorthumbnail.desktop share/kde/services/djvuthumbnail.desktop share/kde/services/finger.protocol share/kde/services/fish.protocol diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index a562f41f1a2..49dc6ade8e7 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:36 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/11/08 12:50:18 markd Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -16,9 +16,13 @@ BUILDLINK_RECOMMENDED.kdebase?= kdebase>=3.3.0nb1 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 .endif # KDEBASE_BUILDLINK3_MK +BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 + .include "../../databases/openldap/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/xcursor/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |