Update to xmonad-0.9.1.
Needs a current portstree and the ghc update.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xmonad/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 19 Sep 2008 21:14:13 -0000 1.9
+++ Makefile 9 Apr 2010 20:51:31 -0000
@@ -1,76 +1,44 @@
# $OpenBSD: Makefile,v 1.9 2008/09/19 21:14:13 kili Exp $
-COMMENT-main= tiling window manager
-COMMENT-lib= libraries for runtime configuration
+COMMENT-main = tiling window manager
+COMMENT-lib = libraries for runtime configuration
-V= 0.7
-DISTNAME= xmonad-$V
-PKGNAME-main= xmonad-${V}p0
-PKGNAME-lib= xmonad-lib-${V}p0
-CATEGORIES= x11
-HOMEPAGE= http://www.xmonad.org/
+DISTNAME = xmonad-0.9.1
+PKGNAME-main = ${DISTNAME}
+PKGNAME-lib = ${DISTNAME:S,-,-lib-,}
+CATEGORIES = x11
+HOMEPAGE = http://www.xmonad.org/
+
+MULTI_PACKAGES = -main -lib
+
+# BSD3
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
-MULTI_PACKAGES= -main -lib
+WANTLIB-main = X11 Xext Xinerama c m pthread util
-# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/$V/
-
-WANTLIB-main= X11 Xext Xinerama c m
-
-MODULES= lang/ghc
+MODULES = lang/ghc converters/libiconv
+MODGHC_BUILD = cabal hackage register
.if defined (SUBPACKAGE) && ${SUBPACKAGE:M-main}
-MODGHC_RUNTIME= No
+MODGHC_BUILD += nort
.endif
-BUILD_DEPENDS= :hs-x11-extras->=0.4:x11/hs-x11-extras
-LIB_DEPENDS= gmp::devel/gmp
-LIB_DEPENDS-lib=
-RUN_DEPENDS-lib= :hs-x11-extras->=0.4:x11/hs-x11-extras
-
-SETUP_CONF_ARGS= configure -g --prefix=${PREFIX}
-SETUP_CONF_ENV= HOME=${PORTHOME} PATH=${PATH}
-SETUP_PROG= ${WRKSRC}/Setup
-SUBST_VARS= V
-
-USE_X11= Yes
-
-do-configure:
- @cd ${WRKSRC} && ghc --make -o ${SETUP_PROG} Setup.lhs
- @cd ${WRKBUILD} && exec ${SETENV} ${SETUP_CONF_ENV} \
- ${SETUP_PROG} ${SETUP_CONF_ARGS}
-
-do-build:
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${SETUP_PROG} build
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${SETUP_PROG} register --gen-script
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${SETUP_PROG} unregister --gen-script
- perl -pi -e 's!/share/${DISTNAME}/doc/html!/share/doc/${DISTNAME}!' \
- ${WRKBUILD}/register.sh
-
-do-install:
- @cd ${WRKBUILD} && exec ${SETENV} ${SETUP_CONF_ENV} \
- ${SETUP_PROG} copy --destdir=${DESTDIR}
+BUILD_DEPENDS = :hs-X11->=1.5.0.0:x11/hs-X11
+LIB_DEPENDS-lib = :hs-X11->=1.5.0.0:x11/hs-X11
+
+USE_X11 = Yes
+
+post-install:
@${INSTALL_MAN_DIR} ${PREFIX}/man/man1
@${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${PREFIX}/man/man1
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmonad
@${INSTALL_DATA} ${WRKSRC}/CONFIG ${PREFIX}/share/doc/xmonad
@${INSTALL_DATA} ${WRKSRC}/man/xmonad.hs ${PREFIX}/share/doc/xmonad
-post-install:
-.for f in register.sh unregister.sh
- ${INSTALL_SCRIPT} ${WRKBUILD}/$f ${PREFIX}/lib/${DISTNAME}
-.endfor
-
-do-regress:
- @cd ${WRKBUILD} && exec ${SETENV} ${SETUP_CONF_ENV} \
- ${SETUP_PROG} test
+# Needs to be built with different configuration.
+NO_REGRESS = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xmonad/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 16 Apr 2008 21:00:56 -0000 1.7
+++ distinfo 9 Apr 2010 20:51:31 -0000
@@ -1,5 +1,5 @@
-MD5 (xmonad-0.7.tar.gz) = +eJfMQy6FdlunfStl+FWuA==
-RMD160 (xmonad-0.7.tar.gz) = eQ+M56OXX8OFomdwajwZ/ewfPDI=
-SHA1 (xmonad-0.7.tar.gz) = zz+3ZiySytuep7/ckWu+XMWHrIY=
-SHA256 (xmonad-0.7.tar.gz) = 1e4zjrbQaACC4g6q+gsjsyNY//5p4uxK17324Dx1HWc=
-SIZE (xmonad-0.7.tar.gz) = 52740
+MD5 (xmonad-0.9.1.tar.gz) = PQ3Vz3d2ixDht/OkfjKwng==
+RMD160 (xmonad-0.9.1.tar.gz) = u7So2QntMviN1POHGhm52FiSOF4=
+SHA1 (xmonad-0.9.1.tar.gz) = CrYS91PJdCDpKQXQqAD9Ki5agko=
+SHA256 (xmonad-0.9.1.tar.gz) = AUIBIA6KUh7joNjAcnOSkWp1SSB7kQZPtFb4xmBgmSc=
+SIZE (xmonad-0.9.1.tar.gz) = 56974
Index: patches/patch-XMonad_Operations_hs
===================================================================
RCS file: patches/patch-XMonad_Operations_hs
diff -N patches/patch-XMonad_Operations_hs
--- patches/patch-XMonad_Operations_hs 16 Apr 2008 21:00:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-XMonad_Operations_hs,v 1.3 2008/04/16 21:00:56 kili Exp $
-
-Backport for ghc-6.6 and X11-extras.
-
---- XMonad/Operations.hs.orig Sat Mar 29 21:59:44 2008
-+++ XMonad/Operations.hs Mon Mar 31 23:05:12 2008
-@@ -172,7 +172,7 @@ windows f = do
- -- all windows that are no longer in the windowset are marked as
- -- withdrawn, it is important to do this after the above, otherwise 'hide'
- -- will overwrite withdrawnState with iconicState
-- mapM_ (flip setWMState withdrawnState) (W.allWindows old \\ W.allWindows
ws)
-+ mapM_ (flip setWMState 0) (W.allWindows old \\ W.allWindows ws)
-
- clearEvents enterWindowMask
-
-@@ -188,7 +188,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
- io $ do selectInput d w (clientMask .&. complement structureNotifyMask)
- unmapWindow d w
- selectInput d w clientMask
-- setWMState w iconicState
-+ setWMState w 3
- -- this part is key: we increment the waitingUnmap counter to distinguish
- -- between client and xmonad initiated unmaps.
- modify (\s -> s { waitingUnmap = M.insertWith (+) w 1 (waitingUnmap s)
-@@ -198,7 +198,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
- -- this is harmless if the window was already visible
- reveal :: Window -> X ()
- reveal w = withDisplay $ \d -> do
-- setWMState w normalState
-+ setWMState w 1
- io $ mapWindow d w
- modify (\s -> s { mapped = S.insert w (mapped s) })
-
-@@ -209,7 +209,7 @@ clientMask = structureNotifyMask .|. enterWindowMask .
- -- | Set some properties when we initially gain control of a window
- setInitialProperties :: Window -> X ()
- setInitialProperties w = asks normalBorder >>= \nb -> withDisplay $ \d -> do
-- setWMState w iconicState
-+ setWMState w 3
- io $ selectInput d w $ clientMask
- bw <- asks (borderWidth . config)
- io $ setWindowBorderWidth d w bw
Index: patches/patch-xmonad_cabal
===================================================================
RCS file: patches/patch-xmonad_cabal
diff -N patches/patch-xmonad_cabal
--- patches/patch-xmonad_cabal 16 Apr 2008 21:00:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-$OpenBSD: patch-xmonad_cabal,v 1.3 2008/04/16 21:00:56 kili Exp $
---- xmonad.cabal.orig Sat Mar 29 21:59:44 2008
-+++ xmonad.cabal Mon Mar 31 23:12:04 2008
-@@ -20,58 +20,29 @@ maintainer: xmo...@haskell.org
- extra-source-files: README TODO CONFIG STYLE tests/loc.hs tests/Properties.hs
- man/xmonad.1.in man/xmonad.1 man/xmonad.html man/xmonad.hs
- util/GenerateManpage.hs
--cabal-version: >= 1.2
--build-type: Simple
-+build-depends: base < 3, X11>=1.2.1, X11-extras>=0.4, mtl, unix
-+exposed-modules: XMonad
-+ XMonad.Main
-+ XMonad.Core
-+ XMonad.Config
-+ XMonad.Layout
-+ XMonad.ManageHook
-+ XMonad.Operations
-+ XMonad.StackSet
-+ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
-+ghc-prof-options: -prof -auto-all
-+extensions: CPP
-
--flag small_base
-- description: Choose the new smaller, split-up base package.
--
--flag testing
-- description: Testing mode, only build minimal components
-- default: False
--
--library
-- exposed-modules: XMonad
-- XMonad.Main
-- XMonad.Core
-- XMonad.Config
-- XMonad.Layout
-- XMonad.ManageHook
-- XMonad.Operations
-- XMonad.StackSet
--
-- if flag(small_base)
-- build-depends: base >= 3, containers, directory, process
-- else
-- build-depends: base < 3
-- build-depends: X11>=1.4.1, mtl, unix
--
-- ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
-- ghc-prof-options: -prof -auto-all
-- extensions: CPP
--
-- if flag(testing)
-- buildable: False
--
--executable xmonad
-- main-is: Main.hs
-- other-modules: XMonad
-- XMonad.Main
-- XMonad.Core
-- XMonad.Config
-- XMonad.Layout
-- XMonad.ManageHook
-- XMonad.Operations
-- XMonad.StackSet
--
-- ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
-- ghc-prof-options: -prof -auto-all
-- extensions: CPP
--
-- if flag(testing)
-- cpp-options: -DTESTING
-- hs-source-dirs: . tests/
-- build-depends: QuickCheck < 2
-- ghc-options: -Werror
-- if flag(testing) && flag(small_base)
-- build-depends: random
-+executable: xmonad
-+main-is: Main.hs
-+other-modules: XMonad
-+ XMonad.Main
-+ XMonad.Core
-+ XMonad.Config
-+ XMonad.Layout
-+ XMonad.ManageHook
-+ XMonad.Operations
-+ XMonad.StackSet
-+ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
-+ghc-prof-options: -prof -auto-all
-+extensions: CPP
Index: pkg/PLIST-lib
===================================================================
RCS file: /cvs/ports/x11/xmonad/pkg/PLIST-lib,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-lib
--- pkg/PLIST-lib 18 Jan 2008 21:51:13 -0000 1.1
+++ pkg/PLIST-lib 9 Apr 2010 20:51:31 -0000
@@ -1,22 +1,21 @@
@comment $OpenBSD: PLIST-lib,v 1.1 2008/01/18 21:51:13 kili Exp $
-lib/xmonad-${V}/
-lib/xmonad-${V}/ghc-6.6.1/
-lib/xmonad-${V}/ghc-6.6.1/HSxmonad-${V}.o
-lib/xmonad-${V}/ghc-6.6.1/XMonad/
-lib/xmonad-${V}/ghc-6.6.1/XMonad.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/Config.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/Core.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/Layout.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/Main.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/ManageHook.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/Operations.hi
-lib/xmonad-${V}/ghc-6.6.1/XMonad/StackSet.hi
-lib/xmonad-${V}/ghc-6.6.1/include/
-lib/xmonad-${V}/ghc-6.6.1/libHSxmonad-${V}.a
-lib/xmonad-${V}/register.sh
-...@exec /usr/bin/env HOME=/nonexistent %D/lib/xmonad-${V}/register.sh
-...@unexec /usr/bin/env HOME=/nonexistent %D/lib/xmonad-${V}/unregister.sh
-lib/xmonad-${V}/unregister.sh
+lib/${DISTNAME}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HS${DISTNAME}.o
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Config.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Core.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Layout.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Main.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/ManageHook.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Operations.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/StackSet.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/libHS${DISTNAME}.a
+lib/${DISTNAME}/register.sh
+...@exec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/register.sh
+...@unexec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/unregister.sh
+lib/${DISTNAME}/unregister.sh
share/doc/xmonad/
share/doc/xmonad/CONFIG
share/doc/xmonad/xmonad.hs
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/xmonad/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 18 Jan 2008 21:51:13 -0000 1.1
+++ pkg/PLIST-main 9 Apr 2010 20:51:31 -0000
@@ -1,4 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.1 2008/01/18 21:51:13 kili Exp $
@pkgpath x11/xmonad
-bin/xmonad
+...@bin bin/xmonad
@man man/man1/xmonad.1
+...@comment share/doc/${DISTNAME}/
+...@comment share/doc/${DISTNAME}/LICENSE
+...@comment share/${DISTNAME}/
+...@comment share/${DISTNAME}/man/
+...@comment share/${DISTNAME}/man/xmonad.hs
