From owner-svn-ports-all@FreeBSD.ORG  Sat Sep  8 09:58:58 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F2E0D106564A;
	Sat,  8 Sep 2012 09:58:57 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C48E48FC0C;
	Sat,  8 Sep 2012 09:58:57 +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 q889wvlW063070;
	Sat, 8 Sep 2012 09:58:57 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q889wvjj063068;
	Sat, 8 Sep 2012 09:58:57 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201209080958.q889wvjj063068@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sat, 8 Sep 2012 09:58:57 +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: r303885 - head/devel/ccache
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: Sat, 08 Sep 2012 09:58:58 -0000

Author: ehaupt
Date: Sat Sep  8 09:58:57 2012
New Revision: 303885
URL: http://svn.freebsd.org/changeset/ports/303885

Log:
  - Use OPTIONSng
  - Remove deprecated header information

Modified:
  head/devel/ccache/Makefile

Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile	Sat Sep  8 09:41:16 2012	(r303884)
+++ head/devel/ccache/Makefile	Sat Sep  8 09:58:57 2012	(r303885)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	ccache
-# Date created:				31/03/2002
-# Whom:					Dominic Marks <d.marks@student.umist.ac.uk>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	ccache
 PORTVERSION=	3.1.8
@@ -25,11 +20,12 @@ MAN1=		ccache.1
 
 PORTDOCS=	ccache-howto-freebsd.txt MANUAL.html
 
-OPTIONS=	CLANGLINK	"Create clang compiler links if clang is installed" off \
-		LLVMLINK	"Create llvm compiler links if llvm is installed" off \
-		STATIC		"Statically build ccache" off
+OPTIONS_DEFINE=	CLANGLINK LLVMLINK STATIC
 
-.include <bsd.port.pre.mk>
+CLANGLINK_DESC=	Create clang compiler links if clang is installed
+LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
+
+.include <bsd.port.options.mk>
 
 PLIST_SUB+=	CCLINKDIR="${CCLINKDIR}"
 
@@ -40,15 +36,15 @@ CCACHE_COMPILERS+=	icc icpc
 GNU_COMPILERS+=		34 42 43 44 45 46 47 48
 CCACHE_COMPILERS+=	cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
 
-.if defined(WITH_CLANGLINK)
+.if ${PORT_OPTIONS:MCLANGLINK}
 CCACHE_COMPILERS+=	clang clang++
 .endif
 
-.if defined(WITH_LLVMLINK)
+.if ${PORT_OPTIONS:MLLVMLINK}
 CCACHE_COMPILERS+=	llvm-gcc llvm-c++ llvm-g++
 .endif
 
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 LDFLAGS+=		"--static"
 .endif
 
@@ -88,8 +84,8 @@ post-install:
 	@${ECHO_CMD} "Creating compiler links..."
 	@${PREFIX}/bin/ccache-update-links -v
 	@${CAT} ${PKGMESSAGE}
-.if defined(WITH_CLANGLINK)
+.if ${PORT_OPTIONS:MCLANGLINK}
 	@${CAT} ${FILESDIR}/pkg-message-clang
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>