Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.30
retrieving revision 1.49
diff -u -p -r1.30 -r1.49
--- pkgsrc/lang/python27/Makefile	2013/10/15 20:46:41	1.30
+++ pkgsrc/lang/python27/Makefile	2015/05/24 07:44:07	1.49
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/10/15 20:46:41 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2015/05/24 07:44:07 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	3
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +20,8 @@ CONFIGURE_ARGS+=	--with-system-ffi
 CONFIGURE_ARGS+=	--with-dbmliborder=ndbm:bdb
 CONFIGURE_ENV+=		MKDIR_P=${MKDIR:Q}
 
+PKGCONFIG_OVERRIDE+=	Misc/python.pc.in
+
 LDFLAGS+=		-L${WRKSRC}
 
 # $RANDOM usage there is fine
@@ -28,7 +29,8 @@ CHECK_PORTABILITY_SKIP=	Tools/faqwiz/mov
 
 USE_LANGUAGES=		c c++
 
-PTHREAD_OPTS+=	require
+PTHREAD_OPTS+=		require
+PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .if ${PTHREAD_TYPE} == "pth"
 CONFIGURE_ARGS+=	--with-pth
@@ -73,6 +75,8 @@ PY_PLATNAME=	sunos${OS_VERSION:C/\..*//}
 PY_PLATNAME=	hp-ux11
 .elif ${OPSYS} == "Linux"
 PY_PLATNAME=	linux2
+.elif ${OS_VARIANT} == "SCOOSR5"
+PY_PLATNAME=	sco_sv3
 .else
 PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
@@ -92,16 +96,6 @@ PLIST_VARS+=	dl
 PLIST.dl=	yes
 .endif
 
-# builds additional modules if OpenSSL < 0.9.8
-PLIST_VARS+=		openssl097
-CHECK_BUILTIN.openssl:=	yes
-.include "../../security/openssl/builtin.mk"
-CHECK_BUILTIN.openssl:=	no
-.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \
-    !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*)
-PLIST.openssl097=	yes
-.endif
-
 # setup.py causes some modules to be built if the platform is *not* 64bit.
 PLIST_VARS+=	extra-so
 .if !empty(IS_64BIT_PLATFORM:M[nN][oO])
@@ -113,6 +107,12 @@ PLIST.extra-so=	yes
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+# For Xcode 5 we need to search the SDK path for headers, otherwise certain
+# modules will not be built.
+.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include)
+CFLAGS+=		-I${OSX_SDK_PATH}/usr/include
+.endif
+
 PLIST_VARS+=	dll nis no-nis
 .if ${OPSYS} == "IRIX"
 .  if ${ABI} == "64"
@@ -164,8 +164,14 @@ SUBST_STAGE.findlib=	pre-configure
 SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 
+SUBST_CLASSES+=		sslbase
+SUBST_MESSAGE.sslbase=	Fixing find-file for openssl with SSLBASE.
+SUBST_STAGE.sslbase=	pre-configure
+SUBST_FILES.sslbase=	setup.py
+SUBST_VARS.sslbase=	SSLBASE
+
 post-extract:
-	${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
+	${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
 
@@ -175,6 +181,12 @@ post-install:
 		${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0
 .endif
 
+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2 has no socklen_t in system headers, but has in
+# GNU pth's header. It should be used in this case.
+CONFIGURE_ENV+=		ac_cv_type_socklen_t=yes
+.endif
+
 BUILDLINK_DEPMETHOD.readline=		build
 
 .include "../../archivers/bzip2/buildlink3.mk"