[24795] trunk/dports/lang/python25

[source_changes at macosforge.org]

Revision: 24795
          http://trac.macosforge.org/projects/macports/changeset/24795
Author:   mww at macports.org
Date:     2007-05-04 03:35:02 -0700 (Fri, 04 May 2007)

Log Message:
-----------
fix value of PYTHON variable (used by distfiles), increment revision;
thanks to glasser at mit.edu for pointing this out!

Modified Paths:
--------------
    trunk/dports/lang/python25/Portfile

Added Paths:
-----------
    trunk/dports/lang/python25/files/patch-Makefile.pre.in

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2007-05-04 09:53:42 UTC (rev 24794)
+++ trunk/dports/lang/python25/Portfile	2007-05-04 10:35:02 UTC (rev 24795)
@@ -4,6 +4,7 @@
 
 name			python25
 version			2.5.1
+revision		1
 categories		lang
 platforms		darwin
 maintainers		mww at macports.org
@@ -23,7 +24,7 @@
 checksums		sha1 993a66bd2dabb0c4f33ca98372576315ef113df6 \
 				rmd160 af0e8ed93bbc07015c338ae19bbee8811da21c1c
 
-patchfiles		patch-setup.py
+patchfiles		patch-setup.py patch-Makefile.pre.in
 
 configure.args	--enable-shared \
 			--mandir=${prefix}/share/man \
@@ -39,7 +40,7 @@
 
 destroot.target	install maninstall
 post-destroot {
-	system "cd ${destroot}${prefix}/bin && mv idle idle2.5 && mv pydoc pydoc2.5 && mv python-config python-config2.5 && mv smtpd.py smtpd2.5.py && rm python"
+	system "cd ${destroot}${prefix}/bin && mv idle idle2.5 && mv pydoc pydoc2.5 && mv python-config python-config2.5 && mv smtpd.py smtpd2.5.py"
 	system "cd ${destroot}${prefix}/share/man/man1 && mv python.1 python2.5.1"
 }
 

Added: trunk/dports/lang/python25/files/patch-Makefile.pre.in
===================================================================
--- trunk/dports/lang/python25/files/patch-Makefile.pre.in	                        (rev 0)
+++ trunk/dports/lang/python25/files/patch-Makefile.pre.in	2007-05-04 10:35:02 UTC (rev 24795)
@@ -0,0 +1,19 @@
+--- work/Python-2.5.1/Makefile.pre.in	2006-12-08 21:46:13.000000000 +0100
++++ Makefile.pre.in	2007-05-04 12:39:21.000000000 +0200
+@@ -168,7 +168,7 @@
+ MACHDEP_OBJS=	@MACHDEP_OBJS@
+ UNICODE_OBJS=   @UNICODE_OBJS@
+ 
+-PYTHON=		python$(EXE)
++PYTHON=		@bindir@/python2.5
+ BUILDPYTHON=	python$(BUILDEXE)
+ 
+ # === Definitions added by makesetup ===
+@@ -650,7 +650,6 @@
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
+ 	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -sf python$(VERSION)-config python-config)
+ 
+ # Install the interpreter with $(VERSION) affixed

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070504/559a98bf/attachment.html