20 files changed, 510 insertions, 193 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 6916723136ba..0abf42bce5ff 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	install
 MAN1=		python.1
 
@@ -31,6 +32,11 @@ PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -59,17 +65,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -77,9 +72,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64 || ${ARCH} == ia64
-CFLAGS+=	-fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
@@ -129,6 +121,31 @@ pre-patch:
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -139,6 +156,18 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${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
+
+	@# additional files installing by ports
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index b8b65cfee54a..8c98879909d2 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -1,9 +1,11 @@
 bin/idle
-bin/idle2.3
+bin/idle%%PYVER%%
 bin/pydoc
-bin/pydoc2.3
+bin/pydoc%%PYVER%%
 bin/python
-bin/%%PYTHON_VERSION%%
+bin/python%%PYVER%%
+bin/python-shared
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -75,8 +77,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 6916723136ba..0abf42bce5ff 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	install
 MAN1=		python.1
 
@@ -31,6 +32,11 @@ PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -59,17 +65,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -77,9 +72,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64 || ${ARCH} == ia64
-CFLAGS+=	-fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
@@ -129,6 +121,31 @@ pre-patch:
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -139,6 +156,18 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${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
+
+	@# additional files installing by ports
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index b8b65cfee54a..8c98879909d2 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -1,9 +1,11 @@
 bin/idle
-bin/idle2.3
+bin/idle%%PYVER%%
 bin/pydoc
-bin/pydoc2.3
+bin/pydoc%%PYVER%%
 bin/python
-bin/%%PYTHON_VERSION%%
+bin/python%%PYVER%%
+bin/python-shared
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -75,8 +77,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 6916723136ba..0abf42bce5ff 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	install
 MAN1=		python.1
 
@@ -31,6 +32,11 @@ PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -59,17 +65,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -77,9 +72,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64 || ${ARCH} == ia64
-CFLAGS+=	-fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
@@ -129,6 +121,31 @@ pre-patch:
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -139,6 +156,18 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${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
+
+	@# additional files installing by ports
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index b8b65cfee54a..8c98879909d2 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -1,9 +1,11 @@
 bin/idle
-bin/idle2.3
+bin/idle%%PYVER%%
 bin/pydoc
-bin/pydoc2.3
+bin/pydoc%%PYVER%%
 bin/python
-bin/%%PYTHON_VERSION%%
+bin/python%%PYVER%%
+bin/python-shared
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -75,8 +77,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index d8927cc4070c..6f8289ade740 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a0.20040106
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -19,6 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
+MAKE_ENV=	VPATH="${WRKSRC}"
+INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -28,6 +31,11 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
+SHARED_WRKSRC=	${WRKSRC}/build.shared
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
+DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
+TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
+
 #
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
@@ -56,17 +64,6 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 CONFIGURE_ARGS+=        --without-pymalloc
 .endif
 
-.if defined(BUILD_SHARED)
-CONFIGURE_ARGS+=	--enable-shared
-INSTALLS_SHLIB=		yes
-PLIST_SUB+=		SHARED_ONLY=""
-.else
-PLIST_SUB+=		SHARED_ONLY="@comment "
-.endif
-
-DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
-TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -74,9 +71,6 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
-.if ${ARCH} == amd64
-CFLAGS+=        -fPIC
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=     32BIT_ONLY="@comment "
 .else
@@ -126,6 +120,33 @@ post-patch:
 		${WRKSRC}/Include/patchlevel.h
 	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
 
+post-configure:
+	@# prepare a subdir for shared build
+.for subdir in Modules Parser Python Objects
+	${MKDIR} ${SHARED_WRKSRC}/${subdir}
+.endfor
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
+		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
+		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
+	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
+		${SHARED_WRKSRC}/
+	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
+		${WRKSRC}/Python/importdl.h \
+		${SHARED_WRKSRC}/Python/
+	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
+		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
+		${SHARED_WRKSRC}/Modules/
+
+post-build:
+	cd ${SHARED_WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -136,6 +157,16 @@ pre-install:
 .endfor
 
 post-install:
+	@# shared version of executable and library
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+		lib${PYTHON_VERSION}.so
+	${INSTALL_PROGRAM} \
+		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
+		${PREFIX}/bin
+ 
+	@# additional files installing by ports
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 76a827582a80..ad78ff1936e0 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -1,6 +1,7 @@
-bin/idle2.4
-bin/pydoc2.4
-bin/%%PYTHON_VERSION%%
+bin/idle%%PYVER%%
+bin/pydoc%%PYVER%%
+bin/python%%PYVER%%
+bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -73,8 +74,8 @@ include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
-%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
+lib/lib%%PYTHON_VERSION%%.so
+lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo