1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00

- 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]
This commit is contained in:
Hye-Shik Chang 2003-09-29 11:44:32 +00:00
parent 3f7212d8a5
commit dc8b35d2fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=89785
9 changed files with 57 additions and 21 deletions

View File

@ -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}

View File

@ -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'

View File

@ -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

View File

@ -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}

View File

@ -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'

View File

@ -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

View File

@ -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}

View File

@ -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'

View File

@ -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