From owner-svn-ports-all@FreeBSD.ORG  Wed Nov 20 20:58:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 649B9810;
 Wed, 20 Nov 2013 20:58:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5449B291A;
 Wed, 20 Nov 2013 20:58:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKKwdKL066240;
 Wed, 20 Nov 2013 20:58:39 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKKwd2U066239;
 Wed, 20 Nov 2013 20:58:39 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311202058.rAKKwd2U066239@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 20 Nov 2013 20:58:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334453 - head/www/mod_wsgi
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.16
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: Wed, 20 Nov 2013 20:58:39 -0000

Author: sunpoet
Date: Wed Nov 20 20:58:38 2013
New Revision: 334453
URL: http://svnweb.freebsd.org/changeset/ports/334453

Log:
  - Update MASTER_SITES
  - Update CONFLICTS
  - Support STAGEDIR
  - While I'm here, update USE_PYTHON
  
  PR:		ports/184065
  Submitted by:	Douglas William Thrift <douglas@douglasthrift.net> (maintainer)

Modified:
  head/www/mod_wsgi/Makefile

Modified: head/www/mod_wsgi/Makefile
==============================================================================
--- head/www/mod_wsgi/Makefile	Wed Nov 20 20:51:25 2013	(r334452)
+++ head/www/mod_wsgi/Makefile	Wed Nov 20 20:58:38 2013	(r334453)
@@ -5,9 +5,7 @@ PORTNAME=	mod_wsgi
 PORTVERSION=	2.8
 PORTREVISION=	2
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://apt.douglasthrift.net/files/${PORTNAME}/ \
-		http://code.douglasthrift.net/files/${PORTNAME}/
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	douglas@douglasthrift.net
@@ -17,12 +15,12 @@ LICENSE=	AL2
 
 
 LATEST_LINK=	mod_wsgi2
-CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.*
+CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* ${PKGNAMEPREFIX}mod_wsgi3.* mod_wsgi-3.*
 
 PROJECTHOST=	modwsgi
 
 USE_APACHE=	22
-USE_PYTHON=	2.5-2.7
+USE_PYTHON=	-2.7
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
@@ -31,7 +29,6 @@ SUB_FILES=	pkg-message
 
 PORTSCOUT=	limit:^2\.
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG} "======================= ATTENTION! ======================"
 	@${ECHO_MSG}
@@ -42,6 +39,5 @@ pre-everything::
 
 post-install:
 	@${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/${MODULENAME}.so"
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>