From owner-svn-ports-all@FreeBSD.ORG  Thu Oct  4 07:37:10 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04F35106567F;
	Thu,  4 Oct 2012 07:37:10 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 910228FCE4;
	Thu,  4 Oct 2012 07:18:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q947Idlv092479;
	Thu, 4 Oct 2012 07:18:39 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q947Ideu092477;
	Thu, 4 Oct 2012 07:18:39 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201210040718.q947Ideu092477@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Oct 2012 07:18:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305237 - head/java/springframework
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2012 07:37:10 -0000

Author: bapt
Date: Thu Oct  4 07:18:39 2012
New Revision: 305237
URL: http://svn.freebsd.org/changeset/ports/305237

Log:
  Convert to new options framework

Modified:
  head/java/springframework/Makefile

Modified: head/java/springframework/Makefile
==============================================================================
--- head/java/springframework/Makefile	Thu Oct  4 07:16:12 2012	(r305236)
+++ head/java/springframework/Makefile	Thu Oct  4 07:18:39 2012	(r305237)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:            springframework
-# Date created:         02 Jan 2008
-# Whom:         Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	springframework
@@ -20,8 +17,8 @@ USE_JAVA=	yes
 USE_ZIP=	yes
 JAVA_VERSION=	1.5+
 
-OPTIONS=	DOCS    "Install docs & examples" on \
-		RESRCS  "Install resource files" off
+OPTIONS_DEFINE=	DOCS RESRCS
+RESRCS_DESC=	Install resource files
 
 JAR_FILES=	org.springframework.aop.jar \
 		org.springframework.asm.jar \
@@ -50,11 +47,7 @@ PLIST_FILES +=	%%JAVAJARDIR%%/${f}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_DOCS)
-NOPORTDOCS=	yes
-.endif
-
-.if defined(WITH_RESRCS)
+.if ${PORT_OPTIONS:MRESRCS}
 RESOURCE_FILES=	spring-aop-2.0.xsd \
 		spring-aop-2.5.xsd \
 		spring-aop-3.0.xsd \
@@ -96,7 +89,7 @@ PLIST_FILES +=	%%JAVASHAREDIR%%/${f}
 .endfor
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
@@ -105,13 +98,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/dist/${f:S/.jar/-${PORTVERSION}.RELEASE.jar/} \
 		${JAVAJARDIR}/${f}
 .endfor
-.if !defined(WITHOUT_RESRCS) || defined(WITH_RESRCS)
+.if ${PORT_OPTIONS:MRESRCS}
 .for f in ${RESOURCE_FILES}
 	@${INSTALL_DATA} `${FIND} "${WRKSRC}" -name ${f} -print` \
 		${JAVASHAREDIR}/${f}
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/changelog.txt ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}