diff options
-rw-r--r-- | lang/python23/Makefile | 5 | ||||
-rw-r--r-- | lang/python24/Makefile | 6 | ||||
-rw-r--r-- | lang/python25/Makefile | 6 | ||||
-rw-r--r-- | lang/python26/Makefile | 5 | ||||
-rw-r--r-- | lang/python27/Makefile | 5 | ||||
-rw-r--r-- | lang/python30/Makefile | 6 | ||||
-rw-r--r-- | lang/python31/Makefile | 6 | ||||
-rw-r--r-- | lang/python32/Makefile | 6 |
8 files changed, 24 insertions, 21 deletions
diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ef8b97b4f1e5..491e952df40d 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -7,6 +7,7 @@ PORTNAME= python23 PORTVERSION= 2.3.7 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -49,7 +50,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -171,7 +172,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_SCRIPTS}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 50a5eaea26d1..1da9303fb550 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -7,7 +7,7 @@ PORTNAME= python24 PORTVERSION= 2.4.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -51,7 +51,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -192,7 +192,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_SCRIPTS}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python25/Makefile b/lang/python25/Makefile index cf2e1d6ff1c9..418c0e373239 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -6,7 +6,7 @@ PORTNAME= python25 PORTVERSION= 2.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -56,7 +56,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -209,7 +209,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_SCRIPTS}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python26/Makefile b/lang/python26/Makefile index d07b0d7cd1cd..471c86118f27 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -6,6 +6,7 @@ PORTNAME= python26 PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -74,7 +75,7 @@ SEM_MSG= "@comment " SUB_FILES= pkg-message SUB_LIST= SEM=${SEM_MSG} -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -240,7 +241,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_FILES}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python27/Makefile b/lang/python27/Makefile index d07b0d7cd1cd..471c86118f27 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -6,6 +6,7 @@ PORTNAME= python26 PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -74,7 +75,7 @@ SEM_MSG= "@comment " SUB_FILES= pkg-message SUB_LIST= SEM=${SEM_MSG} -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -240,7 +241,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_FILES}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 82f987d4a744..4da1530f7955 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -6,7 +6,7 @@ PORTNAME= python30 PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -58,7 +58,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -204,7 +204,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_FILES}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 8c9cef4ecbfd..92fe74d1a1c0 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,7 +6,7 @@ PORTNAME= python31 PORTVERSION= 3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -57,7 +57,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -202,7 +202,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_FILES}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 8c9cef4ecbfd..92fe74d1a1c0 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -6,7 +6,7 @@ PORTNAME= python31 PORTVERSION= 3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -57,7 +57,7 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) MLINKS= ${PYTHON_VERSION}.1 python.1 PLIST_SUB+= IF_DEFAULT="" .else @@ -202,7 +202,7 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} || !exists(${LOCALBASE}/bin/python) for f in ${BIN_FILES}; do \ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ |