From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  5 18:25:27 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 497436E9;
 Sun,  5 Oct 2014 18:25:27 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1AC5992C;
 Sun,  5 Oct 2014 18:25:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s95IPQVb035636;
 Sun, 5 Oct 2014 18:25:26 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s95IPQns035635;
 Sun, 5 Oct 2014 18:25:26 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201410051825.s95IPQns035635@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 5 Oct 2014 18:25:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r370101 - head/net/openldap24-server
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 18:25:27 -0000

Author: tijl
Date: Sun Oct  5 18:25:26 2014
New Revision: 370101
URL: https://svnweb.freebsd.org/changeset/ports/370101
QAT: https://qat.redports.org/buildarchive/r370101/

Log:
  Allow installing contrib modules in a different prefix than /usr/local
  
  PR:		194160
  Submitted by:	jhujhiti@adjectivism.org

Modified:
  head/net/openldap24-server/Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
+++ head/net/openldap24-server/Makefile	Sun Oct  5 18:25:26 2014	(r370101)
@@ -514,12 +514,14 @@ test: build
 post-build:
 	@${DO_NADA}
 .if ${PORT_OPTIONS:MSMBPWD}
-	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all)
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} DEFS="-DDO_SAMBA" prefix="${PREFIX}" all)
 .endif
 .if ${PORT_OPTIONS:MSHA2}
-	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endif
 .endif
 
@@ -542,13 +544,15 @@ post-install:
 .else
 	@${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
 .if ${PORT_OPTIONS:MSMBPWD}
-	@(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
+	@(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
 .endif
 .if ${PORT_OPTIONS:MSHA2}
-	@(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
+	@(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
 .endif
 .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}