diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2005-05-09 12:23:23 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2005-05-09 12:23:23 +0000 |
commit | 094b801637c352676392485c794cb2fc379e3fc4 (patch) | |
tree | 95378cc064cfad81db869c02dec328a56898d33a | |
parent | e970ce0ace764e25f29a34a9e1c144746732a995 (diff) | |
download | pkgsrc-094b801637c352676392485c794cb2fc379e3fc4.tar.gz |
Fix installation after USE_BUILDLINK3 was enabled by default:
* ezm3 installs its files into ${PREFIX}/ezm3, the installation
fails due to missing libraries, fixed with
BUILDLINK_PASSTHRU_DIRS.
* Provide a buildlink3 file with DEPMETHOD=build to fix the
cvsup packages.
Bump PKGREVISION, this closes PR pkg/29986 and PR pkg/30159.
-rw-r--r-- | lang/ezm3/Makefile | 4 | ||||
-rw-r--r-- | lang/ezm3/buildlink3.mk | 21 | ||||
-rw-r--r-- | lang/ezm3/distinfo | 6 |
3 files changed, 25 insertions, 6 deletions
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile index 427e26d53ca..dc293ec64a1 100644 --- a/lang/ezm3/Makefile +++ b/lang/ezm3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2004/06/04 17:34:36 jschauma Exp $ +# $NetBSD: Makefile,v 1.9 2005/05/09 12:23:23 xtraeme Exp $ DISTNAME= ezm3-1.1 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/ezm3/ DISTFILES= ${DISTNAME}-src.tar.bz2 ${BOOTSTRAP} @@ -21,6 +22,7 @@ PLIST_SUBST+= TARGET=${TARGET} TARGETDIR=${TARGETDIR} .include "../../mk/bsd.prefs.mk" CFLAGS:= EZM3ROOT= ${PREFIX}/ezm3 +BUILDLINK_PASSTHRU_DIRS+= ${EZM3ROOT} # XXX: This may well work for some others. ONLY_FOR_PLATFORM= FreeBSD-*-i386 NetBSD-*-i386 Linux-*-i386 diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk new file mode 100644 index 00000000000..f92b484bfe5 --- /dev/null +++ b/lang/ezm3/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1 2005/05/09 12:23:23 xtraeme Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +EZM3_BUILDLINK3_MK:= ${EZM3_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= ezm3 +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nezm3} +BUILDLINK_PACKAGES+= ezm3 + +.if !empty(EZM3_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.ezm3+= ezm3>=1.1nb1 +BUILDLINK_DEPMETHOD.ezm3?= build +BUILDLINK_PKGSRCDIR.ezm3?= ../../lang/ezm3 +.endif # EZM3_BUILDLINK3_MK + +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/ezm3 + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/ezm3/distinfo b/lang/ezm3/distinfo index 62cdee1ddcb..675fec3890f 100644 --- a/lang/ezm3/distinfo +++ b/lang/ezm3/distinfo @@ -1,14 +1,10 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:03:06 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/05/09 12:23:23 xtraeme Exp $ SHA1 (ezm3/ezm3-1.1-src.tar.bz2) = fbca999ef121c7893d3bb7480b538a54f72fad0e RMD160 (ezm3/ezm3-1.1-src.tar.bz2) = 07f07169e2b09aeef4b1d25e2fb515e952b48de4 Size (ezm3/ezm3-1.1-src.tar.bz2) = 10705295 bytes -SHA1 (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = db12938fb76f6e8187b30c9c9db6ccf029100238 -Size (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = 1365809 bytes SHA1 (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = 1a8c10544fadc618012bd0efd7d9267f7b210ccc RMD160 (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = b25508a74a813d4e8f49a172834bbdd19ec3b36e Size (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = 1375659 bytes -SHA1 (ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2) = 602d37277e8c94743fa9a6ac79e4e7a46f9c9234 -Size (ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2) = 1444815 bytes SHA1 (patch-aa) = fac6afee90c6d5518ccaf4a02e4846917a24136e SHA1 (patch-ab) = d7ca4b997caacdd9a6eb16d13530dc1e9343ea1a |