ports/110330: kdeartwork and xscreensaver-kde does not find installed xscreensaver

[Palle Girgensohn]

>Number:         110330
>Category:       ports
>Synopsis:       kdeartwork and xscreensaver-kde does not find installed xscreensaver
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 11:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD rambutan.pingpong.net 6.2-RELEASE FreeBSD 6.2-RELEASE #2: Wed Jan 17 01:21:14 CET 2007 girgen at rambutan.pingpong.net:/usr/obj/.a/banan/usr/src/sys/WORKSTATION i386


	
>Description:
Hi,

it seems that kdeartwork and xscreensaver-kde look for xscreensaver
and xscreensaver-gnome stuff in X11BASE, but they are installed in
LOCALBASE nowadays. This leads to confusions with packages and portugprades.
	
>How-To-Repeat:
	
>Fix:
I believe this will fix it?

Index: x11-themes/kdeartwork3/Makefile
===================================================================
RCS file: /opt/ncvs/ports/x11-themes/kdeartwork3/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- x11-themes/kdeartwork3/Makefile	13 Mar 2007 19:10:48 -0000	1.47
+++ x11-themes/kdeartwork3/Makefile	15 Mar 2007 10:58:16 -0000
@@ -32,11 +32,11 @@
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/xscreensaver)
+.if exists(${LOCALBASE}/bin/xscreensaver)
 WITH_XS=	yes
 .endif # exists(${X11BASE}/bin/xscreensaver)
 
-.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
 WITH_XSGNOME=	yes
 .endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
 
Index: x11/xscreensaver-kde/Makefile
===================================================================
RCS file: /opt/ncvs/ports/x11/xscreensaver-kde/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- x11/xscreensaver-kde/Makefile	13 Mar 2007 19:10:48 -0000	1.23
+++ x11/xscreensaver-kde/Makefile	15 Mar 2007 10:50:57 -0000
@@ -33,9 +33,9 @@
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
 WITH_XSGNOME=	yes
-.elif exists(${X11BASE}/bin/screensaver)
+.elif exists(${LOCALBASE}/bin/screensaver)
 WITH_XSGNOME=	yes
 .else
 WITH_XS=	yes
>Release-Note:
>Audit-Trail:
>Unformatted: