svn commit: r372425 - head/lang/ghc

[Gabor Pali]

Author: pgj
Date: Mon Nov 10 22:17:45 2014
New Revision: 372425
URL: https://svnweb.freebsd.org/changeset/ports/372425
QAT: https://qat.redports.org/buildarchive/r372425/

Log:
  - Remove @dirrm* from (often automatically generated) plists of GHC and
    all the Haskell Cabal ports
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/Makefile
  head/lang/ghc/bsd.cabal.mk
  head/lang/ghc/pkg-plist

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Mon Nov 10 22:12:33 2014	(r372424)
+++ head/lang/ghc/Makefile	Mon Nov 10 22:17:45 2014	(r372425)
@@ -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}/?, at dirrm ,' >> ${TMPPLIST}
-	@${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?, at dirrm ,' >> ${TMPPLIST}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Mon Nov 10 22:12:33 2014	(r372424)
+++ head/lang/ghc/bsd.cabal.mk	Mon Nov 10 22:17:45 2014	(r372425)
@@ -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}/?, at dirrm ,' >> ${TMPPLIST}; fi ; done
+		-type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; done
 .endif # target(post-install-script)
 
 .if !defined(METAPORT)

Modified: head/lang/ghc/pkg-plist
==============================================================================
--- head/lang/ghc/pkg-plist	Mon Nov 10 22:12:33 2014	(r372424)
+++ head/lang/ghc/pkg-plist	Mon Nov 10 22:17:45 2014	(r372425)
@@ -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
- at dirrmtry lib/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry lib/cabal
- at dirrmtry share/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/cabal
- at dirrmtry share/doc/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/doc/cabal
- at dirrmtry share/examples/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/examples/cabal