5 files changed, 45 insertions, 22 deletions

diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 01f4de5cccf4..8831de95431e 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -1,17 +1,17 @@
-# New ports collection makefile for:    python-devel
+# New ports collection makefile for:    python25
 # Date created:         3 July 2003
 # Whom:                 Hye-Shik Chang <perky@FreeBSD.org>
 #
 # $FreeBSD$
 
-PORTNAME=	python
-PORTVERSION=	2.5.c2
+PORTNAME=	python25
+PORTVERSION=	2.5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
 DISTFILES=	${PYTHON_DISTFILE}
 
-MAINTAINER=	perky@FreeBSD.org
+MAINTAINER=	python@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language
 
 DIST_SUBDIR=	python
@@ -23,8 +23,8 @@ CONFIGURE_SCRIPT=	../configure # must be relative
 CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
 MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
-INSTALL_TARGET=	altinstall
-MAN1=		${PYTHON_VERSION}.1
+INSTALL_TARGET=	install
+MAN1=		python.1 ${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.5
@@ -33,7 +33,7 @@ LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
@@ -202,6 +202,10 @@ post-install:
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
+	cd ${PREFIX}/bin; \
+		${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared; \
+		${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/}-config \
+			python-shared-config; \
 
 	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
@@ -219,4 +223,6 @@ post-install:
 		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif
 
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 2beba3ff399a..7f7cbdee8a65 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
-SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
-SIZE (python/Python-2.5c2.tgz) = 11021626
+MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
+SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
+SIZE (python/Python-2.5.tgz) = 11019675
diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py
index cf0beedab0c6..07708de2c558 100644
--- a/lang/python31/files/patch-setup.py
+++ b/lang/python31/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Fri Jun 30 15:18:39 2006
-+++ setup.py	Thu Aug 10 18:41:33 2006
+--- setup.py.orig	Thu Aug 10 08:42:18 2006
++++ setup.py	Thu Oct  5 13:26:43 2006
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -18,13 +18,12 @@
  
  
          # Modules that provide persistent dictionary-like semantics.  You will
-@@ -1498,8 +1500,7 @@
-           ext_modules=[Extension('_struct', ['_struct.c'])],
- 
-           # Scripts to install
--          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
--                     'Lib/smtpd.py']
-+          scripts = []
-         )
- 
- # --install-platlib
+@@ -903,7 +905,7 @@
+         # Curses support, requiring the System V version of curses, often
+         # provided by the ncurses library.
+         panel_library = 'panel'
+-        if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
++        if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')):
+             curses_libs = ['ncursesw']
+             # Bug 1464056: If _curses.so links with ncursesw,
+             # _curses_panel.so must link with panelw.
diff --git a/lang/python31/pkg-message b/lang/python31/pkg-message
new file mode 100644
index 000000000000..a3ba9904996b
--- /dev/null
+++ b/lang/python31/pkg-message
@@ -0,0 +1,11 @@
+====
+Note that some of the standard modules are provided as separate
+ports since they require extra dependencies:
+
+bsddb           databases/py-bsddb
+gdbm            databases/py-gdbm
+sqlite3		databases/py-sqlite3
+tkinter         x11-toolkits/py-tkinter
+
+Install them as needed.
+====
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 6526f34bc484..3fe55a543fbe 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -1,10 +1,17 @@
+bin/idle
 bin/idle%%PYVER%%
+bin/pydoc
 bin/pydoc%%PYVER%%
+bin/python
 bin/python%%PYVER%%
 bin/python%%PYVER%%-config
+bin/python-config
+bin/python-shared
 bin/python-shared%%PYVER%%
 bin/python-shared%%PYVER%%-config
+bin/python-shared-config
 bin/smtpd%%PYVER%%.py
+bin/smtpd.py
 %%PYTHON_INCLUDEDIR%%/Python-ast.h
 %%PYTHON_INCLUDEDIR%%/Python.h
 %%PYTHON_INCLUDEDIR%%/abstract.h