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.4 retrieving revision 1.20 diff -u -p -r1.4 -r1.20 --- pkgsrc/lang/python27/Makefile 2011/04/23 10:35:28 1.4 +++ pkgsrc/lang/python27/Makefile 2012/10/02 20:11:51 1.20 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2011/04/23 10:35:28 tron Exp $ +# $NetBSD: Makefile,v 1.20 2012/10/02 20:11:51 asau Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 3 +PKGREVISION= 2 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,8 +11,6 @@ HOMEPAGE= http://www.python.org/ COMMENT= Interpreted, interactive, object-oriented programming language LICENSE= python-software-foundation -PKG_DESTDIR_SUPPORT= user-destdir - CONFLICTS+= python-[0-9]* GNU_CONFIGURE= yes @@ -35,6 +33,13 @@ PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pth .endif +.include "../../mk/compiler.mk" + +# Clang needs -fwrapv +.if !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -fwrapv +.endif + .include "../../mk/bsd.prefs.mk" # fdatasync() @@ -63,6 +68,8 @@ PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .elif ${OPSYS} == "HPUX" PY_PLATNAME= hp-ux11 +.elif ${OPSYS} == "Linux" +PY_PLATNAME= linux2 .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif @@ -84,9 +91,9 @@ PLIST.dl= yes # builds additional modules if OpenSSL < 0.9.8 PLIST_VARS+= openssl097 -CHECK_BUILTIN.openssl:= no -.include "../../security/openssl/builtin.mk" 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 @@ -112,7 +119,9 @@ PLIST.nis= yes . endif .else PLIST.dll= yes -. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) +. if ${OPSYS} == "MirBSD" +# neither nis nor no-nis +. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) PLIST.nis= yes . else PLIST.no-nis= yes