- make sure the PLIST that is created is done so in the work dir

- add check for ${NO_SHARED_LIBS:U} == YES
- sort final PLIST and output as PLIST.new, then move into place
- sort PLIST and PLIST.noshared

lang/python/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/12/25 02:34:05 brad Exp $
+# $OpenBSD: Makefile,v 1.5 1999/12/31 04:22:42 brad Exp $
 
 DISTNAME=	py152
 PKGNAME=	python-1.5.2
@@ -16,6 +16,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --with-fpectl 
 MAKE_FLAGS+=	OPT="${CFLAGS}"
 
+PLIST=	${WRKDIR}/PLIST
+
 WRKSRC=	${WRKDIR}/Python-1.5.2
 
 # Support for Tk is compiled in by default.
@@ -78,7 +80,7 @@ post-install:
 	
 .include <bsd.port.mk>
 
-.if defined(NO_SHARED_LIBS)
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
 NOSHARED=	\#
 PLIST_PRE=	${FILESDIR}/PLIST.noshared
 .else
@@ -108,4 +110,5 @@ post-configure:
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == YES
 	@cat ${FILESDIR}/PLIST.Tools >> ${PLIST}
 .endif
-	@sort -r -o ${PLIST} ${PLIST}
+	@sort -r -o ${PLIST}.new ${PLIST}
+	@mv ${PLIST}.new ${PLIST}

lang/python/files/PLIST

@@ -966,12 +966,12 @@ lib/python1.5/xmllib.py
 lib/python1.5/xmllib.pyc
 lib/python1.5/xmllib.pyo
 man/man1/python.1
+@dirrm include/python1.5
+@dirrm lib/python1.5/config
+@dirrm lib/python1.5/lib-dynload
+@dirrm lib/python1.5/lib-stdwin
+@dirrm lib/python1.5/lib-tk
+@dirrm lib/python1.5/plat-openbsd2
 @dirrm lib/python1.5/test/output
 @dirrm lib/python1.5/test
-@dirrm lib/python1.5/plat-openbsd2
-@dirrm lib/python1.5/lib-tk
-@dirrm lib/python1.5/lib-stdwin
-@dirrm lib/python1.5/lib-dynload
-@dirrm lib/python1.5/config
 @dirrm lib/python1.5
-@dirrm include/python1.5

lang/python/files/PLIST.noshared

@@ -933,12 +933,12 @@ lib/python1.5/xmllib.py
 lib/python1.5/xmllib.pyc
 lib/python1.5/xmllib.pyo
 man/man1/python.1
-@dirrm lib/python1.5/test/output
-@dirrm lib/python1.5/test
-@dirrm lib/python1.5/plat-openbsd2
-@dirrm lib/python1.5/lib-tk
-@dirrm lib/python1.5/lib-stdwin
+@dirrm include/python1.5
 @dirrm lib/python1.5/config
 @dirrm lib/python1.5/lib-dynload
+@dirrm lib/python1.5/lib-stdwin
+@dirrm lib/python1.5/lib-tk
+@dirrm lib/python1.5/plat-openbsd2
+@dirrm lib/python1.5/test/output
+@dirrm lib/python1.5/test
 @dirrm lib/python1.5
-@dirrm include/python1.5