Fixes missing rpath in pkg-config file. Bump PKGREVISION.diff -r1.30 -r1.31 pkgsrc/lang/python27/Makefile
(obache)
@@ -1,36 +1,38 @@ | @@ -1,36 +1,38 @@ | |||
1 | # $NetBSD: Makefile,v 1.30 2013/10/15 20:46:41 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.31 2013/11/10 12:12:32 obache Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | 4 | |||
5 | PKGNAME= python27-${PY_DISTVERSION} | 5 | PKGNAME= python27-${PY_DISTVERSION} | |
6 | PKGREVISION= 3 | 6 | PKGREVISION= 4 | |
7 | CATEGORIES= lang python | 7 | CATEGORIES= lang python | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.python.org/ | 10 | HOMEPAGE= http://www.python.org/ | |
11 | COMMENT= Interpreted, interactive, object-oriented programming language | 11 | COMMENT= Interpreted, interactive, object-oriented programming language | |
12 | LICENSE= python-software-foundation | 12 | LICENSE= python-software-foundation | |
13 | 13 | |||
14 | CONFLICTS+= python-[0-9]* | 14 | CONFLICTS+= python-[0-9]* | |
15 | 15 | |||
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --with-threads | 17 | CONFIGURE_ARGS+= --with-threads | |
18 | CONFIGURE_ARGS+= --enable-shared | 18 | CONFIGURE_ARGS+= --enable-shared | |
19 | CONFIGURE_ARGS+= OPT=${CFLAGS:Q} | 19 | CONFIGURE_ARGS+= OPT=${CFLAGS:Q} | |
20 | CONFIGURE_ARGS+= --with-system-ffi | 20 | CONFIGURE_ARGS+= --with-system-ffi | |
21 | CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb | 21 | CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb | |
22 | CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} | 22 | CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} | |
23 | 23 | |||
24 | PKGCONFIG_OVERRIDE+= Misc/python.pc.in | |||
25 | ||||
24 | LDFLAGS+= -L${WRKSRC} | 26 | LDFLAGS+= -L${WRKSRC} | |
25 | 27 | |||
26 | # $RANDOM usage there is fine | 28 | # $RANDOM usage there is fine | |
27 | CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh | 29 | CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh | |
28 | 30 | |||
29 | USE_LANGUAGES= c c++ | 31 | USE_LANGUAGES= c c++ | |
30 | 32 | |||
31 | PTHREAD_OPTS+= require | 33 | PTHREAD_OPTS+= require | |
32 | .include "../../mk/pthread.buildlink3.mk" | 34 | .include "../../mk/pthread.buildlink3.mk" | |
33 | .if ${PTHREAD_TYPE} == "pth" | 35 | .if ${PTHREAD_TYPE} == "pth" | |
34 | CONFIGURE_ARGS+= --with-pth | 36 | CONFIGURE_ARGS+= --with-pth | |
35 | .endif | 37 | .endif | |
36 | 38 |
@@ -1,35 +1,37 @@ | @@ -1,35 +1,37 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2013/09/10 14:22:30 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2013/11/10 12:12:32 obache Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | 4 | |||
5 | PKGNAME= python32-${PY_DISTVERSION} | 5 | PKGNAME= python32-${PY_DISTVERSION} | |
6 | PKGREVISION= 4 | 6 | PKGREVISION= 5 | |
7 | CATEGORIES= lang python | 7 | CATEGORIES= lang python | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.python.org/ | 10 | HOMEPAGE= http://www.python.org/ | |
11 | COMMENT= Interpreted, interactive, object-oriented programming language | 11 | COMMENT= Interpreted, interactive, object-oriented programming language | |
12 | LICENSE= python-software-foundation | 12 | LICENSE= python-software-foundation | |
13 | 13 | |||
14 | CONFLICTS+= python-[0-9]* | 14 | CONFLICTS+= python-[0-9]* | |
15 | 15 | |||
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --with-threads | 17 | CONFIGURE_ARGS+= --with-threads | |
18 | CONFIGURE_ARGS+= --enable-shared | 18 | CONFIGURE_ARGS+= --enable-shared | |
19 | CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} | 19 | CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} | |
20 | CONFIGURE_ARGS+= --with-system-ffi | 20 | CONFIGURE_ARGS+= --with-system-ffi | |
21 | CONFIGURE_ARGS+= --without-pymalloc | 21 | CONFIGURE_ARGS+= --without-pymalloc | |
22 | 22 | |||
23 | PKGCONFIG_OVERRIDE+= Misc/python.pc.in | |||
24 | ||||
23 | USE_LANGUAGES= c c++ | 25 | USE_LANGUAGES= c c++ | |
24 | 26 | |||
25 | PTHREAD_OPTS+= require | 27 | PTHREAD_OPTS+= require | |
26 | .include "../../mk/pthread.buildlink3.mk" | 28 | .include "../../mk/pthread.buildlink3.mk" | |
27 | 29 | |||
28 | .include "../../mk/bsd.prefs.mk" | 30 | .include "../../mk/bsd.prefs.mk" | |
29 | 31 | |||
30 | # fdatasync() | 32 | # fdatasync() | |
31 | LIBS.SunOS+= -lrt | 33 | LIBS.SunOS+= -lrt | |
32 | 34 | |||
33 | PY_VER_SUFFIX= 3.2 | 35 | PY_VER_SUFFIX= 3.2 | |
34 | 36 | |||
35 | .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" | 37 | .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" |
@@ -1,37 +1,39 @@ | @@ -1,37 +1,39 @@ | |||
1 | # $NetBSD: Makefile,v 1.11 2013/09/10 14:22:30 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.12 2013/11/10 12:12:32 obache Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | 4 | |||
5 | PKGREVISION= 2 | |||
6 | 5 | |||
7 | PKGNAME= python33-${PY_DISTVERSION} | 6 | PKGNAME= python33-${PY_DISTVERSION} | |
7 | PKGREVISION= 3 | |||
8 | CATEGORIES= lang python | 8 | CATEGORIES= lang python | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.python.org/ | 11 | HOMEPAGE= http://www.python.org/ | |
12 | COMMENT= Interpreted, interactive, object-oriented programming language | 12 | COMMENT= Interpreted, interactive, object-oriented programming language | |
13 | LICENSE= python-software-foundation | 13 | LICENSE= python-software-foundation | |
14 | 14 | |||
15 | CONFLICTS+= python-[0-9]* | 15 | CONFLICTS+= python-[0-9]* | |
16 | 16 | |||
17 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
18 | CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir:Q} | 18 | CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir:Q} | |
19 | CONFIGURE_ARGS+= --with-threads | 19 | CONFIGURE_ARGS+= --with-threads | |
20 | CONFIGURE_ARGS+= --enable-shared | 20 | CONFIGURE_ARGS+= --enable-shared | |
21 | CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} | 21 | CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} | |
22 | CONFIGURE_ARGS+= --with-system-ffi | 22 | CONFIGURE_ARGS+= --with-system-ffi | |
23 | CONFIGURE_ARGS+= --without-pymalloc | 23 | CONFIGURE_ARGS+= --without-pymalloc | |
24 | 24 | |||
25 | PKGCONFIG_OVERRIDE+= Misc/python.pc.in | |||
26 | ||||
25 | USE_LANGUAGES= c c++ | 27 | USE_LANGUAGES= c c++ | |
26 | 28 | |||
27 | PTHREAD_OPTS+= require | 29 | PTHREAD_OPTS+= require | |
28 | .include "../../mk/pthread.buildlink3.mk" | 30 | .include "../../mk/pthread.buildlink3.mk" | |
29 | 31 | |||
30 | .include "../../mk/bsd.prefs.mk" | 32 | .include "../../mk/bsd.prefs.mk" | |
31 | 33 | |||
32 | # fdatasync() | 34 | # fdatasync() | |
33 | LIBS.SunOS+= -lrt | 35 | LIBS.SunOS+= -lrt | |
34 | 36 | |||
35 | PY_VER_SUFFIX= 3.3 | 37 | PY_VER_SUFFIX= 3.3 | |
36 | 38 | |||
37 | .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" | 39 | .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" |