diff options
| author | timur <timur@FreeBSD.org> | 2013-11-21 06:32:47 +0800 |
|---|---|---|
| committer | timur <timur@FreeBSD.org> | 2013-11-21 06:32:47 +0800 |
| commit | 77104f880064fc0ffb8423dcd18a5d2651d0acaa (patch) | |
| tree | dd8866954441633412edb372b800d3a16b7bae86 /net | |
| parent | 63c15c980319f37a487373d3d39aab36b448a970 (diff) | |
| download | freebsd-ports-gnome-77104f880064fc0ffb8423dcd18a5d2651d0acaa.tar.gz freebsd-ports-gnome-77104f880064fc0ffb8423dcd18a5d2651d0acaa.tar.zst freebsd-ports-gnome-77104f880064fc0ffb8423dcd18a5d2651d0acaa.zip | |
Fix STAGEDIR packaging problems in pkg-install script
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba4/Makefile | 4 | ||||
| -rw-r--r-- | net/samba4/files/pkg-install.in | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 438b2b65e1a4..94265b0f00c6 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_PORTNAME} PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba/stable samba/rc @@ -519,6 +519,8 @@ post-install: . endfor @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .endif +# Run post-install script + @${SETENV} STAGEDIR=${STAGEDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if ${PORT_OPTIONS:MDEVELOPER} test: build diff --git a/net/samba4/files/pkg-install.in b/net/samba4/files/pkg-install.in index f4fac0b56cca..2097c3f90a51 100644 --- a/net/samba4/files/pkg-install.in +++ b/net/samba4/files/pkg-install.in @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin @@ -11,21 +11,20 @@ SAMBA4_OWNER=root SAMBA4_GROUP=wheel INSTALL_DATA="install -c -m 0444" INSTALL_DIR="install -d -m 0755" -CHMOD="chmod" post-install() { if [ $(id -u) -eq 0 ]; then INSTALL_DATA="${INSTALL_DATA} -o ${SAMBA4_OWNER} -g ${SAMBA4_GROUP}" INSTALL_DIR="${INSTALL_DIR} -o ${SAMBA4_OWNER} -g ${SAMBA4_GROUP}" fi - ${INSTALL_DIR} ${SAMBA4_LOGDIR} - ${INSTALL_DIR} ${SAMBA4_RUNDIR} - ${INSTALL_DIR} ${SAMBA4_LOCKDIR} - ${INSTALL_DIR} ${SAMBA4_MODULEDIR} - ${INSTALL_DIR} ${SAMBA4_PRIVATEDIR} + ${INSTALL_DIR} ${STAGEDIR}${SAMBA4_LOGDIR} + ${INSTALL_DIR} ${STAGEDIR}${SAMBA4_RUNDIR} + ${INSTALL_DIR} ${STAGEDIR}${SAMBA4_LOCKDIR} + ${INSTALL_DIR} ${STAGEDIR}${SAMBA4_MODULEDIR} + ${INSTALL_DIR} ${STAGEDIR}${SAMBA4_PRIVATEDIR} for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount \ process_model service vfs; do - ${INSTALL_DIR} "${SAMBA4_MODULEDIR}/${dir}" + ${INSTALL_DIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" done } |