From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 14 18:00:58 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4D7AD781;
 Thu, 14 Mar 2013 18:00:58 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FEF6CE;
 Thu, 14 Mar 2013 18:00:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2EI0wVS062520;
 Thu, 14 Mar 2013 18:00:58 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2EI0vfV062517;
 Thu, 14 Mar 2013 18:00:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201303141800.r2EI0vfV062517@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 14 Mar 2013 18:00:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314173 - in head/net/openldap24-server: . 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.14
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: Thu, 14 Mar 2013 18:00:58 -0000

Author: delphij
Date: Thu Mar 14 18:00:57 2013
New Revision: 314173
URL: http://svnweb.freebsd.org/changeset/ports/314173

Log:
   - Fix build when SMBPASSWD is checked [1];
   - Use OPTIONSFILE?= instead of OPTIONSFILE= [2].
  
  PR:		ports/176873 [1]
  Submitted by:	"A.J. Kehoe IV (Nanoman)" <nanoman nanoman ca> [2]

Modified:
  head/net/openldap24-server/Makefile
  head/net/openldap24-server/files/patch-smbk5pwd-Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Thu Mar 14 17:18:04 2013	(r314172)
+++ head/net/openldap24-server/Makefile	Thu Mar 14 18:00:57 2013	(r314173)
@@ -29,7 +29,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-
 .else
 PKGNAMESUFFIX?=		-server
 # Do not use ${PKGNAMESUFFIX} here has it can change later
-OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}24-server/options
+OPTIONSFILE?=		${PORT_DBDIR}/${PORTNAME}24-server/options
 .endif
 EXTRACT_SUFX=		.tgz
 

Modified: head/net/openldap24-server/files/patch-smbk5pwd-Makefile
==============================================================================
--- head/net/openldap24-server/files/patch-smbk5pwd-Makefile	Thu Mar 14 17:18:04 2013	(r314172)
+++ head/net/openldap24-server/files/patch-smbk5pwd-Makefile	Thu Mar 14 18:00:57 2013	(r314173)
@@ -1,6 +1,6 @@
 --- contrib/slapd-modules/smbk5pwd/Makefile.orig	2013-03-03 13:17:30.000000000 -0800
-+++ contrib/slapd-modules/smbk5pwd/Makefile	2013-03-11 15:58:44.155103784 -0700
-@@ -24,17 +24,16 @@
++++ contrib/slapd-modules/smbk5pwd/Makefile	2013-03-14 10:54:56.917578861 -0700
+@@ -24,13 +24,12 @@
  HEIMDAL_INC = -I/usr/heimdal/include
  HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
  
@@ -15,8 +15,3 @@
  
  PROGRAMS = smbk5pwd.la
  LTVER = 0:0:0
--
-+	-rpath $(PREFIX)/libexec/openldap -module -o $@ $? $(LIBS)
- prefix=/usr/local
- exec_prefix=$(prefix)
- ldap_subdir=/openldap