svn commit: r314173 - in head/net/openldap24-server: . files

[Xin LI]

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