- Install a 'real' shared object when BUILD_SHARED=yes. [1]

- Fix plist on 32bit architectures.
- Bump PORTREVISION.

PR:		57269 [1]
Submitted by:	Tim Middleton <x@Vex.Net> [1],
		Kostik I. Belousov <kostya@tessart.kiev.ua> [1]

9 files changed, 57 insertions, 21 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 760b589..c0a5429 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
@@ -74,6 +74,11 @@ PLIST_SUB+=	X86_ONLY="@comment "
 .if ${ARCH} == amd64
 CFLAGS+=	-fPIC
 .endif
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
+PLIST_SUB+=	32BIT_ONLY="@comment "
+.else
+PLIST_SUB+=	32BIT_ONLY=""
+.endif
 
 .if ${OSVERSION} < 400000
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
@@ -114,10 +119,6 @@ post-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
-.if ${ARCH} == amd64 || ${ARCH} == sparc64
-	${REINPLACE_CMD} -e \
-		's,^#\(dl .*\),\1,' ${WRKSRC}/Modules/Setup.dist
-.endif
 
 pre-install:
 .for platform in ${PLATFORMS}
diff --git a/lang/python/files/patch-configure b/lang/python/files/patch-configure
index 6001687..271eb95 100644
--- a/lang/python/files/patch-configure
+++ b/lang/python/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Sun Sep 21 00:29:40 2003
-+++ configure	Fri Sep 26 13:08:51 2003
++++ configure	Mon Sep 29 20:01:11 2003
+@@ -1321,7 +1321,7 @@
+ VERSION=2.3
+ 
+ 
+-SOVERSION=1.0
++SOVERSION=1
+ 
+ # The later defininition of _XOPEN_SOURCE disables certain features
+ # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
 @@ -3596,6 +3596,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
@@ -8,7 +17,7 @@
 +	  LDLIBRARY='libpython$(VERSION).so'
 +	  BLDLIBRARY='-L. -lpython$(VERSION)'
 +	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY"
++	  INSTSONAME="$LDLIBRARY".$SOVERSION
 +	  ;;
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 61eaae5..70a5567 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -76,6 +76,7 @@ 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/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
@@ -1139,6 +1140,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
+%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 760b589..c0a5429 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
@@ -74,6 +74,11 @@ PLIST_SUB+=	X86_ONLY="@comment "
 .if ${ARCH} == amd64
 CFLAGS+=	-fPIC
 .endif
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
+PLIST_SUB+=	32BIT_ONLY="@comment "
+.else
+PLIST_SUB+=	32BIT_ONLY=""
+.endif
 
 .if ${OSVERSION} < 400000
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
@@ -114,10 +119,6 @@ post-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
-.if ${ARCH} == amd64 || ${ARCH} == sparc64
-	${REINPLACE_CMD} -e \
-		's,^#\(dl .*\),\1,' ${WRKSRC}/Modules/Setup.dist
-.endif
 
 pre-install:
 .for platform in ${PLATFORMS}
diff --git a/lang/python23/files/patch-configure b/lang/python23/files/patch-configure
index 6001687..271eb95 100644
--- a/lang/python23/files/patch-configure
+++ b/lang/python23/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Sun Sep 21 00:29:40 2003
-+++ configure	Fri Sep 26 13:08:51 2003
++++ configure	Mon Sep 29 20:01:11 2003
+@@ -1321,7 +1321,7 @@
+ VERSION=2.3
+ 
+ 
+-SOVERSION=1.0
++SOVERSION=1
+ 
+ # The later defininition of _XOPEN_SOURCE disables certain features
+ # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
 @@ -3596,6 +3596,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
@@ -8,7 +17,7 @@
 +	  LDLIBRARY='libpython$(VERSION).so'
 +	  BLDLIBRARY='-L. -lpython$(VERSION)'
 +	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY"
++	  INSTSONAME="$LDLIBRARY".$SOVERSION
 +	  ;;
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 61eaae5..70a5567 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -76,6 +76,7 @@ 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/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
@@ -1139,6 +1140,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
+%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 760b589..c0a5429 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
@@ -74,6 +74,11 @@ PLIST_SUB+=	X86_ONLY="@comment "
 .if ${ARCH} == amd64
 CFLAGS+=	-fPIC
 .endif
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
+PLIST_SUB+=	32BIT_ONLY="@comment "
+.else
+PLIST_SUB+=	32BIT_ONLY=""
+.endif
 
 .if ${OSVERSION} < 400000
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
@@ -114,10 +119,6 @@ post-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
-.if ${ARCH} == amd64 || ${ARCH} == sparc64
-	${REINPLACE_CMD} -e \
-		's,^#\(dl .*\),\1,' ${WRKSRC}/Modules/Setup.dist
-.endif
 
 pre-install:
 .for platform in ${PLATFORMS}
diff --git a/lang/python24/files/patch-configure b/lang/python24/files/patch-configure
index 6001687..271eb95 100644
--- a/lang/python24/files/patch-configure
+++ b/lang/python24/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Sun Sep 21 00:29:40 2003
-+++ configure	Fri Sep 26 13:08:51 2003
++++ configure	Mon Sep 29 20:01:11 2003
+@@ -1321,7 +1321,7 @@
+ VERSION=2.3
+ 
+ 
+-SOVERSION=1.0
++SOVERSION=1
+ 
+ # The later defininition of _XOPEN_SOURCE disables certain features
+ # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
 @@ -3596,6 +3596,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
@@ -8,7 +17,7 @@
 +	  LDLIBRARY='libpython$(VERSION).so'
 +	  BLDLIBRARY='-L. -lpython$(VERSION)'
 +	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY"
++	  INSTSONAME="$LDLIBRARY".$SOVERSION
 +	  ;;
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 61eaae5..70a5567 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -76,6 +76,7 @@ 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/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
@@ -1139,6 +1140,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
+%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so