summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2005-01-30 01:20:54 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2005-01-30 01:20:54 +0000
commitc5ae380c73f215a5b5a422130e22aeaf95305844 (patch)
tree836e1688d2dc3af46975ae523cbef5b7fb0d883e /lang
parent- Update to 2.6.6 (diff)
Resolve LATEST_LINK conflict of stackless_python versus python23.
Pointed out by: kris
Notes
Notes: svn path=/head/; revision=127676
Diffstat (limited to 'lang')
-rw-r--r--lang/python23/Makefile2
-rw-r--r--lang/stackless_python/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index d27ce95f103e..637ec1a55137 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -32,7 +32,7 @@ USE_PYTHON= yes
PYTHON_VERSION= python2.3
PYTHON_NO_DEPENDS= yes
USE_REINPLACE= yes
-LATEST_LINK= ${PYTHON_VERSION:S/.//}
+LATEST_LINK?= ${PYTHON_VERSION:S/.//}
SHARED_WRKSRC= ${WRKSRC}/build.shared
PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//}
diff --git a/lang/stackless_python/Makefile b/lang/stackless_python/Makefile
index 419c5a4ccb86..15aefa4db4e9 100644
--- a/lang/stackless_python/Makefile
+++ b/lang/stackless_python/Makefile
@@ -25,6 +25,7 @@ CONFLICTS= python-2.3.*
ONLY_FOR_ARCHS= i386 powerpc
CVSDATE= 040225
MASTERDIR= ${.CURDIR}/../python23
+LATEST_LINK= stackless_python
STACKLESS_POST_CONFIGURE= stackless-post-configure
DESCR= ${.CURDIR}/pkg-descr
@@ -46,10 +47,9 @@ post-patch:
@${CAT} ${MASTERDIR}/pkg-plist >>${PLIST}
stackless-post-configure:
- ${MKDIR} -p ${SHARED_WRKSRC}/Stackless
+ ${MKDIR} ${SHARED_WRKSRC}/Stackless
${LN} -sf ${WRKSRC}/Stackless/slp_transfer.c \
${SHARED_WRKSRC}/Stackless/slp_transfer.c
${LN} -sf ${WRKSRC}/Stackless/*.h ${SHARED_WRKSRC}/Stackless/
-
.include "${MASTERDIR}/Makefile"