aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/lhs2TeX/Makefile18
-rw-r--r--devel/lhs2TeX/distinfo6
-rw-r--r--devel/lhs2TeX/pkg-plist12
-rw-r--r--textproc/hs-lhs2tex/Makefile18
-rw-r--r--textproc/hs-lhs2tex/distinfo6
-rw-r--r--textproc/hs-lhs2tex/pkg-plist12
6 files changed, 26 insertions, 46 deletions
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile
index 7543057ac853..3063f74b8679 100644
--- a/devel/lhs2TeX/Makefile
+++ b/devel/lhs2TeX/Makefile
@@ -7,23 +7,29 @@
#
PORTNAME= lhs2tex
-PORTVERSION= 1.13
+PORTVERSION= 1.14
CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
MAINTAINER= mainland@apeiron.net
COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- mktexlsr:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
+ mktexlsr:${PORTSDIR}/print/teTeX-base \
+ hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
- --datadir=${DATADIR} \
+ --datadir=${PREFIX}/share \
--docdir=${DOCSDIR} \
--mandir=${MANPREFIX}/man
+DOCSDIR=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS= *
+DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+PORTDATA= *
+
.include <bsd.port.pre.mk>
.if defined(NOPORTDOCS)
@@ -34,8 +40,4 @@ INSTALL_TARGET=install install-doc
MAN1= lhs2TeX.1
-.if ${OSVERSION} < 700042
-IGNORE= has a broken dependency
-.endif
-
.include <bsd.port.post.mk>
diff --git a/devel/lhs2TeX/distinfo b/devel/lhs2TeX/distinfo
index 794c871dfcf8..f23f6d0923d3 100644
--- a/devel/lhs2TeX/distinfo
+++ b/devel/lhs2TeX/distinfo
@@ -1,3 +1,3 @@
-MD5 (lhs2tex-1.13.tar.gz) = 1173dbe6440f24918f3dc80d776e1f18
-SHA256 (lhs2tex-1.13.tar.gz) = 28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b
-SIZE (lhs2tex-1.13.tar.gz) = 601072
+MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39
+SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687
+SIZE (lhs2tex-1.14.tar.gz) = 581254
diff --git a/devel/lhs2TeX/pkg-plist b/devel/lhs2TeX/pkg-plist
index 3946bfb10d13..17c5274b397d 100644
--- a/devel/lhs2TeX/pkg-plist
+++ b/devel/lhs2TeX/pkg-plist
@@ -2,17 +2,5 @@ bin/lhs2TeX
share/texmf-local/tex/latex/polytable/lazylist.sty
share/texmf-local/tex/latex/polytable/polytable.sty
@dirrm share/texmf-local/tex/latex/polytable
-%%DATADIR%%/lhs2tex-1.13/colorcode.fmt
-%%DATADIR%%/lhs2tex-1.13/forall.fmt
-%%DATADIR%%/lhs2tex-1.13/greek.fmt
-%%DATADIR%%/lhs2tex-1.13/jfpcompat.fmt
-%%DATADIR%%/lhs2tex-1.13/lhs2TeX.fmt
-%%DATADIR%%/lhs2tex-1.13/lhs2TeX.sty
-%%DATADIR%%/lhs2tex-1.13/polycode.fmt
-%%DATADIR%%/lhs2tex-1.13/spacing.fmt
-@dirrm %%DATADIR%%/lhs2tex-1.13
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Guide2.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec %D/bin/mktexlsr
@unexec %D/bin/mktexlsr
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 7543057ac853..3063f74b8679 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -7,23 +7,29 @@
#
PORTNAME= lhs2tex
-PORTVERSION= 1.13
+PORTVERSION= 1.14
CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
MAINTAINER= mainland@apeiron.net
COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- mktexlsr:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
+ mktexlsr:${PORTSDIR}/print/teTeX-base \
+ hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
- --datadir=${DATADIR} \
+ --datadir=${PREFIX}/share \
--docdir=${DOCSDIR} \
--mandir=${MANPREFIX}/man
+DOCSDIR=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS= *
+DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+PORTDATA= *
+
.include <bsd.port.pre.mk>
.if defined(NOPORTDOCS)
@@ -34,8 +40,4 @@ INSTALL_TARGET=install install-doc
MAN1= lhs2TeX.1
-.if ${OSVERSION} < 700042
-IGNORE= has a broken dependency
-.endif
-
.include <bsd.port.post.mk>
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index 794c871dfcf8..f23f6d0923d3 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,3 +1,3 @@
-MD5 (lhs2tex-1.13.tar.gz) = 1173dbe6440f24918f3dc80d776e1f18
-SHA256 (lhs2tex-1.13.tar.gz) = 28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b
-SIZE (lhs2tex-1.13.tar.gz) = 601072
+MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39
+SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687
+SIZE (lhs2tex-1.14.tar.gz) = 581254
diff --git a/textproc/hs-lhs2tex/pkg-plist b/textproc/hs-lhs2tex/pkg-plist
index 3946bfb10d13..17c5274b397d 100644
--- a/textproc/hs-lhs2tex/pkg-plist
+++ b/textproc/hs-lhs2tex/pkg-plist
@@ -2,17 +2,5 @@ bin/lhs2TeX
share/texmf-local/tex/latex/polytable/lazylist.sty
share/texmf-local/tex/latex/polytable/polytable.sty
@dirrm share/texmf-local/tex/latex/polytable
-%%DATADIR%%/lhs2tex-1.13/colorcode.fmt
-%%DATADIR%%/lhs2tex-1.13/forall.fmt
-%%DATADIR%%/lhs2tex-1.13/greek.fmt
-%%DATADIR%%/lhs2tex-1.13/jfpcompat.fmt
-%%DATADIR%%/lhs2tex-1.13/lhs2TeX.fmt
-%%DATADIR%%/lhs2tex-1.13/lhs2TeX.sty
-%%DATADIR%%/lhs2tex-1.13/polycode.fmt
-%%DATADIR%%/lhs2tex-1.13/spacing.fmt
-@dirrm %%DATADIR%%/lhs2tex-1.13
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Guide2.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec %D/bin/mktexlsr
@unexec %D/bin/mktexlsr