cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that espie's @pkgpath patch is in snapshots, merge -imlib2

Browse Source 
flavor into -main and link the -xmms2 flavor to the build.

OK sthen@, espie@
This commit is contained in:
dcoppa 2011-06-13 10:11:05 +00:00
parent 056c1a5ce7
commit 9f63150832
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/Makefile
View File

@ -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

21
sysutils/conky/Makefile
View File

@ -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

3
sysutils/conky/pkg/PLIST
View File

@ -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