ports/126643: x11-themes/kdeartwork4: resolve conflicts

[Dima Panov]

>Number:         126643
>Category:       ports
>Synopsis:       x11-themes/kdeartwork4: resolve conflicts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 19 01:30:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dima Panov
>Release:        FreeBSD 8.0-800043-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-800043-CURRENT #0: Sat Aug 16 19:27:03 VLAST 2008
    root at Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot



>Description:


x11-themes/kdeartwork4 don't check which variant of xscreensaver we are hale installed  => leads to conflict



>How-To-Repeat:


install x11/xscreensaver-gnome
try to install kdeartwork4


>Fix:


resolve conflict as it done for kde3.

--- x11-themes::kdeartwork4.diff begins here ---
Index: x11-themes/kdeartwork4/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/kdeartwork4/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- x11-themes/kdeartwork4/Makefile	9 Aug 2008 16:52:28 -0000	1.55
+++ x11-themes/kdeartwork4/Makefile	19 Aug 2008 01:07:33 -0000
@@ -14,9 +14,6 @@
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE Artworks Themes
 
-BUILD_DEPENDS=	xscreensaver:${PORTSDIR}/x11/xscreensaver
-RUN_DEPENDS=	xscreensaver:${PORTSDIR}/x11/xscreensaver
-
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
@@ -25,6 +22,26 @@
 KDE4_BUILDENV=	yes
 QT_COMPONENTS=	opengl gui moc rcc uic svg qt3support
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/share/applications/xscreensaver-properties.desktop)
+WITH_XSGNOME=	yes
+.elif exists(${LOCALBASE}/bin/screensaver)
+WITH_XSGNOME=	yes
+.else
+WITH_XS=	yes
+.endif
+
+.if defined(WITH_XS) && !defined(WITH_XSGNOME)
+BUILD_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
+RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
+.endif # defined(WITH_XS)
+
+.if defined(WITH_XSGNOME)
+BUILD_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+.endif # defined(WITH_XSGNOME)
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
@@ -57,4 +74,4 @@
 	    ${WRKSRC}/../${item}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- x11-themes::kdeartwork4.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: