Fix fallout of haskell ports, now that devel/gmp is no more a

dependency for ghc - x11 category
This commit is contained in:
dcoppa 2012-10-11 14:23:50 +00:00
parent b3a0259fd2
commit a041d87c07
3 changed files with 13 additions and 15 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2012/06/19 20:40:10 dcoppa Exp $
# $OpenBSD: Makefile,v 1.17 2012/10/11 14:23:50 dcoppa Exp $
COMMENT = modern tiling window manager
DISTNAME = bluetile-0.6
REVISION = 0
REVISION = 1
CATEGORIES = x11
HOMEPAGE = http://www.bluetile.org/
@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0
WANTLIB += glib-2.0 gmp gobject-2.0 gthread-2.0 gtk-x11-2.0 m
WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread pthread-stubs util xcb xcb-render xcb-shm xml2
WANTLIB += z
@ -34,8 +34,7 @@ BUILD_DEPENDS = devel/hs-ConfigFile \
x11/hs-xmonad-contrib>=0.10 \
x11/xmonad,-lib>=0.10
LIB_DEPENDS = devel/gmp \
devel/libglade2
LIB_DEPENDS = devel/libglade2
post-install:
${INSTALL_MAN} ${WRKSRC}/man/bluetile.1 ${PREFIX}/man/man1

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2012/10/02 10:27:56 dcoppa Exp $
# $OpenBSD: Makefile,v 1.16 2012/10/11 14:23:50 dcoppa Exp $
COMMENT = minimalistic text based status bar
DISTNAME = xmobar-0.15
REVISION = 0
REVISION = 1
CATEGORIES = x11
HOMEPAGE = http://projects.haskell.org/xmobar
@ -15,15 +15,14 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c gmp m pthread util X11 Xext Xft Xinerama Xrandr
WANTLIB = X11 Xext Xft Xinerama Xrandr c m pthread \
util
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd"
LIB_DEPENDS = devel/gmp
BUILD_DEPENDS = devel/hs-mtl \
devel/hs-parsec \
devel/hs-stm \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2012/06/19 20:40:10 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2012/10/11 14:23:50 dcoppa Exp $
COMMENT-main = tiling window manager
COMMENT-lib = libraries for runtime configuration
@ -6,7 +6,7 @@ COMMENT-lib = libraries for runtime configuration
DISTNAME = xmonad-0.10
PKGNAME-main = ${DISTNAME}
PKGNAME-lib = ${DISTNAME:S,-,-lib-,}
REVISION-main = 0
REVISION-main = 1
REVISION-lib = 0
CATEGORIES = x11
HOMEPAGE = http://www.xmonad.org/
@ -19,7 +19,8 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB-main = ${WANTLIB} X11 Xext Xinerama c gmp m pthread util
WANTLIB-main = ${WANTLIB} X11 Xext Xinerama Xrandr c m \
pthread util
WANTLIB-lib =
MODULES = lang/ghc converters/libiconv
@ -31,8 +32,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS-lib}
RUN_DEPENDS-lib = devel/hs-mtl \
devel/hs-syb \
x11/hs-X11>=1.5.0.0
LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/gmp
LIB_DEPENDS-main = ${LIB_DEPENDS}
# Instead of adding `nort' to MODGHC_BUILD for -main, explicitely set
# MODGHC_SETUP_CONF_ARGS and add lang/ghc to RUN_DEPENDS-lib.