From nobody@FreeBSD.org  Wed Aug 17 17:11:32 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB594106567B
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Aug 2011 17:11:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id AB0798FC27
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Aug 2011 17:11:32 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7HHBWBL029726
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Aug 2011 17:11:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7HHBVHe029725;
	Wed, 17 Aug 2011 17:11:31 GMT
	(envelope-from nobody)
Message-Id: <201108171711.p7HHBVHe029725@red.freebsd.org>
Date: Wed, 17 Aug 2011 17:11:31 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] lang/python27: fix pkg-plist in case of building with WITHOUT_THREADS
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         159842
>Category:       ports
>Synopsis:       [PATCH] lang/python27: fix pkg-plist in case of building with WITHOUT_THREADS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 17 17:20:01 UTC 2011
>Closed-Date:    Fri Aug 19 13:12:58 UTC 2011
>Last-Modified:  Fri Aug 19 13:12:58 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
Fix pkg-plist of lang/python27 in case of installing with WITHOUT_THREADS knob set. Python doesn't install %%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so in that case.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa python27.orig/Makefile python27/Makefile
--- python27.orig/Makefile	2011-08-16 16:55:53.000000000 +0400
+++ python27/Makefile	2011-08-16 17:57:53.000000000 +0400
@@ -6,7 +6,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -83,6 +83,7 @@
 CFLAGS+=	-D__wchar_t=wchar_t
 
 .if !defined(WITHOUT_THREADS)
+PLIST_SUB+=		THREADS=""
 .if defined(WITH_PTH)
 BROKEN=			does not build with PTH enabled
 CONFIGURE_ARGS+=	--with-pth
@@ -103,6 +104,7 @@
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
 .else # defined(WITHOUT_THREADS)
+PLIST_SUB+=		THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
 .if defined(LDFLAGS)
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
diff -ruNa python27.orig/pkg-plist python27/pkg-plist
--- python27.orig/pkg-plist	2011-06-27 13:22:10.000000000 +0400
+++ python27/pkg-plist	2011-08-16 17:38:00.000000000 +0400
@@ -860,7 +860,7 @@
 %%PYTHON_LIBDIR%%/lib-dynload/_locale.so
 %%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
 %%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
-%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
+%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
 %%PYTHON_LIBDIR%%/lib-dynload/_random.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha512.so


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 17 17:20:12 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159842 
Responsible-Changed-From-To: freebsd-python->lwhsu 
Responsible-Changed-By: lwhsu 
Responsible-Changed-When: Thu Aug 18 17:41:16 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159842 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/159842: commit references a PR
Date: Fri, 19 Aug 2011 13:09:38 +0000 (UTC)

 lwhsu       2011-08-19 13:09:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     lang/python26        Makefile pkg-plist 
     lang/python27        Makefile pkg-plist 
     lang/python31        Makefile pkg-plist 
     lang/python32        Makefile pkg-plist 
   Log:
   - Fix pkg-plist when building with WITHOUT_THREADS
   
   PR:             ports/159842
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   
   Revision  Changes    Path
   1.173     +2 -0      ports/lang/python26/Makefile
   1.85      +1 -1      ports/lang/python26/pkg-plist
   1.176     +2 -0      ports/lang/python27/Makefile
   1.86      +1 -1      ports/lang/python27/pkg-plist
   1.171     +3 -1      ports/lang/python31/Makefile
   1.87      +1 -1      ports/lang/python31/pkg-plist
   1.175     +3 -1      ports/lang/python32/Makefile
   1.91      +1 -1      ports/lang/python32/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Fri Aug 19 13:11:51 UTC 2011 
State-Changed-Why:  
Committed. Thanks!  PORTREVISION did not be bumped since WITHOUT_THREADS 
is not default.  And also fixed other versions. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159842 
>Unformatted:
