aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorAlejandro Pulver <alepulver@FreeBSD.org>2008-02-20 01:10:09 +0000
committerAlejandro Pulver <alepulver@FreeBSD.org>2008-02-20 01:10:09 +0000
commit6e7e9d90ea90c985b6348610fc7b3f0d1da3da3d (patch)
tree686faa734eff9192c26bc235fcb3fb82ecb0eb2f /x11-wm
parent9a61bb114c46d49621329e959f038db3aaa08225 (diff)
downloadports-6e7e9d90ea90c985b6348610fc7b3f0d1da3da3d.tar.gz
ports-6e7e9d90ea90c985b6348610fc7b3f0d1da3da3d.zip
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/hs-xmonad/Makefile27
-rw-r--r--x11-wm/hs-xmonad/distinfo6
-rw-r--r--x11-wm/hs-xmonad/pkg-plist21
-rw-r--r--x11-wm/xmonad/Makefile27
-rw-r--r--x11-wm/xmonad/distinfo6
-rw-r--r--x11-wm/xmonad/pkg-plist21
6 files changed, 74 insertions, 34 deletions
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index d5f5b73ae58c..2fd9c6814bc5 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -6,37 +6,36 @@
#
PORTNAME= xmonad
-PORTVERSION= 0.4
+PORTVERSION= 0.6
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
MAINTAINER= matt.guegan@free.fr
COMMENT= Xmonad is a minimalist and tiling window manager for X
+BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
+ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
+LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
+
USE_XLIB= yes
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
+GHC_VERSION= 6.8.2
+SUBDIR= lib/${PORTNAME}-${PORTVERSION}
+PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
+ SUBDIR=${SUBDIR}
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-x11-extras-ghc>=0.4:${PORTSDIR}/x11/hs-x11-extras-ghc
-LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
-
-PLIST_FILES= bin/xmonad
-PORTDOCS= LICENSE
MAN1= xmonad.1
do-configure:
cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
do-build:
- cd ${WRKSRC} && ${CABALCMD} build
+ cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
do-install:
- @cd ${WRKSRC} && ${CABALCMD} install
+ cd ${WRKSRC} && ${CABALCMD} install
${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index 3d7ece96fc6d..59766261fef7 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-0.4.tar.gz) = 5d24c556f7c8f04954721b391fd79a13
-SHA256 (xmonad-0.4.tar.gz) = 978fb99e40786070307992fde78fe252b96e834740fb983b94c3a395c45467bb
-SIZE (xmonad-0.4.tar.gz) = 41025
+MD5 (xmonad-0.6.tar.gz) = 5e431d5e13cfb5cbcde2f5a3f813796a
+SHA256 (xmonad-0.6.tar.gz) = e107c5dbc659b2342e0e736d9baee0ee88a1404fa5161481b1924f23d3367c21
+SIZE (xmonad-0.6.tar.gz) = 49635
diff --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist
new file mode 100644
index 000000000000..f42eafea264b
--- /dev/null
+++ b/x11-wm/hs-xmonad/pkg-plist
@@ -0,0 +1,21 @@
+bin/xmonad
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-0.6.o
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-0.6.a
+%%SUBDIR%%/register.sh
+share/doc/xmonad-0.6/LICENSE
+@dirrm share/doc/xmonad-0.6
+@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
+@dirrm lib/xmonad-0.6
+@exec /bin/sh %D/%%SUBDIR%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister xmonad
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
index d5f5b73ae58c..2fd9c6814bc5 100644
--- a/x11-wm/xmonad/Makefile
+++ b/x11-wm/xmonad/Makefile
@@ -6,37 +6,36 @@
#
PORTNAME= xmonad
-PORTVERSION= 0.4
+PORTVERSION= 0.6
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
MAINTAINER= matt.guegan@free.fr
COMMENT= Xmonad is a minimalist and tiling window manager for X
+BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
+ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
+LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
+
USE_XLIB= yes
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
+GHC_VERSION= 6.8.2
+SUBDIR= lib/${PORTNAME}-${PORTVERSION}
+PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
+ SUBDIR=${SUBDIR}
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-x11-extras-ghc>=0.4:${PORTSDIR}/x11/hs-x11-extras-ghc
-LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
-
-PLIST_FILES= bin/xmonad
-PORTDOCS= LICENSE
MAN1= xmonad.1
do-configure:
cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
do-build:
- cd ${WRKSRC} && ${CABALCMD} build
+ cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
do-install:
- @cd ${WRKSRC} && ${CABALCMD} install
+ cd ${WRKSRC} && ${CABALCMD} install
${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/xmonad/distinfo b/x11-wm/xmonad/distinfo
index 3d7ece96fc6d..59766261fef7 100644
--- a/x11-wm/xmonad/distinfo
+++ b/x11-wm/xmonad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-0.4.tar.gz) = 5d24c556f7c8f04954721b391fd79a13
-SHA256 (xmonad-0.4.tar.gz) = 978fb99e40786070307992fde78fe252b96e834740fb983b94c3a395c45467bb
-SIZE (xmonad-0.4.tar.gz) = 41025
+MD5 (xmonad-0.6.tar.gz) = 5e431d5e13cfb5cbcde2f5a3f813796a
+SHA256 (xmonad-0.6.tar.gz) = e107c5dbc659b2342e0e736d9baee0ee88a1404fa5161481b1924f23d3367c21
+SIZE (xmonad-0.6.tar.gz) = 49635
diff --git a/x11-wm/xmonad/pkg-plist b/x11-wm/xmonad/pkg-plist
new file mode 100644
index 000000000000..f42eafea264b
--- /dev/null
+++ b/x11-wm/xmonad/pkg-plist
@@ -0,0 +1,21 @@
+bin/xmonad
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-0.6.o
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-0.6.a
+%%SUBDIR%%/register.sh
+share/doc/xmonad-0.6/LICENSE
+@dirrm share/doc/xmonad-0.6
+@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
+@dirrm lib/xmonad-0.6
+@exec /bin/sh %D/%%SUBDIR%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister xmonad
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old