From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 17 21:08:55 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D07DF1F9;
 Sun, 17 Nov 2013 21:08:55 +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 A7747245F;
 Sun, 17 Nov 2013 21:08:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHL8tmo064625;
 Sun, 17 Nov 2013 21:08:55 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHL8tAL064618;
 Sun, 17 Nov 2013 21:08:55 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201311172108.rAHL8tAL064618@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 17 Nov 2013 21:08:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334123 - in head/net-mgmt/xymon-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.16
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, 17 Nov 2013 21:08:55 -0000

Author: feld
Date: Sun Nov 17 21:08:54 2013
New Revision: 334123
URL: http://svnweb.freebsd.org/changeset/ports/334123

Log:
  Fix LDAP option
  Fix directory permission issue
  
  PR:		ports/183976
  Approved by:	swills (mentor)

Modified:
  head/net-mgmt/xymon-server/Makefile
  head/net-mgmt/xymon-server/files/Makefile
  head/net-mgmt/xymon-server/pkg-plist

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Sun Nov 17 21:04:12 2013	(r334122)
+++ head/net-mgmt/xymon-server/Makefile	Sun Nov 17 21:08:54 2013	(r334123)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.12
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}

Modified: head/net-mgmt/xymon-server/files/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/files/Makefile	Sun Nov 17 21:04:12 2013	(r334122)
+++ head/net-mgmt/xymon-server/files/Makefile	Sun Nov 17 21:08:54 2013	(r334123)
@@ -60,9 +60,9 @@ DOSSL = yes
 #
 ifdef WITH_LDAP
 # OpenLDAP settings
-LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS
+LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS -DHAVE_LDAP
 LDAPINCDIR = -I${PREFIX}/include
-LDAPLIBS = -L${PREFIX}/lib -lldap
+LDAPLIBS = -L${PREFIX}/lib -lldap -llber
 RPATHVAL += ${PREFIX}/lib
 RPATHVAL += /usr/local/lib
 DOLDAP = yes

Modified: head/net-mgmt/xymon-server/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-server/pkg-plist	Sun Nov 17 21:04:12 2013	(r334122)
+++ head/net-mgmt/xymon-server/pkg-plist	Sun Nov 17 21:08:54 2013	(r334123)
@@ -467,6 +467,7 @@ man/man8/xymonproxy.8
 @exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep
 @exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap
 @exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml
+@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www
 @dirrm %%WWWDIR%%/server/www/wml
 @dirrm %%WWWDIR%%/server/www/snap
 @dirrm %%WWWDIR%%/server/www/rep