summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Braun <obraun@FreeBSD.org>2003-06-09 18:54:49 +0000
committerOliver Braun <obraun@FreeBSD.org>2003-06-09 18:54:49 +0000
commit9cefd6fa47dd09f2d26cf7186148946001db76f8 (patch)
treec7afbb570c783f137668e972cc50ae212a9dd177
parentFix MASTER_SITES (diff)
Remove ghc's package.conf.old.
Pointed out by: kris, bento
-rw-r--r--x11-toolkits/hs-frantk/Makefile7
-rw-r--r--x11-toolkits/hs-frantk/pkg-plist2
2 files changed, 8 insertions, 1 deletions
diff --git a/x11-toolkits/hs-frantk/Makefile b/x11-toolkits/hs-frantk/Makefile
index 9d43d2179c11..195b95a1d3f4 100644
--- a/x11-toolkits/hs-frantk/Makefile
+++ b/x11-toolkits/hs-frantk/Makefile
@@ -37,7 +37,9 @@ PLIST_SUB+= HUGS="@comment "
.if !defined(WITHOUT_GHC)
ALL_TARGET+= all
INSTALL_TARGET+=install_ghc pkg
-PLIST_SUB+= GHC=""
+GHC_VERSION= `${PREFIX}/bin/ghc --version 2>&1 | \
+ ${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
+PLIST_SUB+= GHC="" GHC_VERSION="${GHC_VERSION}"
.else
PLIST_SUB+= GHC="@comment "
.endif
@@ -67,6 +69,9 @@ post-patch:
@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/frantk.conf
post-install:
+.if !defined(WITHOUT_GHC)
+ @${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${CP} ${WRKDIR}/FranTk1.1/doc/frantk.pdf ${DOCSDIR}
diff --git a/x11-toolkits/hs-frantk/pkg-plist b/x11-toolkits/hs-frantk/pkg-plist
index c338602c232e..935892b5878b 100644
--- a/x11-toolkits/hs-frantk/pkg-plist
+++ b/x11-toolkits/hs-frantk/pkg-plist
@@ -168,4 +168,6 @@
%%GHC%%@dirrm lib/frantk/imports
%%GHC%%@dirrm lib/frantk
%%HUGS%%@unexec rmdir %D/lib/frantk || true
+%%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
%%GHC%%@unexec ghc-pkg -r FranTk
+%%GHC%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old