aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2008-08-15 04:51:57 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2008-08-15 04:51:57 +0000
commitc68f84a75018e6a72327f12f6e39a6446194a648 (patch)
tree133227c06689d8cc6eb3d84c42d5689efd59d3ae
parent5d54016822fb00769b1138e917ebb0f4a8cda25e (diff)
downloadports-c68f84a75018e6a72327f12f6e39a6446194a648.tar.gz
ports-c68f84a75018e6a72327f12f6e39a6446194a648.zip
Notes
Diffstat
-rw-r--r--graphics/hs-HGL-ghc/Makefile17
-rw-r--r--graphics/hs-HGL-ghc/pkg-plist10
-rw-r--r--graphics/hs-HGL/Makefile17
-rw-r--r--graphics/hs-HGL/pkg-plist10
4 files changed, 32 insertions, 22 deletions
diff --git a/graphics/hs-HGL-ghc/Makefile b/graphics/hs-HGL-ghc/Makefile
index fb10870940cc..2a50aafdd9c0 100644
--- a/graphics/hs-HGL-ghc/Makefile
+++ b/graphics/hs-HGL-ghc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -20,6 +20,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
GHC_VERSION= 6.8.3
+HGL_VERSION= ${PORTVERSION}
CABAL_CMD= ${LOCALBASE}/bin/runghc Setup.hs
@@ -27,7 +28,8 @@ HGL_LIBDIR_REL= lib/${DISTNAME}
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- HGL_LIBDIR_REL=${HGL_LIBDIR_REL}
+ HGL_LIBDIR_REL=${HGL_LIBDIR_REL} \
+ HGL_VERSION=${HGL_VERSION}
.if defined(NOPORTDOCS)
PLIST_SUB+= NOPORTDOCS=""
@@ -39,7 +41,8 @@ PLIST_SUB+= NOPORTDOCS="@comment "
BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock \
HsColour:${PORTSDIR}/print/hs-hscolour
-HSCOLOUR_VERSION= 1.9
+HSCOLOUR_VERSION= 1.10
+HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
PORTDOCS= *
.endif
@@ -47,20 +50,22 @@ PORTDOCS= *
.SILENT:
do-configure:
- cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
+ cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
do-build:
cd ${WRKSRC} && ${CABAL_CMD} build \
&& ${CABAL_CMD} register --gen-script
.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
- --hscolour-css=${LOCALBASE}/share/hscolour-${HSCOLOUR_VERSION}/hscolour.css
+ cd ${WRKSRC} && ${CABAL_CMD} haddock --hyperlink-source \
+ --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif
do-install:
cd ${WRKSRC} && ${CABAL_CMD} install \
&& ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HGL_LIBDIR_REL}/register.sh
+
+post-install:
@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.include <bsd.port.mk>
diff --git a/graphics/hs-HGL-ghc/pkg-plist b/graphics/hs-HGL-ghc/pkg-plist
index c583112ee951..8f82c647e39b 100644
--- a/graphics/hs-HGL-ghc/pkg-plist
+++ b/graphics/hs-HGL-ghc/pkg-plist
@@ -25,8 +25,8 @@
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Types.hi
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Window.hi
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/SOE.hi
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-3.2.0.0.o
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-3.2.0.0.a
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-%%HGL_VERSION%%.o
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-%%HGL_VERSION%%.a
%%HGL_LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
@@ -38,6 +38,6 @@
@dirrm %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
@dirrm %%HGL_LIBDIR_REL%%
@exec /bin/sh %D/%%HGL_LIBDIR_REL%%/register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister HGL || /usr/bin/true; fi
-@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister HGL
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index fb10870940cc..2a50aafdd9c0 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -20,6 +20,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
GHC_VERSION= 6.8.3
+HGL_VERSION= ${PORTVERSION}
CABAL_CMD= ${LOCALBASE}/bin/runghc Setup.hs
@@ -27,7 +28,8 @@ HGL_LIBDIR_REL= lib/${DISTNAME}
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- HGL_LIBDIR_REL=${HGL_LIBDIR_REL}
+ HGL_LIBDIR_REL=${HGL_LIBDIR_REL} \
+ HGL_VERSION=${HGL_VERSION}
.if defined(NOPORTDOCS)
PLIST_SUB+= NOPORTDOCS=""
@@ -39,7 +41,8 @@ PLIST_SUB+= NOPORTDOCS="@comment "
BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock \
HsColour:${PORTSDIR}/print/hs-hscolour
-HSCOLOUR_VERSION= 1.9
+HSCOLOUR_VERSION= 1.10
+HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
PORTDOCS= *
.endif
@@ -47,20 +50,22 @@ PORTDOCS= *
.SILENT:
do-configure:
- cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
+ cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
do-build:
cd ${WRKSRC} && ${CABAL_CMD} build \
&& ${CABAL_CMD} register --gen-script
.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
- --hscolour-css=${LOCALBASE}/share/hscolour-${HSCOLOUR_VERSION}/hscolour.css
+ cd ${WRKSRC} && ${CABAL_CMD} haddock --hyperlink-source \
+ --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif
do-install:
cd ${WRKSRC} && ${CABAL_CMD} install \
&& ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HGL_LIBDIR_REL}/register.sh
+
+post-install:
@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.include <bsd.port.mk>
diff --git a/graphics/hs-HGL/pkg-plist b/graphics/hs-HGL/pkg-plist
index c583112ee951..8f82c647e39b 100644
--- a/graphics/hs-HGL/pkg-plist
+++ b/graphics/hs-HGL/pkg-plist
@@ -25,8 +25,8 @@
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Types.hi
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Window.hi
%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/SOE.hi
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-3.2.0.0.o
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-3.2.0.0.a
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-%%HGL_VERSION%%.o
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-%%HGL_VERSION%%.a
%%HGL_LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
@@ -38,6 +38,6 @@
@dirrm %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
@dirrm %%HGL_LIBDIR_REL%%
@exec /bin/sh %D/%%HGL_LIBDIR_REL%%/register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister HGL || /usr/bin/true; fi
-@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister HGL
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:19:25 +0000