From 9f631508321b9fff7638143d12454b2dd24d4033 Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Mon, 13 Jun 2011 10:11:05 +0000
Subject: [PATCH] Now that espie's @pkgpath patch is in snapshots, merge
 -imlib2 flavor into -main and link the -xmms2 flavor to the build.

OK sthen@, espie@
---
 sysutils/Makefile        |  6 +++---
 sysutils/conky/Makefile  | 21 +++++++++------------
 sysutils/conky/pkg/PLIST |  3 ++-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/sysutils/Makefile b/sysutils/Makefile
index d9b2d1081b2..0acdd254ff5 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.238 2011/06/12 00:20:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.239 2011/06/13 10:11:05 dcoppa Exp $
 # $FreeBSD: Makefile,v 1.26 1997/11/20 08:58:51 tg Exp $
 
      SUBDIR =
@@ -27,9 +27,9 @@
      SUBDIR += colortail
      SUBDIR += conky
      SUBDIR += conky,audacious
-     SUBDIR += conky,audacious,imlib2
-     SUBDIR += conky,imlib2
+     SUBDIR += conky,audacious,xmms2
      SUBDIR += conky,no_x11
+     SUBDIR += conky,xmms2
      SUBDIR += consolekit
      SUBDIR += contool
      SUBDIR += crashme
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 81a04c5c2ec..bb283221a8c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2011/04/28 10:31:16 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.23 2011/06/13 10:11:05 dcoppa Exp $
 
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
 COMMENT=	light-weight system monitor
 
 DISTNAME=	conky-1.8.1
-REVISION=	0
+REVISION=	1
 CATEGORIES=	sysutils
 HOMEPAGE=	http://conky.sourceforge.net/
 
@@ -32,11 +32,11 @@ LIB_DEPENDS=	devel/glib2 \
 
 USE_LIBTOOL=	Yes
 
-FLAVORS=	no_x11 audacious imlib2 xmms2
+FLAVORS=	no_x11 audacious xmms2
 FLAVOR?=
 
 .if ${FLAVOR:L:Mno_x11}
-.  if ${FLAVOR:L:Maudacious} || ${FLAVOR:L:Mimlib2} || ${FLAVOR:L:Mxmms2}
+.  if ${FLAVOR:L:Maudacious} || ${FLAVOR:L:Mxmms2}
 ERRORS+="Fatal: nonsense combination of flavors"
 .  else
 CONFIGURE_ARGS+=--disable-double-buffer \
@@ -46,8 +46,11 @@ CONFIGURE_ARGS+=--disable-double-buffer \
 		--disable-x11
 .  endif
 .else
-WANTLIB+=	X11 Xau Xdamage Xdmcp Xext Xfixes Xft Xrender \
-		expat fontconfig freetype pthread-stubs xcb
+CONFIGURE_ARGS+=--enable-imlib2
+LIB_DEPENDS+=	graphics/imlib2
+WANTLIB+=	Imlib2 X11 Xau Xdamage Xdmcp Xext Xfixes Xft \
+		Xrender expat fontconfig freetype \
+		pthread-stubs xcb
 .endif
 
 .if ${FLAVOR:L:Maudacious}
@@ -62,12 +65,6 @@ WANTLIB +=      GL Xcomposite Xcursor Xi Xinerama Xrandr Xxf86vm \
 		xcb-render xcb-shm
 .endif
 
-.if ${FLAVOR:L:Mimlib2}
-CONFIGURE_ARGS+=--enable-imlib2
-LIB_DEPENDS+=	graphics/imlib2
-WANTLIB+=	Imlib2
-.endif
-
 .if ${FLAVOR:L:Mxmms2}
 CONFIGURE_ARGS+=--enable-xmms2
 LIB_DEPENDS+=	audio/xmms2
diff --git a/sysutils/conky/pkg/PLIST b/sysutils/conky/pkg/PLIST
index d62105fca37..ad0be5ed29e 100644
--- a/sysutils/conky/pkg/PLIST
+++ b/sysutils/conky/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2011/04/28 10:31:16 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/06/13 10:11:05 dcoppa Exp $
+@pkgpath ${BASE_PKGPATH},imlib2
 @bin bin/conky
 lib/conky/
 @man man/man1/conky.1