Make sure PLIST is correct whether you have source or not. Add copyright

file.  Add "|| true" to end of != grep command line to avoid warnings.

Submitted by:	tg

30 files changed, 135 insertions, 45 deletions

diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python+ipv6/pkg-plist b/lang/python+ipv6/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python+ipv6/pkg-plist
+++ b/lang/python+ipv6/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python15/pkg-plist b/lang/python15/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python15/pkg-plist
+++ b/lang/python15/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python20/pkg-plist
+++ b/lang/python20/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python21/pkg-plist
+++ b/lang/python21/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 80e254d58a69..0c39a7b4a7ba 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
+# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
 #
 
 DISTNAME=       pyth151
@@ -34,6 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
+PLIST=		${WRKDIR}/PLIST
 MAN1=		python.1
 
 #
@@ -58,7 +59,7 @@ SETUP_LOCAL=	Setup.tk
 # This option is enabled by default.
 #
 WITH_THREADS?=	yes
-LIBC_R!=	/sbin/ldconfig -r | grep c_r
+LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
@@ -70,6 +71,7 @@ CONFIGURE_ENV=		LDFLAGS="-pthread ${LDFLAGS}"
 #
 .if exists(/usr/src/contrib/libgmp/gmp-impl.h)
 SETUP_LOCAL+=	Setup.gmp
+PLIST_GMP=	lib/python1.5/lib-dynload/mpzmodule.so
 .endif
 
 post-extract:
@@ -97,9 +99,12 @@ pre-install:
 	${MKDIR} ${PREFIX}/lib/python1.5/plat-freebsd2
 	${INSTALL_DATA} ${WRKSRC}/Lib/plat-freebsd2/* ${PREFIX}/lib/python1.5/plat-freebsd2
 .endif
+	@${ECHO} ${PLIST_GMP} | sort -r -o ${PLIST} - ${PKGDIR}/PLIST
 
 post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
+	@${MKDIR} ${PREFIX}/share/doc/python
+	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 
 .include <bsd.port.post.mk>
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index c124a0bf09f8..b295c65ed685 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -253,7 +253,6 @@ lib/python1.5/lib-dynload/fpectlmodule.so
 lib/python1.5/lib-dynload/fpetestmodule.so
 lib/python1.5/lib-dynload/imageop.so
 lib/python1.5/lib-dynload/md5module.so
-lib/python1.5/lib-dynload/mpzmodule.so
 lib/python1.5/lib-dynload/nismodule.so
 lib/python1.5/lib-dynload/resource.so
 lib/python1.5/lib-dynload/rgbimgmodule.so
@@ -900,6 +899,8 @@ lib/python1.5/xmllib.pyo
 lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
+share/doc/python/COPYRIGHT
+@dirrm share/doc/python
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
 @dirrm lib/python1.5/plat-freebsd2