Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 20 Nov 2013 22:32:47 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334463 - in head/net/samba4: . files
Message-ID:  <201311202232.rAKMWlbX099940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311202232.rAKMWlbX099940>