From 48e36c30ec96b94247bbcfa44338bda6cd8a0168 Mon Sep 17 00:00:00 2001 From: Felippe de Meirelles Motta Date: Mon, 12 May 2008 17:17:54 +0000 Subject: [PATCH] - Update to 1.13. - Mark IGNORE on < 7 versions. PR: ports/121892 Submitted by: Geoffrey Mainland Approved by: araujo (mentor), Geoffrey Mainland (maintainer) --- devel/lhs2TeX/Makefile | 12 +++-- devel/lhs2TeX/distinfo | 6 +-- devel/lhs2TeX/files/patch-configure | 63 +++++++++++++++++++++-- devel/lhs2TeX/pkg-plist | 18 +++---- textproc/hs-lhs2tex/Makefile | 12 +++-- textproc/hs-lhs2tex/distinfo | 6 +-- textproc/hs-lhs2tex/files/patch-configure | 63 +++++++++++++++++++++-- textproc/hs-lhs2tex/pkg-plist | 18 +++---- 8 files changed, 158 insertions(+), 40 deletions(-) diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile index bbcc03eba6e4..7543057ac853 100644 --- a/devel/lhs2TeX/Makefile +++ b/devel/lhs2TeX/Makefile @@ -7,8 +7,7 @@ # PORTNAME= lhs2tex -PORTVERSION= 1.12 -PORTREVISION= 1 +PORTVERSION= 1.13 CATEGORIES= devel haskell MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/ @@ -18,7 +17,6 @@ COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ mktexlsr:${PORTSDIR}/print/teTeX-base -USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -26,6 +24,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --mandir=${MANPREFIX}/man +.include + .if defined(NOPORTDOCS) INSTALL_TARGET=install .else @@ -34,4 +34,8 @@ INSTALL_TARGET=install install-doc MAN1= lhs2TeX.1 -.include +.if ${OSVERSION} < 700042 +IGNORE= has a broken dependency +.endif + +.include diff --git a/devel/lhs2TeX/distinfo b/devel/lhs2TeX/distinfo index 225cd7e9b256..794c871dfcf8 100644 --- a/devel/lhs2TeX/distinfo +++ b/devel/lhs2TeX/distinfo @@ -1,3 +1,3 @@ -MD5 (lhs2tex-1.12.tar.bz2) = 1bc982e96f19201aaf1c39c1d4b5e358 -SHA256 (lhs2tex-1.12.tar.bz2) = af3440b8d5dda73ad43660fa496f5e1c04a3d3105961847963d0105c69a03447 -SIZE (lhs2tex-1.12.tar.bz2) = 582250 +MD5 (lhs2tex-1.13.tar.gz) = 1173dbe6440f24918f3dc80d776e1f18 +SHA256 (lhs2tex-1.13.tar.gz) = 28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b +SIZE (lhs2tex-1.13.tar.gz) = 601072 diff --git a/devel/lhs2TeX/files/patch-configure b/devel/lhs2TeX/files/patch-configure index d1b7f37a583e..b541e5b857f2 100644 --- a/devel/lhs2TeX/files/patch-configure +++ b/devel/lhs2TeX/files/patch-configure @@ -1,11 +1,66 @@ ---- ./configure.orig Wed Apr 25 22:41:37 2007 -+++ ./configure Wed Apr 25 22:41:55 2007 -@@ -2726,7 +2726,7 @@ +--- configure.orig 2008-02-19 01:11:52.000000000 -0500 ++++ configure 2008-02-19 01:42:57.000000000 -0500 +@@ -2637,54 +2637,6 @@ + POLYTABLE_INSTALL=yes + fi + +-if test "z$POLYTABLE_INSTALL" = "zyes"; then +- +-{ echo "$as_me:$LINENO: checking for the polytable package" >&5 +-echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; } +-if test -x "$KPSEWHICH"; then +- POLYTABLE="`$KPSEWHICH polytable.sty`" +-fi +-if test -f "$POLYTABLE"; then +- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5 +-echo "${ECHO_T}$POLYTABLE" >&6; } +- { echo "$as_me:$LINENO: checking for version of polytable" >&5 +-echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; } +- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"` +- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5 +-echo "${ECHO_T}$POLYTABLE_VERSION" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- # does polytable need to be installed? +- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5 +-echo $ECHO_N "checking whether polytable needs to be installed... $ECHO_C" >&6; } +- POLYTABLE_INSTALL=no +- if test -n $POLYTABLE; then +- if ( IFS="."; +- a="$POLYTABLE_VERSION"; b="0.8.2"; +- while test -n "$a$b" +- do +- set -- $a; h1="$1"; shift 2>/dev/null; a="$*" +- set -- $b; h2="$1"; shift 2>/dev/null; b="$*" +- test -n "$h1" || h1=0; test -n "$h2" || h2=0 +- test ${h1} -eq ${h2} || break +- done +- test ${h1} -lt ${h2} +- ) +-then +- POLYTABLE_INSTALL=yes +- +-fi +- +- else +- POLYTABLE_INSTALL=yes +- fi +- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5 +-echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; } +-fi +- + # Extract the first word of "mktexlsr", so it can be a program name with args. + set dummy mktexlsr; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -2727,7 +2679,7 @@ # docdir and expansion -docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" +#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" + stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION" - # lhs2TeX binary path relative to docdir diff --git a/devel/lhs2TeX/pkg-plist b/devel/lhs2TeX/pkg-plist index 96c76a55d1ce..3946bfb10d13 100644 --- a/devel/lhs2TeX/pkg-plist +++ b/devel/lhs2TeX/pkg-plist @@ -2,15 +2,15 @@ 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/colorcode.fmt -%%DATADIR%%/lhs2tex/forall.fmt -%%DATADIR%%/lhs2tex/greek.fmt -%%DATADIR%%/lhs2tex/jfpcompat.fmt -%%DATADIR%%/lhs2tex/lhs2TeX.fmt -%%DATADIR%%/lhs2tex/lhs2TeX.sty -%%DATADIR%%/lhs2tex/polycode.fmt -%%DATADIR%%/lhs2tex/spacing.fmt -@dirrm %%DATADIR%%/lhs2tex +%%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%% diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index bbcc03eba6e4..7543057ac853 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -7,8 +7,7 @@ # PORTNAME= lhs2tex -PORTVERSION= 1.12 -PORTREVISION= 1 +PORTVERSION= 1.13 CATEGORIES= devel haskell MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/ @@ -18,7 +17,6 @@ COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ mktexlsr:${PORTSDIR}/print/teTeX-base -USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -26,6 +24,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --mandir=${MANPREFIX}/man +.include + .if defined(NOPORTDOCS) INSTALL_TARGET=install .else @@ -34,4 +34,8 @@ INSTALL_TARGET=install install-doc MAN1= lhs2TeX.1 -.include +.if ${OSVERSION} < 700042 +IGNORE= has a broken dependency +.endif + +.include diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo index 225cd7e9b256..794c871dfcf8 100644 --- a/textproc/hs-lhs2tex/distinfo +++ b/textproc/hs-lhs2tex/distinfo @@ -1,3 +1,3 @@ -MD5 (lhs2tex-1.12.tar.bz2) = 1bc982e96f19201aaf1c39c1d4b5e358 -SHA256 (lhs2tex-1.12.tar.bz2) = af3440b8d5dda73ad43660fa496f5e1c04a3d3105961847963d0105c69a03447 -SIZE (lhs2tex-1.12.tar.bz2) = 582250 +MD5 (lhs2tex-1.13.tar.gz) = 1173dbe6440f24918f3dc80d776e1f18 +SHA256 (lhs2tex-1.13.tar.gz) = 28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b +SIZE (lhs2tex-1.13.tar.gz) = 601072 diff --git a/textproc/hs-lhs2tex/files/patch-configure b/textproc/hs-lhs2tex/files/patch-configure index d1b7f37a583e..b541e5b857f2 100644 --- a/textproc/hs-lhs2tex/files/patch-configure +++ b/textproc/hs-lhs2tex/files/patch-configure @@ -1,11 +1,66 @@ ---- ./configure.orig Wed Apr 25 22:41:37 2007 -+++ ./configure Wed Apr 25 22:41:55 2007 -@@ -2726,7 +2726,7 @@ +--- configure.orig 2008-02-19 01:11:52.000000000 -0500 ++++ configure 2008-02-19 01:42:57.000000000 -0500 +@@ -2637,54 +2637,6 @@ + POLYTABLE_INSTALL=yes + fi + +-if test "z$POLYTABLE_INSTALL" = "zyes"; then +- +-{ echo "$as_me:$LINENO: checking for the polytable package" >&5 +-echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; } +-if test -x "$KPSEWHICH"; then +- POLYTABLE="`$KPSEWHICH polytable.sty`" +-fi +-if test -f "$POLYTABLE"; then +- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5 +-echo "${ECHO_T}$POLYTABLE" >&6; } +- { echo "$as_me:$LINENO: checking for version of polytable" >&5 +-echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; } +- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"` +- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5 +-echo "${ECHO_T}$POLYTABLE_VERSION" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- # does polytable need to be installed? +- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5 +-echo $ECHO_N "checking whether polytable needs to be installed... $ECHO_C" >&6; } +- POLYTABLE_INSTALL=no +- if test -n $POLYTABLE; then +- if ( IFS="."; +- a="$POLYTABLE_VERSION"; b="0.8.2"; +- while test -n "$a$b" +- do +- set -- $a; h1="$1"; shift 2>/dev/null; a="$*" +- set -- $b; h2="$1"; shift 2>/dev/null; b="$*" +- test -n "$h1" || h1=0; test -n "$h2" || h2=0 +- test ${h1} -eq ${h2} || break +- done +- test ${h1} -lt ${h2} +- ) +-then +- POLYTABLE_INSTALL=yes +- +-fi +- +- else +- POLYTABLE_INSTALL=yes +- fi +- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5 +-echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; } +-fi +- + # Extract the first word of "mktexlsr", so it can be a program name with args. + set dummy mktexlsr; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -2727,7 +2679,7 @@ # docdir and expansion -docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" +#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" + stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION" - # lhs2TeX binary path relative to docdir diff --git a/textproc/hs-lhs2tex/pkg-plist b/textproc/hs-lhs2tex/pkg-plist index 96c76a55d1ce..3946bfb10d13 100644 --- a/textproc/hs-lhs2tex/pkg-plist +++ b/textproc/hs-lhs2tex/pkg-plist @@ -2,15 +2,15 @@ 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/colorcode.fmt -%%DATADIR%%/lhs2tex/forall.fmt -%%DATADIR%%/lhs2tex/greek.fmt -%%DATADIR%%/lhs2tex/jfpcompat.fmt -%%DATADIR%%/lhs2tex/lhs2TeX.fmt -%%DATADIR%%/lhs2tex/lhs2TeX.sty -%%DATADIR%%/lhs2tex/polycode.fmt -%%DATADIR%%/lhs2tex/spacing.fmt -@dirrm %%DATADIR%%/lhs2tex +%%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%%