From owner-svn-ports-head@freebsd.org  Fri Jan  8 15:10:24 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2272A68BC2;
 Fri,  8 Jan 2016 15:10:24 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 67CFD1E97;
 Fri,  8 Jan 2016 15:10:24 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u08FANkc074995;
 Fri, 8 Jan 2016 15:10:23 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08FAN47074993;
 Fri, 8 Jan 2016 15:10:23 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601081510.u08FAN47074993@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 8 Jan 2016 15:10:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405562 - in head/security/medusa: . 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2016 15:10:24 -0000

Author: amdmi3
Date: Fri Jan  8 15:10:23 2016
New Revision: 405562
URL: https://svnweb.freebsd.org/changeset/ports/405562

Log:
  - Switch to options helpers
  - Fix svn module build

Added:
  head/security/medusa/files/patch-configure   (contents, props changed)
Modified:
  head/security/medusa/Makefile

Modified: head/security/medusa/Makefile
==============================================================================
--- head/security/medusa/Makefile	Fri Jan  8 15:02:52 2016	(r405561)
+++ head/security/medusa/Makefile	Fri Jan  8 15:10:23 2016	(r405562)
@@ -3,6 +3,7 @@
 
 PORTNAME=	medusa
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.foofus.net/~jmk/tools/ \
 		http://redundancy.redundancy.org/mirror/
@@ -23,30 +24,21 @@ CONFIGURE_ARGS=	--enable-module-ncp=no -
 OPTIONS_DEFINE=	SVN PGSQL DOCS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSVN}
-LIB_DEPENDS+=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
-CFLAGS+=	-I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
-.else
-CONFIGURE_ARGS+=	--enable-module-svn=no
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-CONFIGURE_ARGS+=	--enable-module-postgres
-.else
-CONFIGURE_ARGS+=	--enable-module-postgres=no
-.endif
+SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+SVN_CFLAGS=		-I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
+SVN_CONFIGURE_OFF=	--enable-module-svn=no
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--enable-module-postgres
+PGSQL_CONFIGURE_OFF=	--enable-module-postgres=no
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_medusa \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_medusa
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Added: head/security/medusa/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/medusa/files/patch-configure	Fri Jan  8 15:10:23 2016	(r405562)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-05-25 21:59:32 UTC
++++ configure
+@@ -6139,7 +6139,7 @@ fi
+ 
+ if test -n "$APR_CONFIG"; then
+ 
+-  if test x`$APR_CONFIG --cc` = "xcc"; then
++  if false; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  *** Apache (apr) was compiled using Sun C compiler and not GNU gcc. ***
+ 
+     \"$APR_CONFIG --cc\" responded with \"cc\", which usually means that your build of Apache