diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-01-22 20:48:06 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-01-22 20:48:06 +0800 |
| commit | 613f369efee131ce584dcae537b56cf57b117ecb (patch) | |
| tree | 09017003c10bf657b78d33ba07599142c84a8bd4 /misc | |
| parent | fe7cc5587b6dc7f170c5f5148ed09357e9a3def7 (diff) | |
| download | marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar.gz marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar.bz2 marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar.lz marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar.xz marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.tar.zst marcuscom-ports-613f369efee131ce584dcae537b56cf57b117ecb.zip | |
Add back the pkg-install, it turned out that the problems caused was a
bug in pkgng. It didn't extract +MTREE_DIRS from the package at all.
fixed in pkg 1.0.5
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17198 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/gnomehier/Makefile | 6 | ||||
| -rw-r--r-- | misc/gnomehier/files/pkg-install.in | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index 05d33fef2..226b80732 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/misc/gnomehier/Makefile,v 1.38 2012/04/27 13:24:51 kwm Exp $ +# $MCom: ports/misc/gnomehier/Makefile,v 1.39 2012/12/10 10:58:06 kwm Exp $ # !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!! PORTNAME= gnomehier @@ -35,6 +35,8 @@ pre-install: do \ ${MKDIR} ${WRKSRC}/$${dir}; \ done + @${SED} -e 's|%%MTREE_ARGS%%|${GNOME_MTREE_ARGS}|' \ + < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} pre-su-install: cd ${WRKSRC} && \ @@ -48,6 +50,6 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${GNOME_MTREE} ${PREFIX}/etc/mtree post-install: - /usr/sbin/mtree ${GNOME_MTREE_ARGS} ${PREFIX} + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/misc/gnomehier/files/pkg-install.in b/misc/gnomehier/files/pkg-install.in new file mode 100644 index 000000000..20e30328e --- /dev/null +++ b/misc/gnomehier/files/pkg-install.in @@ -0,0 +1,8 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + /usr/sbin/mtree %%MTREE_ARGS%% ${PKG_PREFIX} + exit 0 + ;; +esac |