From owner-svn-ports-all@FreeBSD.ORG Mon Nov 5 22:17:45 2012 Return-Path: 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 8730E8A7; Mon, 5 Nov 2012 22:17:45 +0000 (UTC) (envelope-from rakuco@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 530E38FC16; Mon, 5 Nov 2012 22:17:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5MHjar000944; Mon, 5 Nov 2012 22:17:45 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5MHjiC000942; Mon, 5 Nov 2012 22:17:45 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201211052217.qA5MHjiC000942@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 5 Nov 2012 22:17:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307041 - in head/devel/flyspray: . 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-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: Mon, 05 Nov 2012 22:17:45 -0000 Author: rakuco Date: Mon Nov 5 22:17:44 2012 New Revision: 307041 URL: http://svnweb.freebsd.org/changeset/ports/307041 Log: - Replace patch in files/ with a combination of ${REINPLACE_CMD} and USE_DOS2UNIX so we can avoid having to set the svn:eol-style property in the patch. - Convert to OptionsNG. - Trim Makefile header. PR: ports/173183 Submitted by: Chris Petrik , Nick Hilliard (maintainer) Feature safe: yes Deleted: head/devel/flyspray/files/patch-includes-fix.inc.php Modified: head/devel/flyspray/Makefile Modified: head/devel/flyspray/Makefile ============================================================================== --- head/devel/flyspray/Makefile Mon Nov 5 22:17:15 2012 (r307040) +++ head/devel/flyspray/Makefile Mon Nov 5 22:17:44 2012 (r307041) @@ -1,12 +1,9 @@ -# New ports collection makefile for: flyspray -# Date created: 2003.08.28 -# Whom: Nick Hilliard -# +# Created by: Nick Hilliard # $FreeBSD$ -# PORTNAME= flyspray PORTVERSION= 0.9.9.7 +PORTREVISION= 1 CATEGORIES= devel www MASTER_SITES= http://flyspray.org/ @@ -22,10 +19,14 @@ WANT_PHP_WEB= yes NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= GRAPHVIZ "Install Graphviz for task dependency graphs" off \ - MYSQL "Use MySQL Database Interface" off \ - MYSQLI "Use MySQLi Database Interface" on \ - POSTGRES "Use PostgreSQL Database Interface" off +USE_DOS2UNIX= yes +DOS2UNIX_REGEX= .php + +OPTIONS_DEFINE= GRAPHVIZ MYSQL MYSQLI POSTGRES +OPTIONS_DEFAULT= MYSQLI + +MYSQLI_DESC= Use MySQLi Database Interface +POSTGRES_DESC= Use PostgreSQL Database Interface FLYSPRAYDIR= ${PREFIX}/share/${PORTNAME} ATTACHMENTDIR= ${DBDIR}/${PORTNAME}/attachments @@ -53,21 +54,21 @@ SUB_LIST+= FLYSPRAYDIR="${FLYSPRAYDIR}" WWWGRP="${WWWGRP}" \ WWWOWN="${WWWOWN}" -.include +.include -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysql .endif -.if !defined(WITHOUT_MYSQLI) +.if ${PORT_OPTIONS:MMYSQLI} USE_PHP+= mysqli .endif -.if defined(WITH_POSTGRES) +.if ${PORT_OPTIONS:MPOSTGRES} USE_PHP+= pgsql .endif -.if defined(WITH_GRAPHVIZ) +.if ${PORT_OPTIONS:MGRAPHVIZ} RUN_DEPENDS+= ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz .endif @@ -77,6 +78,8 @@ post-patch: -e "s|%%DOCSDIR%%|"${DOCSDIR}"|g" \ ${WRKSRC}/docs/README.FreeBSD @${FIND} ${WRKSRC} -name \*.orig -exec ${RM} '{}' ';' + @${REINPLACE_CMD} "s|E_ALL|E_ALL \& ~E_STRICT|g" \ + ${WRKSRC}/includes/fix.inc.php do-install: ${MKDIR} ${FLYSPRAYDIR} @@ -102,4 +105,4 @@ install-doc: .endfor .endif -.include +.include