From nobody@FreeBSD.org  Wed Oct 19 20:43:24 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 CA847106568B
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Oct 2011 20:43:24 +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 A12418FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Oct 2011 20:43:24 +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 p9JKhOmN050653
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Oct 2011 20:43:24 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p9JKhOcl050647;
	Wed, 19 Oct 2011 20:43:24 GMT
	(envelope-from nobody)
Message-Id: <201110192043.p9JKhOcl050647@red.freebsd.org>
Date: Wed, 19 Oct 2011 20:43:24 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] databases/postgresql-plpython: fix plist
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         161822
>Category:       ports
>Synopsis:       [MAINTAINER] databases/postgresql-plpython: fix plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glarkin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 19 20:50:10 UTC 2011
>Closed-Date:    Wed Oct 26 11:09:44 EDT 2011
>Last-Modified:  Wed Oct 26 15:10:09 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT i386
>Description:
Fix plist when:
  a) postgresql-plpython installed for postgresql 9.1
  b) postgresql-plpython built with python 3.2

Reported and fix submitted by: Sunpoet Po-Chuan Hsieh (sunpoet@). Thank you!

PostgreSQL versions before 9.1 are not affected because they don't support python 3.2 (doesn't builds). You may also note plist breakage in the logs - but it's not mine, but postgresqlXX-server instead, and it fixed in this pr - ports/161821.

Patch should be applied from /usr/ports/databases, because it touches two ports actually (postgresql91-server and postgresql-plpython).

tinderbuild logs: 
python 2.7: http://happy-nation.by.ru/ports/tb/8.2/postgresql-plpython-with2.7.log
python 3.2: http://happy-nation.by.ru/ports/tb/8.2/postgresql-plpython-with3.2.log


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/postgresql-plpython/Makefile b/postgresql-plpython/Makefile
index a8c7885..6cf5614 100644
--- a/postgresql-plpython/Makefile
+++ b/postgresql-plpython/Makefile
@@ -39,6 +39,7 @@ CONFIGURE_ARGS=	--with-python
 BUILD_DIRS=	src/pl/plpython
 SLAVE_ONLY=	yes
 
-POSTGRESQL_PORT=databases/postgresql${PGSQL_VER}-server
+POSTGRESQL_PORT=	databases/postgresql${PGSQL_VER}-server
+PLIST_SUB=	PYTHON_MAJOR_VER=${PYTHON_VER:R}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/postgresql91-server/pkg-plist-plpython b/postgresql91-server/pkg-plist-plpython
index cfc34f4..17701ef 100644
--- a/postgresql91-server/pkg-plist-plpython
+++ b/postgresql91-server/pkg-plist-plpython
@@ -1,5 +1,5 @@
 %%DOCSDIR%%/README-plpython
-lib/postgresql/plpython2.so
+lib/postgresql/plpython%%PYTHON_MAJOR_VER%%.so
 %%DATADIR%%/extension/plpythonu.control
 %%DATADIR%%/extension/plpythonu--1.0.sql
 %%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glarkin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Oct 19 20:50:22 UTC 2011 
Responsible-Changed-Why:  
glarkin@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161822 
State-Changed-From-To: open->closed 
State-Changed-By: glarkin 
State-Changed-When: Wed Oct 26 11:09:36 EDT 2011 
State-Changed-Why:  
Committed, thank you! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161822: commit references a PR
Date: Wed, 26 Oct 2011 15:09:35 +0000 (UTC)

 glarkin     2011-10-26 15:09:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/postgresql91-server pkg-plist-plpython 
     databases/postgresql-plpython Makefile 
   Log:
   - Fix plist when postgresql-plpython installed for postgresql 9.1 and
     postgresql-plpython built with python 3+
   
   PR:             ports/161822
   Submitted by:   sunpoet
   Approved by:    Ruslan Mahmatkhanov <cvs-src@yandex.ru> (maintainer), girgen (maintainer implicit)
   
   Revision  Changes    Path
   1.12      +2 -1      ports/databases/postgresql-plpython/Makefile
   1.5       +1 -1      ports/databases/postgresql91-server/pkg-plist-plpython
 _______________________________________________
 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"
 
>Unformatted:
