aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Braun <obraun@FreeBSD.org>2003-06-09 17:53:15 +0000
committerOliver Braun <obraun@FreeBSD.org>2003-06-09 17:53:15 +0000
commit610ac34a34fc315ae07ce9941eaa482ab68af88d (patch)
tree33d29d49b9b1e93a9c9818d2a42a4b3e8470279b
parentf7628349a640f51083dcb472710baf778645c206 (diff)
downloadports-610ac34a34fc315ae07ce9941eaa482ab68af88d.tar.gz
ports-610ac34a34fc315ae07ce9941eaa482ab68af88d.zip
* Remove ghc's package.conf.old.
* Do not install bin/harch. Pointed by: kris, bento
Notes
Notes: svn path=/head/; revision=82605
-rw-r--r--devel/hs-hat/Makefile6
-rw-r--r--devel/hs-hat/files/patch-configure (renamed from devel/hs-hat/files/extra-patch-configure)0
-rw-r--r--devel/hs-hat/pkg-plist3
3 files changed, 4 insertions, 5 deletions
diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile
index 767b5ef3ef8c..e9323e9d5a66 100644
--- a/devel/hs-hat/Makefile
+++ b/devel/hs-hat/Makefile
@@ -76,9 +76,6 @@ pre-everything::
@${ECHO_CMD} ""
post-patch:
-.if defined(WITH_NHC98)
- ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-configure
-.endif
@${REINPLACE_CMD} -e "s|glib-config|${GLIB_CONFIG}|" \
${WRKSRC}/configure ${WRKSRC}/src/hattools/Makefile
@@ -86,9 +83,10 @@ post-install:
.if !defined(WITH_NHC98)
@${INSTALL_DATA} ${WRKSRC}/lib/ix86-FreeBSD/hatlib/ghc/hat-package.conf \
${PREFIX}/lib/ix86-FreeBSD
+ @${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.endif
.if !defined(NOPORTDOCS)
- @rm -rf ${PREFIX}/share/doc/hat/CVS
+ @${RM} -rf ${PREFIX}/share/doc/hat/CVS
.endif
.include <bsd.port.post.mk>
diff --git a/devel/hs-hat/files/extra-patch-configure b/devel/hs-hat/files/patch-configure
index df9407d19b10..df9407d19b10 100644
--- a/devel/hs-hat/files/extra-patch-configure
+++ b/devel/hs-hat/files/patch-configure
diff --git a/devel/hs-hat/pkg-plist b/devel/hs-hat/pkg-plist
index b85bdabf2378..64ff8644b6f1 100644
--- a/devel/hs-hat/pkg-plist
+++ b/devel/hs-hat/pkg-plist
@@ -6,7 +6,6 @@ bin/hat-stack
bin/hat-trail
bin/hat-trans
bin/hat-view
-%%GHC%%bin/harch
include/hat/Array.hx
include/hat/CPUTime.hx
include/hat/Char.hx
@@ -338,4 +337,6 @@ lib/ix86-FreeBSD/hat-view
%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/hat
%%PORTDOCS%%@dirrm share/doc/hat
%%GHC%%@exec /usr/local/bin/ghc-pkg -a < %D/lib/ix86-FreeBSD/hat-package.conf
+%%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
%%GHC%%@unexec /usr/local/bin/ghc-pkg -r hat
+%%GHC%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old