[Midnightbsd-cvs] mports [22960] trunk/lang/python33: fix build on current.

[laffer1 at midnightbsd.org]

Revision: 22960
          http://svnweb.midnightbsd.org/mports/?rev=22960
Author:   laffer1
Date:     2017-11-24 11:53:36 -0500 (Fri, 24 Nov 2017)
Log Message:
-----------
fix build on current.

Modified Paths:
--------------
    trunk/lang/python33/Makefile
    trunk/lang/python33/pkg-plist

Modified: trunk/lang/python33/Makefile
===================================================================
--- trunk/lang/python33/Makefile	2017-11-24 14:25:12 UTC (rev 22959)
+++ trunk/lang/python33/Makefile	2017-11-24 16:53:36 UTC (rev 22960)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -31,8 +31,9 @@
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
+OSMAJOR=		${OSREL:C/\..*//}
 PLIST_SUB=		ABI=${ABIFLAGS} \
-			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
+			OSMAJOR=${OSREL:C/\..*//}
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
 OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
@@ -101,7 +102,7 @@
 
 post-patch:
 	${CP} -r ${WRKSRC}/Lib/plat-freebsd8 \
-		${WRKSRC}/Lib/plat-midnightbsd0
+		${WRKSRC}/Lib/plat-midnightbsd${OSMAJOR}
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
 		${WRKSRC}/setup.py

Modified: trunk/lang/python33/pkg-plist
===================================================================
--- trunk/lang/python33/pkg-plist	2017-11-24 14:25:12 UTC (rev 22959)
+++ trunk/lang/python33/pkg-plist	2017-11-24 16:53:36 UTC (rev 22960)
@@ -2180,10 +2180,10 @@
 lib/python3.3/pickletools.py
 lib/python3.3/pipes.py
 lib/python3.3/pkgutil.py
-lib/python3.3/plat-midnightbsd0/IN.py
-lib/python3.3/plat-midnightbsd0/__pycache__/IN.cpython-33.pyc
-lib/python3.3/plat-midnightbsd0/__pycache__/IN.cpython-33.pyo
-lib/python3.3/plat-midnightbsd0/regen
+lib/python3.3/plat-midnightbsd%%OSMAJOR%%/IN.py
+lib/python3.3/plat-midnightbsd%%OSMAJOR%%/__pycache__/IN.cpython-33.pyc
+lib/python3.3/plat-midnightbsd%%OSMAJOR%%/__pycache__/IN.cpython-33.pyo
+lib/python3.3/plat-midnightbsd%%OSMAJOR%%/regen
 lib/python3.3/platform.py
 lib/python3.3/plistlib.py
 lib/python3.3/poplib.py