From owner-svn-ports-head@FreeBSD.ORG Wed Oct 3 13:17:33 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4DEF3106566B; Wed, 3 Oct 2012 13:17:33 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3928F8FC19; Wed, 3 Oct 2012 13:17:33 +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 q93DHXWf034498; Wed, 3 Oct 2012 13:17:33 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q93DHXPv034496; Wed, 3 Oct 2012 13:17:33 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201210031317.q93DHXPv034496@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 3 Oct 2012 13:17:32 +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: r305202 - head/x11-toolkits/fox16 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 13:17:33 -0000 Author: gahr Date: Wed Oct 3 13:17:32 2012 New Revision: 305202 URL: http://svn.freebsd.org/changeset/ports/305202 Log: - Convert to OptionsNG Modified: head/x11-toolkits/fox16/Makefile Modified: head/x11-toolkits/fox16/Makefile ============================================================================== --- head/x11-toolkits/fox16/Makefile Wed Oct 3 12:51:11 2012 (r305201) +++ head/x11-toolkits/fox16/Makefile Wed Oct 3 13:17:32 2012 (r305202) @@ -1,9 +1,5 @@ -# New ports collection makefile for: x11-toolkits/fox16 -# Date created: 28 Jul 2005 -# Whom: Alexander Novitsky -# +# Created by: Alexander Novitsky # $FreeBSD$ -# PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} @@ -36,60 +32,57 @@ MAN1= shutterbug.1 reswrap.1 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= XFT "Enable Xft support" on \ - SHM "Enable Shared Memory support" on \ - CUPS "Enable CUPS support" off \ - DEBUG "Build with DEBUG support" off \ - FOX_APPLICATIONS "Install sample applications" off \ - OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \ - PROFILING "Build with PROFILING support" off +OPTIONS_DEFINE= OPTIMIZED_CFLAGS CUPS DEBUG APPS PROFILE SHM XFT +OPTIONS_DEFAULT=SHM XFT +APPS_DESC= Install sample applications +SHM_DESC= Shared Memory support -.include +.include ## ## Additional Options ## # -.if defined(WITHOUT_XFT) -CONFIGURE_ARGS+= --with-xft=no -.else +.if ${PORT_OPTIONS:MXFT} CONFIGURE_ARGS+= --with-xft=yes CPPFLAGS+= `freetype-config --cflags` LDFLAGS+= `freetype-config --libs` +.else +CONFIGURE_ARGS+= --with-xft=no .endif # -.if defined(WITHOUT_SHM) -CONFIGURE_ARGS+= --with-xshm=no -.else +.if ${PORT_OPTIONS:MSHM} CONFIGURE_ARGS+= --with-xshm=yes +.else +CONFIGURE_ARGS+= --with-xshm=no .endif # -.if defined(WITH_CUPS) +.if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client .endif # -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .else CONFIGURE_ARGS+= --enable-release .endif # -.if defined(WITH_FOX_APPLICATIONS) +.if ${PORT_OPTIONS:MAPPS} MAN1+= PathFinder.1 adie.1 calculator.1 PLIST_SUB+= APPS="" .else PLIST_SUB+= APPS="@comment " .endif # -.if defined(WITH_OPTIMIZED_CXXFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} # turn distribution-recommended optimization flags back on CXXFLAGS+= -O2 -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations -.if !defined(WITH_PROFILING) # Incompatible with profiling flags +.if ${PORT_OPTIONS:MPROFILE} == "" # Incompatible with profiling flags CXXFLAGS+= -fomit-frame-pointer .endif .endif # -.if defined(WITH_PROFILING) +.if ${PORT_OPTIONS:MPROFILE} CONFIGURE_ARGS+= --with-profiling=gprof .endif @@ -111,12 +104,12 @@ post-patch: @${REINPLACE_CMD} -E -e \ 's|^(screenshotsdir).*$$|\1=${DOCSDIR}/html|' \ ${WRKSRC}/doc/screenshots/Makefile.in -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} == "" @${REINPLACE_CMD} -e \ '/^SUBDIRS/s/ doc//' \ ${WRKSRC}/Makefile.in .endif -.if !defined(WITH_FOX_APPLICATIONS) +.if ${PORT_OPTIONS:MAPPS} == "" @${REINPLACE_CMD} -E -e \ 's,^(SUBDIRS.*)adie,\1,; \ s,^(SUBDIRS.*)pathfinder,\1,; \ @@ -124,4 +117,4 @@ post-patch: ${WRKSRC}/Makefile.in .endif -.include +.include