Index: head/x11/hs-X11/Makefile =================================================================== --- head/x11/hs-X11/Makefile (revision 226637) +++ head/x11/hs-X11/Makefile (revision 226638) @@ -1,53 +1,61 @@ # New ports collection makefile for: hs-x11-ghc # Date created: 2007-09-03 # Whom: Volker Stolz # # $FreeBSD$ PORTNAME= x11 PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/ PKGNAMEPREFIX= hs- PKGNAMESUFFIX= -ghc DISTNAME= X11-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org COMMENT= X11 bindings for Haskell programs # include the version verbatim. This will require a revision bump # on updates, but the correct quoting of `ghc --numeric-version` in the various # places is a real nightmare. GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ PORTNAME=${PORTNAME} \ SUBDIR=lib/ghc-${GHC_VERSION}/cabal .include BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc USE_XORG= x11 xext sm # 'owned' by lang/ghc: CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs +DOCSDIR= ${PREFIX}/share/doc/X11-${PORTVERSION} SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ --libsubdir='' --datasubdir='' do-build: cd ${WRKSRC} && ${CABALCMD} build \ && ${CABALCMD} --gen-script register +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install \ && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh .include Property changes on: head/x11/hs-X11/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/x11/hs-X11/pkg-plist =================================================================== --- head/x11/hs-X11/pkg-plist (revision 226637) +++ head/x11/hs-X11/pkg-plist (revision 226638) @@ -1,32 +1,58 @@ +%%SUBDIR%%/Graphics/X11.hi +%%SUBDIR%%/Graphics/X11/Types.hi %%SUBDIR%%/Graphics/X11/Xinerama.hi -%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi -%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/Graphics/X11/Xlib.hi %%SUBDIR%%/Graphics/X11/Xlib/Atom.hi %%SUBDIR%%/Graphics/X11/Xlib/Color.hi %%SUBDIR%%/Graphics/X11/Xlib/Context.hi %%SUBDIR%%/Graphics/X11/Xlib/Display.hi %%SUBDIR%%/Graphics/X11/Xlib/Event.hi +%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi %%SUBDIR%%/Graphics/X11/Xlib/Font.hi +%%SUBDIR%%/Graphics/X11/Xlib/Image.hi %%SUBDIR%%/Graphics/X11/Xlib/Misc.hi %%SUBDIR%%/Graphics/X11/Xlib/Region.hi %%SUBDIR%%/Graphics/X11/Xlib/Screen.hi %%SUBDIR%%/Graphics/X11/Xlib/Types.hi %%SUBDIR%%/Graphics/X11/Xlib/Window.hi -%%SUBDIR%%/Graphics/X11/Xlib/Image.hi -%%SUBDIR%%/Graphics/X11/Types.hi -%%SUBDIR%%/Graphics/X11/Xlib.hi -%%SUBDIR%%/Graphics/X11.hi -%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/HSX11-%%PORTVERSION%%.o %%SUBDIR%%/include/HsXlib.h +%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/%%PORTNAME%%-register.sh -share/doc/X11-1.4.1/LICENSE -@dirrm share/doc/X11-1.4.1 +%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xinerama.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Atom.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Color.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Context.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Display.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Event.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Extras.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Font.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Image.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Misc.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Region.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Screen.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Window.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11.html +%%PORTDOCS%%%%DOCSDIR%%/html/X11.haddock +%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html +%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js +%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css +%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif +%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% +@dirrmtry %%SUBDIR%%/include @dirrm %%SUBDIR%%/Graphics/X11/Xlib @dirrm %%SUBDIR%%/Graphics/X11 @dirrmtry %%SUBDIR%%/Graphics -@dirrmtry %%SUBDIR%%/include @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister X11 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old Property changes on: head/x11/hs-X11/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11/hs-x11-ghc/Makefile =================================================================== --- head/x11/hs-x11-ghc/Makefile (revision 226637) +++ head/x11/hs-x11-ghc/Makefile (revision 226638) @@ -1,53 +1,61 @@ # New ports collection makefile for: hs-x11-ghc # Date created: 2007-09-03 # Whom: Volker Stolz # # $FreeBSD$ PORTNAME= x11 PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/ PKGNAMEPREFIX= hs- PKGNAMESUFFIX= -ghc DISTNAME= X11-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org COMMENT= X11 bindings for Haskell programs # include the version verbatim. This will require a revision bump # on updates, but the correct quoting of `ghc --numeric-version` in the various # places is a real nightmare. GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ PORTNAME=${PORTNAME} \ SUBDIR=lib/ghc-${GHC_VERSION}/cabal .include BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc USE_XORG= x11 xext sm # 'owned' by lang/ghc: CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs +DOCSDIR= ${PREFIX}/share/doc/X11-${PORTVERSION} SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ --libsubdir='' --datasubdir='' do-build: cd ${WRKSRC} && ${CABALCMD} build \ && ${CABALCMD} --gen-script register +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install \ && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh .include Property changes on: head/x11/hs-x11-ghc/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/x11/hs-x11-ghc/pkg-plist =================================================================== --- head/x11/hs-x11-ghc/pkg-plist (revision 226637) +++ head/x11/hs-x11-ghc/pkg-plist (revision 226638) @@ -1,32 +1,58 @@ +%%SUBDIR%%/Graphics/X11.hi +%%SUBDIR%%/Graphics/X11/Types.hi %%SUBDIR%%/Graphics/X11/Xinerama.hi -%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi -%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/Graphics/X11/Xlib.hi %%SUBDIR%%/Graphics/X11/Xlib/Atom.hi %%SUBDIR%%/Graphics/X11/Xlib/Color.hi %%SUBDIR%%/Graphics/X11/Xlib/Context.hi %%SUBDIR%%/Graphics/X11/Xlib/Display.hi %%SUBDIR%%/Graphics/X11/Xlib/Event.hi +%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi %%SUBDIR%%/Graphics/X11/Xlib/Font.hi +%%SUBDIR%%/Graphics/X11/Xlib/Image.hi %%SUBDIR%%/Graphics/X11/Xlib/Misc.hi %%SUBDIR%%/Graphics/X11/Xlib/Region.hi %%SUBDIR%%/Graphics/X11/Xlib/Screen.hi %%SUBDIR%%/Graphics/X11/Xlib/Types.hi %%SUBDIR%%/Graphics/X11/Xlib/Window.hi -%%SUBDIR%%/Graphics/X11/Xlib/Image.hi -%%SUBDIR%%/Graphics/X11/Types.hi -%%SUBDIR%%/Graphics/X11/Xlib.hi -%%SUBDIR%%/Graphics/X11.hi -%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/HSX11-%%PORTVERSION%%.o %%SUBDIR%%/include/HsXlib.h +%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/%%PORTNAME%%-register.sh -share/doc/X11-1.4.1/LICENSE -@dirrm share/doc/X11-1.4.1 +%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xinerama.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Atom.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Color.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Context.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Display.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Event.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Extras.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Font.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Image.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Misc.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Region.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Screen.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Window.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11.html +%%PORTDOCS%%%%DOCSDIR%%/html/X11.haddock +%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html +%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js +%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css +%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif +%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% +@dirrmtry %%SUBDIR%%/include @dirrm %%SUBDIR%%/Graphics/X11/Xlib @dirrm %%SUBDIR%%/Graphics/X11 @dirrmtry %%SUBDIR%%/Graphics -@dirrmtry %%SUBDIR%%/include @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister X11 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old Property changes on: head/x11/hs-x11-ghc/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property