From 9c10f8f08a013235f7f298c2a91e5116bf5aa9ed Mon Sep 17 00:00:00 2001
From: pgj <pgj@FreeBSD.org>
Date: Mon, 10 Nov 2014 22:17:45 +0000
Subject: - Remove @dirrm* from (often automatically generated) plists of GHC
 and   all the Haskell Cabal ports

Obtained from:	FreeBSD Haskell
---
 lang/ghc/Makefile     |  4 ----
 lang/ghc/bsd.cabal.mk | 11 +----------
 lang/ghc/pkg-plist    |  8 --------
 3 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'lang/ghc')

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 50d0b1062d9b..d86f729691b0 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -259,10 +259,6 @@ post-install-script:
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
 .endif
-	@${FIND} -ds ${STAGEDIR}${DOCSDIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
-	@${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index f1d1f414c9fb..0985865f190c 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -303,18 +303,9 @@ post-install-script:
 .for exe in ${EXECUTABLE}
 	@${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
 .endfor
-.if defined(STANDALONE) && !${PORT_OPTIONS:MDYNAMIC}
-	@for dir in lib share share/doc share/examples; do \
-		if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal/ghc-${GHC_VERSION} ]; then \
-		echo "@dirrmtry $${dir}/cabal/ghc-${GHC_VERSION}" >> ${TMPPLIST}; fi ; \
-		if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal ]; then \
-		echo "@dirrmtry $${dir}/cabal" >> ${TMPPLIST}; fi ; done
-.endif
 .endif # EXECUTABLE
 	@for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
-		-type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \
-		if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
-		-type d -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done
+		-type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; done
 .endif # target(post-install-script)
 
 .if !defined(METAPORT)
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index 601fe49d83d6..3e79bdd3ac88 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -18,11 +18,3 @@ bin/runghc-%%GHC_VERSION%%
 @exec /bin/mkdir -p %D/share/cabal/ghc-%%GHC_VERSION%%           || return true
 @exec /bin/mkdir -p %D/share/doc/cabal/ghc-%%GHC_VERSION%%       || return true
 @exec /bin/mkdir -p %D/share/examples/cabal/ghc-%%GHC_VERSION%%  || return true
-@dirrmtry lib/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry lib/cabal
-@dirrmtry share/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/cabal
-@dirrmtry share/doc/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/doc/cabal
-@dirrmtry share/examples/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/examples/cabal
-- 
cgit