aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/hs-HaXml/Makefile10
-rw-r--r--textproc/hs-HaXml/distinfo2
-rw-r--r--textproc/hs-HaXml/files/patch-src::Text::XML::HaXml::Parse.hs11
-rw-r--r--textproc/hs-HaXml/pkg-plist4
-rw-r--r--textproc/hs-haxml/Makefile10
-rw-r--r--textproc/hs-haxml/distinfo2
-rw-r--r--textproc/hs-haxml/files/patch-src::Text::XML::HaXml::Parse.hs11
-rw-r--r--textproc/hs-haxml/pkg-plist4
8 files changed, 22 insertions, 32 deletions
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index eb4adbcdc18b..4ee0cec8c2e3 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= haxml
-PORTVERSION= 1.08
+PORTVERSION= 1.09
PORTREVISION= 0
CATEGORIES= textproc haskell
MASTER_SITES= http://www.haskell.org/HaXml/ \
@@ -21,18 +21,18 @@ BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
.else
WITH_GHC= yes
-BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hs-hmake
.endif
.if defined(WITH_GHC)
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
.endif
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= #empty
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --prefix=${PREFIX}/bin
.if !defined(WITHOUT_NHC98) && !defined(WITH_GHC)
CONFIGURE_ARGS+= --buildwith=nhc98
@@ -66,6 +66,9 @@ pre-everything::
.endif
@${ECHO_CMD} ""
+post-patch:
+ @${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
+
post-install:
.if defined(WITH_GHC)
@${INSTALL_DATA} ${WRKSRC}/obj/ghc/pkg.conf \
@@ -75,6 +78,7 @@ post-install:
Canonicalise DtdToHaskell MkOneOf Validate Xtract ${PREFIX}/bin)
.if !defined(NOPORTDOCS)
@${RM} -rf ${WRKSRC}/docs/CVS
+ @${RM} -rf ${WRKSRC}/docs/HaXml/CVS
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
.endif
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 34c0307e0d64..7694e94905ed 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1 +1 @@
-MD5 (HaXml-1.08.tar.gz) = 71a0b1fbaa2323322318e4fa45bb65a3
+MD5 (HaXml-1.09.tar.gz) = 552797144efccd6a1035572cc6078f4a
diff --git a/textproc/hs-HaXml/files/patch-src::Text::XML::HaXml::Parse.hs b/textproc/hs-HaXml/files/patch-src::Text::XML::HaXml::Parse.hs
deleted file mode 100644
index 4613b09cedf1..000000000000
--- a/textproc/hs-HaXml/files/patch-src::Text::XML::HaXml::Parse.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Text/XML/HaXml/Parse.hs.orig Wed Aug 14 12:08:48 2002
-+++ src/Text/XML/HaXml/Parse.hs Sat Apr 12 10:31:06 2003
-@@ -26,7 +26,7 @@
-
-
- #if defined(__NHC__)
--import IOExtras (unsafePerformIO)
-+import NHC.IOExtras (unsafePerformIO)
- #endif
- #if defined(__HBC__)
- import UnsafePerformIO
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index 75030fe4d56c..f33dffe4263a 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -16,6 +16,7 @@ bin/Xtract
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Pretty.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Types.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Validate.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Verbatim.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Wrappers.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xml2Haskell.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml.hi
@@ -36,6 +37,7 @@ bin/Xtract
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Verbatim.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
@@ -61,6 +63,7 @@ bin/Xtract
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Pretty.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Types.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Validate.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Verbatim.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Wrappers.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xml2Haskell.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Combinators.html
@@ -124,7 +127,6 @@ bin/Xtract
%%PORTDOCS%%share/doc/haxml/HaXml/haskell_icon.gif
%%PORTDOCS%%share/doc/haxml/HaXml/index.html
%%PORTDOCS%%share/doc/haxml/Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/LICENSE
%%PORTDOCS%%share/doc/haxml/Xml2Haskell.html
%%PORTDOCS%%share/doc/haxml/Xtract.html
%%PORTDOCS%%share/doc/haxml/brubeck.gif
diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index eb4adbcdc18b..4ee0cec8c2e3 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= haxml
-PORTVERSION= 1.08
+PORTVERSION= 1.09
PORTREVISION= 0
CATEGORIES= textproc haskell
MASTER_SITES= http://www.haskell.org/HaXml/ \
@@ -21,18 +21,18 @@ BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
.else
WITH_GHC= yes
-BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hs-hmake
.endif
.if defined(WITH_GHC)
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
.endif
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= #empty
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --prefix=${PREFIX}/bin
.if !defined(WITHOUT_NHC98) && !defined(WITH_GHC)
CONFIGURE_ARGS+= --buildwith=nhc98
@@ -66,6 +66,9 @@ pre-everything::
.endif
@${ECHO_CMD} ""
+post-patch:
+ @${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
+
post-install:
.if defined(WITH_GHC)
@${INSTALL_DATA} ${WRKSRC}/obj/ghc/pkg.conf \
@@ -75,6 +78,7 @@ post-install:
Canonicalise DtdToHaskell MkOneOf Validate Xtract ${PREFIX}/bin)
.if !defined(NOPORTDOCS)
@${RM} -rf ${WRKSRC}/docs/CVS
+ @${RM} -rf ${WRKSRC}/docs/HaXml/CVS
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
.endif
diff --git a/textproc/hs-haxml/distinfo b/textproc/hs-haxml/distinfo
index 34c0307e0d64..7694e94905ed 100644
--- a/textproc/hs-haxml/distinfo
+++ b/textproc/hs-haxml/distinfo
@@ -1 +1 @@
-MD5 (HaXml-1.08.tar.gz) = 71a0b1fbaa2323322318e4fa45bb65a3
+MD5 (HaXml-1.09.tar.gz) = 552797144efccd6a1035572cc6078f4a
diff --git a/textproc/hs-haxml/files/patch-src::Text::XML::HaXml::Parse.hs b/textproc/hs-haxml/files/patch-src::Text::XML::HaXml::Parse.hs
deleted file mode 100644
index 4613b09cedf1..000000000000
--- a/textproc/hs-haxml/files/patch-src::Text::XML::HaXml::Parse.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Text/XML/HaXml/Parse.hs.orig Wed Aug 14 12:08:48 2002
-+++ src/Text/XML/HaXml/Parse.hs Sat Apr 12 10:31:06 2003
-@@ -26,7 +26,7 @@
-
-
- #if defined(__NHC__)
--import IOExtras (unsafePerformIO)
-+import NHC.IOExtras (unsafePerformIO)
- #endif
- #if defined(__HBC__)
- import UnsafePerformIO
diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist
index 75030fe4d56c..f33dffe4263a 100644
--- a/textproc/hs-haxml/pkg-plist
+++ b/textproc/hs-haxml/pkg-plist
@@ -16,6 +16,7 @@ bin/Xtract
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Pretty.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Types.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Validate.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Verbatim.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Wrappers.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xml2Haskell.hi
%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml.hi
@@ -36,6 +37,7 @@ bin/Xtract
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Verbatim.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
@@ -61,6 +63,7 @@ bin/Xtract
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Pretty.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Types.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Validate.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Verbatim.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Wrappers.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xml2Haskell.html
%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Combinators.html
@@ -124,7 +127,6 @@ bin/Xtract
%%PORTDOCS%%share/doc/haxml/HaXml/haskell_icon.gif
%%PORTDOCS%%share/doc/haxml/HaXml/index.html
%%PORTDOCS%%share/doc/haxml/Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/LICENSE
%%PORTDOCS%%share/doc/haxml/Xml2Haskell.html
%%PORTDOCS%%share/doc/haxml/Xtract.html
%%PORTDOCS%%share/doc/haxml/brubeck.gif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:59:02 +0000