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.16 retrieving revision 1.32 diff -u -p -r1.16 -r1.32 --- pkgsrc/lang/python27/Makefile 2012/05/10 08:10:00 1.16 +++ pkgsrc/lang/python27/Makefile 2013/11/12 18:57:25 1.32 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/05/10 08:10:00 sbd Exp $ +# $NetBSD: Makefile,v 1.32 2013/11/12 18:57:25 adam Exp $ .include "dist.mk" @@ -10,8 +10,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 @@ -20,6 +18,9 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= OPT=${CFLAGS:Q} 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} @@ -55,12 +56,14 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end .if ${OPSYS} == "NetBSD" +. if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) PRIVILEGED_STAGES+= clean +. endif # XXX work around a botched autoconf check which ignores libintl CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes .endif -.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" +.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" PY_PLATNAME= ${LOWER_OPSYS} USE_TOOLS+= gmake .elif ${OPSYS} == "IRIX" @@ -78,7 +81,7 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ - (defined(ABI) && ${ABI} == "64") + (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64") IS_64BIT_PLATFORM?= yes .else IS_64BIT_PLATFORM?= no @@ -92,9 +95,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 @@ -154,6 +157,7 @@ REPLACE_INTERPRETER+= py27 REPLACE.py27.old= .*python[^ ]* REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py +REPLACE_FILES.py27+= Lib/*/*/*/*.py SUBST_CLASSES+= findlib SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. @@ -172,7 +176,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk"