aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2009-07-07 23:23:31 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2009-07-07 23:23:31 +0000
commitdc43fae6f5b12211bb1d380dc966778513142bf3 (patch)
tree2c974a97a270bd9dac0a9220a692b7f1de3c4edb /lang
parent00c3beec3943b166c0dd223e40358d5062439fa7 (diff)
downloadports-dc43fae6f5b12211bb1d380dc966778513142bf3.tar.gz
ports-dc43fae6f5b12211bb1d380dc966778513142bf3.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/python31/Makefile9
-rw-r--r--lang/python31/pkg-plist3
-rw-r--r--lang/python32/Makefile9
-rw-r--r--lang/python32/pkg-plist3
4 files changed, 10 insertions, 14 deletions
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 26a5abcd5b76..8c9cef4ecbfd 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -6,6 +6,7 @@
PORTNAME= python31
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -124,11 +125,9 @@ pre-patch:
's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \
${PATCH_WRKSRC}/Lib/site.py
${REINPLACE_CMD} -e \
- 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \
- ${PATCH_WRKSRC}/Makefile.pre.in
-
- ${REINPLACE_CMD} -e \
- 's|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
+ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g; \
+ s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g; \
+ s|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
${PATCH_WRKSRC}/Makefile.pre.in
${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index f0b1a4ffc16f..854293465eca 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -15,7 +15,7 @@ bin/python-shared%%PYVER%%-config
lib/lib%%PYTHON_VERSION%%.a
lib/lib%%PYTHON_VERSION%%.so
lib/lib%%PYTHON_VERSION%%.so.1
-lib/pkgconfig/python-3.1.pc
+libdata/pkgconfig/python-3.1.pc
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
%%PYTHON_INCLUDEDIR%%/abstract.h
@@ -2141,7 +2141,6 @@ lib/pkgconfig/python-3.1.pc
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/classes
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cgi
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/pkgconfig
@dirrm %%PYTHON_LIBDIR%%/xmlrpc
@dirrm %%PYTHON_LIBDIR%%/xml/sax
@dirrm %%PYTHON_LIBDIR%%/xml/parsers
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 26a5abcd5b76..8c9cef4ecbfd 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -6,6 +6,7 @@
PORTNAME= python31
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -124,11 +125,9 @@ pre-patch:
's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \
${PATCH_WRKSRC}/Lib/site.py
${REINPLACE_CMD} -e \
- 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \
- ${PATCH_WRKSRC}/Makefile.pre.in
-
- ${REINPLACE_CMD} -e \
- 's|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
+ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g; \
+ s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g; \
+ s|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
${PATCH_WRKSRC}/Makefile.pre.in
${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index f0b1a4ffc16f..854293465eca 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -15,7 +15,7 @@ bin/python-shared%%PYVER%%-config
lib/lib%%PYTHON_VERSION%%.a
lib/lib%%PYTHON_VERSION%%.so
lib/lib%%PYTHON_VERSION%%.so.1
-lib/pkgconfig/python-3.1.pc
+libdata/pkgconfig/python-3.1.pc
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
%%PYTHON_INCLUDEDIR%%/abstract.h
@@ -2141,7 +2141,6 @@ lib/pkgconfig/python-3.1.pc
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/classes
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cgi
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/pkgconfig
@dirrm %%PYTHON_LIBDIR%%/xmlrpc
@dirrm %%PYTHON_LIBDIR%%/xml/sax
@dirrm %%PYTHON_LIBDIR%%/xml/parsers