From owner-svn-ports-all@FreeBSD.ORG Wed Apr 16 22:31:34 2014 Return-Path: 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 2DB72D85; Wed, 16 Apr 2014 22:31:34 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E8241AEB; Wed, 16 Apr 2014 22:31:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GMVXk2073824; Wed, 16 Apr 2014 22:31:33 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GMVXLE073817; Wed, 16 Apr 2014 22:31:33 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201404162231.s3GMVXLE073817@svn.freebsd.org> From: Olli Hauer Date: Wed, 16 Apr 2014 22:31:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351425 - in head/www: mod_python33 mod_python33/files mod_python35 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.17 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: Wed, 16 Apr 2014 22:31:34 -0000 Author: ohauer Date: Wed Apr 16 22:31:32 2014 New Revision: 351425 URL: http://svnweb.freebsd.org/changeset/ports/351425 QAT: https://qat.redports.org/buildarchive/r351425/ Log: - fix filesystem touch before install (mod_python33) - add CONFLICTS_INSTALL - install egg-info to shut up the qa script (no cherry picking ;( - rework module installation - bump PORTREVISION Noted by swills@ Deleted: head/www/mod_python33/files/patch-Makefile.in Modified: head/www/mod_python33/Makefile head/www/mod_python33/pkg-plist head/www/mod_python35/Makefile head/www/mod_python35/pkg-plist Modified: head/www/mod_python33/Makefile ============================================================================== --- head/www/mod_python33/Makefile Wed Apr 16 22:27:38 2014 (r351424) +++ head/www/mod_python33/Makefile Wed Apr 16 22:31:32 2014 (r351425) @@ -3,7 +3,7 @@ PORTNAME= mod_python PORTVERSION= 3.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} MASTER_SITE_SUBDIR= modpython @@ -16,11 +16,12 @@ COMMENT= Apache module that embeds the P LICENSE= APACHE20 +CONFLICTS_INSTALL= ap2[24]-mod_python3[^3]* + USE_APACHE= 22 USE_PYTHON= yes USES= tar:tgz -INSTALLS_EGGINFO= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs="${APXS}" \ --with-python="${PYTHON_CMD}" \ @@ -29,6 +30,8 @@ CONFIGURE_ARGS+= --with-apxs="${APXS}" LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS+= APXS=${APXS} MAKE_ENV= EXPR_COMPAT=yes +PLIST_SUB+= PORTVERSION=${PORTVERSION} \ + PYTHON_VER=${PYTHON_VER} # You need to install apache & mod_python before you run this regression-test: build Modified: head/www/mod_python33/pkg-plist ============================================================================== --- head/www/mod_python33/pkg-plist Wed Apr 16 22:27:38 2014 (r351424) +++ head/www/mod_python33/pkg-plist Wed Apr 16 22:31:32 2014 (r351425) @@ -1,3 +1,4 @@ +%%PYTHON_SITELIBDIR%%/mod_python-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo @@ -35,7 +36,8 @@ %%PYTHON_SITELIBDIR%%/mod_python/util.py %%PYTHON_SITELIBDIR%%/mod_python/util.pyc %%PYTHON_SITELIBDIR%%/mod_python/util.pyo +@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F +@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F +@unexec echo "Don't forget to remove all mod_%%AP_NAME%%-related directives in your httpd.conf" @dirrm %%PYTHON_SITELIBDIR%%/mod_python Modified: head/www/mod_python35/Makefile ============================================================================== --- head/www/mod_python35/Makefile Wed Apr 16 22:27:38 2014 (r351424) +++ head/www/mod_python35/Makefile Wed Apr 16 22:31:32 2014 (r351425) @@ -3,6 +3,7 @@ PORTNAME= mod_python PORTVERSION= 3.5.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://dist.modpython.org/dist/ \ LOCAL/ohauer @@ -16,11 +17,12 @@ COMMENT= Apache module that embeds the P LICENSE= APACHE20 +CONFLICTS_INSTALL= ap2[24]-mod_python3[^5]* + USE_APACHE= 22+ USE_PYTHON= yes USES= tar:tgz -INSTALLS_EGGINFO= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs="${APXS}" \ --with-python="${PYTHON_CMD}" \ @@ -29,6 +31,8 @@ CONFIGURE_ARGS+= --with-apxs="${APXS}" LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS+= APXS=${APXS} MAKE_ENV= EXPR_COMPAT=yes +PLIST_SUB+= PORTVERSION=${PORTVERSION} \ + PYTHON_VER=${PYTHON_VER} # You need to install apache & mod_python before you run this regression-test: build Modified: head/www/mod_python35/pkg-plist ============================================================================== --- head/www/mod_python35/pkg-plist Wed Apr 16 22:27:38 2014 (r351424) +++ head/www/mod_python35/pkg-plist Wed Apr 16 22:31:32 2014 (r351425) @@ -1,4 +1,5 @@ bin/mod_python +%%PYTHON_SITELIBDIR%%/mod_python-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo @@ -42,7 +43,8 @@ bin/mod_python %%PYTHON_SITELIBDIR%%/mod_python/wsgi.py %%PYTHON_SITELIBDIR%%/mod_python/wsgi.pyc %%PYTHON_SITELIBDIR%%/mod_python/wsgi.pyo +@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F +@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F +@unexec echo "Don't forget to remove all mod_%%AP_NAME%%-related directives in your httpd.conf" @dirrm %%PYTHON_SITELIBDIR%%/mod_python