From owner-svn-ports-head@FreeBSD.ORG Wed Nov 20 22:32:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79007FC9; Wed, 20 Nov 2013 22:32:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4EA1E2E59; Wed, 20 Nov 2013 22:32:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKMWmA0099942; Wed, 20 Nov 2013 22:32:48 GMT (envelope-from timur@svn.freebsd.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKMWlbX099940; Wed, 20 Nov 2013 22:32:47 GMT (envelope-from timur@svn.freebsd.org) Message-Id: <201311202232.rAKMWlbX099940@svn.freebsd.org> From: "Timur I. Bakeyev" Date: Wed, 20 Nov 2013 22:32:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334463 - in head/net/samba4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2013 22:32:48 -0000 Author: timur Date: Wed Nov 20 22:32:47 2013 New Revision: 334463 URL: http://svnweb.freebsd.org/changeset/ports/334463 Log: Fix STAGEDIR packaging problems in pkg-install script Modified: head/net/samba4/Makefile head/net/samba4/files/pkg-install.in Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Wed Nov 20 22:09:45 2013 (r334462) +++ head/net/samba4/Makefile Wed Nov 20 22:32:47 2013 (r334463) @@ -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 Modified: head/net/samba4/files/pkg-install.in ============================================================================== --- head/net/samba4/files/pkg-install.in Wed Nov 20 22:09:45 2013 (r334462) +++ head/net/samba4/files/pkg-install.in Wed Nov 20 22:32:47 2013 (r334463) @@ -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 }