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.14 retrieving revision 1.26 diff -u -p -r1.14 -r1.26 --- pkgsrc/lang/python27/Makefile 2012/03/24 12:04:36 1.14 +++ pkgsrc/lang/python27/Makefile 2013/07/15 02:02:24 1.26 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2012/03/24 12:04:36 tron Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:24 ryoon Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 3 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,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 @@ -21,6 +18,7 @@ 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} LDFLAGS+= -L${WRKSRC} @@ -56,12 +54,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" @@ -70,15 +70,13 @@ 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 PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -.if ${PY_PLATNAME} == "linux2" -PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.Linux2 -.endif - .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ (defined(ABI) && ${ABI} == "64") @@ -95,9 +93,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 @@ -175,7 +173,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"