ports/115636: Chase python24->python2.5 switch

[Dima Panov]

>Number:         115636
>Category:       ports
>Synopsis:       Chase python24->python2.5 switch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 20 06:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Dima Panov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ns.ael.RU 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Apr 14 11:12:17 VLAST 2007 root at ns.ael.RU:/usr/obj/usr/src/sys/AEL i386


	
>Description:
	Current x11/libexo plist is hard-coded to python2.4 path.
    
>How-To-Repeat:
	
    install default python (pathon2.5) and try to make pachage of x11/libexo
>Fix:

	


Index: x11/libexo/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/libexo/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- x11/libexo/pkg-plist	19 May 2007 20:26:59 -0000	1.8
+++ x11/libexo/pkg-plist	20 Aug 2007 06:28:13 -0000
@@ -42,15 +42,15 @@
 lib/libexo-hal-0.3.la
 lib/libexo-hal-0.3.so
 lib/libexo-hal-0.3.so.4
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.a
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.la
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.so
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.py
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.pyc
-%%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.pyo
-%%PYTHON%%lib/python2.4/site-packages/pyexo.py
-%%PYTHON%%lib/python2.4/site-packages/pyexo.pyc
-%%PYTHON%%lib/python2.4/site-packages/pyexo.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
 %%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.a
 %%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.la
 %%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.so
@@ -194,10 +194,9 @@
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3/exo
-%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3
-%%PYTHON%%@dirrmtry lib/python2.4/site-packages
-%%PYTHON%%@dirrmtry lib/python2.4
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3/exo
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 %%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
 %%PYTHON%%@dirrmtry share/pygtk/2.0/defs
 %%PYTHON%%@dirrmtry share/pygtk/2.0
>Release-Note:
>Audit-Trail:
>Unformatted: