From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 17 16:30:50 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 2111C93B;
 Mon, 17 Dec 2012 16:30:50 +0000 (UTC)
 (envelope-from jadawin@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 DB4D78FC16;
 Mon, 17 Dec 2012 16:30:49 +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 qBHGUn8c023438;
 Mon, 17 Dec 2012 16:30:49 GMT (envelope-from jadawin@svn.freebsd.org)
Received: (from jadawin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHGUnMG023436;
 Mon, 17 Dec 2012 16:30:49 GMT (envelope-from jadawin@svn.freebsd.org)
Message-Id: <201212171630.qBHGUnMG023436@svn.freebsd.org>
From: Philippe Audeoud <jadawin@FreeBSD.org>
Date: Mon, 17 Dec 2012 16:30:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309110 - head/net-p2p/rtgui
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Mon, 17 Dec 2012 16:30:50 -0000

Author: jadawin
Date: Mon Dec 17 16:30:49 2012
New Revision: 309110
URL: http://svnweb.freebsd.org/changeset/ports/309110

Log:
  - Update to 0.2.81
  - Convert to new options framework
  - Patch php files because of php 5.4 issues not corrected upstream

Modified:
  head/net-p2p/rtgui/Makefile   (contents, props changed)
  head/net-p2p/rtgui/distinfo   (contents, props changed)

Modified: head/net-p2p/rtgui/Makefile
==============================================================================
--- head/net-p2p/rtgui/Makefile	Mon Dec 17 16:22:47 2012	(r309109)
+++ head/net-p2p/rtgui/Makefile	Mon Dec 17 16:30:49 2012	(r309110)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rtgui
-PORTVERSION=	0.2.7
-PORTREVISION=	3
+PORTVERSION=	0.2.81
 CATEGORIES=	net-p2p www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 EXTRACT_SUFX=	.tgz
@@ -10,17 +9,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	A web based front end for rTorrent
 
-OPTIONS=	APACHE "Use Apache for web interface" On \
-		LIGHTTPD "Use LightHTTPD for web interface" Off
+OPTIONS_DEFINE=	APACHE LIGHTTPD
+
+OPTIONS_RADIO=	HTTP
+OPTIONS_RADIO_HTTP=	APACHE LIGHTTPD
+OPTIONS_DEFAULTS=	APACHE
 
 BUILD_DEPENDS+=	xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:${PORTSDIR}/www/mod_scgi
-.elif defined(WITH_LIGHTTPD)
+.endif
+
+.if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
@@ -35,12 +39,18 @@ SUB_FILES=	pkg-message
 SUB_LIST=	WWWDIR=${WWWDIR} \
 		PORTNAME=${PORTNAME}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's/import_request_variables("gp","r_")/extract(\$_REQUEST, EXTR_PREFIX_ALL|EXTR_REFS, "r")/' ${WRKSRC}/*.php
+	@${FIND} ${WRKSRC} -name "*.bak" -delete
+
 do-install:
 	${MKDIR} ${WWWDIR}
+	${RM} ${WRKSRC}/functions.php~
+	${RM} ${WRKSRC}/index.php~
 	${CP} -r ${WRKSRC}/* ${WWWDIR}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-p2p/rtgui/distinfo
==============================================================================
--- head/net-p2p/rtgui/distinfo	Mon Dec 17 16:22:47 2012	(r309109)
+++ head/net-p2p/rtgui/distinfo	Mon Dec 17 16:30:49 2012	(r309110)
@@ -1,2 +1,2 @@
-SHA256 (rtgui-0.2.7.tgz) = 8548f0aaca5d275a8c698a7ce9e53a553e7034b95e034f3f07f16154de27281b
-SIZE (rtgui-0.2.7.tgz) = 49272
+SHA256 (rtgui-0.2.81.tgz) = 75890ed99ac39afa473063d85acfc9f29219a4d6a54e6e1e1d0d0dd4942be7da
+SIZE (rtgui-0.2.81.tgz) = 57152