Thu Apr 14 19:56:45 2016 UTC ()
Look in DESTDIR for the dynamic PLIST additions, fixing my own snafu in
the last revision.


(joerg)
diff -r1.23 -r1.24 pkgsrc/lang/ghc7/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2016/04/10 16:39:27 1.23
+++ pkgsrc/lang/ghc7/Makefile 2016/04/14 19:56:44 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2016/04/10 16:39:27 joerg Exp $ 1# $NetBSD: Makefile,v 1.24 2016/04/14 19:56:44 joerg Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-7.6.3-src 5DISTNAME= ghc-7.6.3-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 8 7PKGREVISION= 8
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/ 9MASTER_SITES= http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= http://www.haskell.org/ghc/ 13HOMEPAGE= http://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell 14COMMENT= Compiler for the functional language Haskell
@@ -141,27 +141,27 @@ post-install: @@ -141,27 +141,27 @@ post-install:
141# ----------------------------------------------------------------------------- 141# -----------------------------------------------------------------------------
142# PLIST 142# PLIST
143# 143#
144# We can't use static PLIST because the package installs some files 144# We can't use static PLIST because the package installs some files
145# whose names are randomly generated, namely 145# whose names are randomly generated, namely
146# lib/${PKGNAME}/package.conf.d/*.conf 146# lib/${PKGNAME}/package.conf.d/*.conf
147# 147#
148PRINT_PLIST_AWK+= /lib\/${PKGNAME_NOREV}\/package\.conf\.d/ { next; } 148PRINT_PLIST_AWK+= /lib\/${PKGNAME_NOREV}\/package\.conf\.d/ { next; }
149 149
150# If we were lucky we could just use "PLIST_TYPE = dynamic", but the 150# If we were lucky we could just use "PLIST_TYPE = dynamic", but the
151# feature has seemingly bitrotted. 151# feature has seemingly bitrotted.
152.include "../../mk/bsd.prefs.mk" 152.include "../../mk/bsd.prefs.mk"
153GENERATE_PLIST+= \ 153GENERATE_PLIST+= \
154 cd ${PREFIX:Q} && \ 154 cd ${DESTDIR}${PREFIX} && \
155 ${FIND} lib/${PKGNAME_NOREV}/package.conf.d -xdev -newer ${_COOKIE.extract} \! -type d -print | ${SORT} -d; 155 ${FIND} lib/${PKGNAME_NOREV}/package.conf.d -xdev -newer ${_COOKIE.extract} \! -type d -print | ${SORT} -d;
156 156
157# ----------------------------------------------------------------------------- 157# -----------------------------------------------------------------------------
158# Sanity checks 158# Sanity checks
159# 159#
160 160
161# There is an unused script which don't pass the portability test. 161# There is an unused script which don't pass the portability test.
162CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw 162CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw
163 163
164# Dynamic Haskell libraries currently have no rpaths to any dependent 164# Dynamic Haskell libraries currently have no rpaths to any dependent
165# Haskell libraries so we must skip shlibs check for them. Note that 165# Haskell libraries so we must skip shlibs check for them. Note that
166# the situation seems to be changed in GHC 7.8.1 so we should 166# the situation seems to be changed in GHC 7.8.1 so we should
167# readdress this later. See 167# readdress this later. See