From owner-svn-ports-all@FreeBSD.ORG Fri Apr 26 17:36:47 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 79B97EFB; Fri, 26 Apr 2013 17:36:47 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6CCC01507; Fri, 26 Apr 2013 17:36:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QHalSM077295; Fri, 26 Apr 2013 17:36:47 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3QHakbj077293; Fri, 26 Apr 2013 17:36:46 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201304261736.r3QHakbj077293@svn.freebsd.org> From: Marcus von Appen Date: Fri, 26 Apr 2013 17:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316628 - in head/devel: ecb guichan X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 17:36:47 -0000 Author: mva Date: Fri Apr 26 17:36:46 2013 New Revision: 316628 URL: http://svnweb.freebsd.org/changeset/ports/316628 Log: - Trim Makefile headers - Convert to new options framework Modified: head/devel/ecb/Makefile (contents, props changed) head/devel/guichan/Makefile Modified: head/devel/ecb/Makefile ============================================================================== --- head/devel/ecb/Makefile Fri Apr 26 17:29:05 2013 (r316627) +++ head/devel/ecb/Makefile Fri Apr 26 17:36:46 2013 (r316628) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ecb -# Date created: 25 January 2002 -# Whom: Kimura Fuyuki -# +# Created by: Kimura Fuyuki # $FreeBSD$ -# PORTNAME= ecb PORTVERSION= 2.40 @@ -29,29 +25,28 @@ ALL_TARGET= ecb INFO= ecb -OPTIONS= CEDET "Use the Cedet library" On \ - ICONS "Install ecb's icons" On +OPTIONS_DEFINE= CEDET ICONS DOCS +OPTIONS_DEFAULT= CEDET ICONS +CEDET_DESC= Use the Cedet library -.include +PORTDOCS= NEWS README RELEASE_NOTES -.if defined(WITHOUT_CEDET) -BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic -RUN_DEPENDS+= ${BUILD_DEPENDS} -MAKE_ARGS= CEDET="" -.else +.include + +.if ${PORT_OPTIONS:MCEDET} BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet RUN_DEPENDS+= ${BUILD_DEPENDS} MAKE_ARGS= CEDET=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet -.endif - -.if defined(WITHOUT_ICONS) -PLIST_SUB+= ICONS="@comment " .else -PLIST_SUB+= ICONS="" +BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic +RUN_DEPENDS+= ${BUILD_DEPENDS} +MAKE_ARGS= CEDET="" .endif -.if !defined(NOPORTDOCS) -PORTDOCS= NEWS README RELEASE_NOTES +.if ${PORT_OPTIONS:MICONS} +PLIST_SUB+= ICONS="" +.else +PLIST_SUB+= ICONS="@comment " .endif post-patch: @@ -69,7 +64,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/ecb.info ${PREFIX}/info -.if !defined(WITHOUT_ICONS) +.if ${PORT_OPTIONS:MICONS} .for i in ${ICONSUBDIRS} ${MKDIR} ${ICONDIR}/default/${i} ${INSTALL_DATA} ${ICONSRC}/default/${i}/*.xpm ${ICONDIR}/default/${i} @@ -82,11 +77,11 @@ do-install: ${ICONDIR}/methods/height-14_to_21 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.include +.include Modified: head/devel/guichan/Makefile ============================================================================== --- head/devel/guichan/Makefile Fri Apr 26 17:29:05 2013 (r316627) +++ head/devel/guichan/Makefile Fri Apr 26 17:36:46 2013 (r316628) @@ -1,9 +1,5 @@ -# New ports collection makefile for: guichan -# Date created: 2005-10-03 -# Whom: Tobias Gion -# +# Created by: Tobias Gion # $FreeBSD$ -# PORTNAME= guichan PORTVERSION= 0.8.2 @@ -12,7 +8,7 @@ CATEGORIES= devel games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= mva@FreeBSD.org -COMMENT= A small, efficient C++ GUI library designed for games +COMMENT= Small, efficient C++ GUI library designed for games USE_AUTOTOOLS= libtool USE_GMAKE= yes @@ -23,13 +19,12 @@ USES= pathfix CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= SDL "Enable SDL support" On \ - ALLEGRO "Enable Allegro support" Off \ - GL "Enable OpenGL support" On +OPTIONS_DEFINE= SDL ALLEGRO OPENGL +ALLEGRO_DESC= Allegro support -.include +.include -.if !defined(WITHOUT_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl image CONFIGURE_ARGS+=--enable-sdl --enable-sdlimage PLIST_SUB+= SDL="" @@ -38,7 +33,7 @@ CONFIGURE_ARGS+=--disable-sdl --disable- PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_ALLEGRO) +.if ${PORT_OPTIONS:MALLEGRO} LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro CONFIGURE_ARGS+=--enable-allegro PLIST_SUB+= ALLEGRO="" @@ -47,7 +42,7 @@ CONFIGURE_ARGS+=--disable-allegro PLIST_SUB+= ALLEGRO="@comment " .endif -.if !defined(WITHOUT_GL) +.if ${PORT_OPTIONS:MGL} USE_GL= yes CONFIGURE_ARGS+=--enable-opengl PLIST_SUB+= GL="" @@ -56,4 +51,4 @@ CONFIGURE_ARGS+=--disable-opengl PLIST_SUB+= GL="@comment " .endif -.include +.include