diff options
| -rw-r--r-- | lang/python15/Makefile | 10 | ||||
| -rw-r--r-- | lang/python15/pkg-plist | 3 | ||||
| -rw-r--r-- | lang/python20/Makefile | 11 | ||||
| -rw-r--r-- | lang/python20/pkg-plist | 2 | ||||
| -rw-r--r-- | lang/python21/Makefile | 9 |
5 files changed, 15 insertions, 20 deletions
diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 7d14068ec0b0..f0ff3fc9c42f 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install +INSTALL_TARGET= altinstall PLIST= ${WRKDIR}/PLIST -MAN1= python.1 +MAN1= ${PYTHON_VERSION}.1 NO_LATEST_LINK= yes USE_PYTHON= yes @@ -100,10 +100,10 @@ pre-install: @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: - strip ${PREFIX}/bin/python + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 @${MKDIR} ${PREFIX}/share/doc/${PYTHON_VERSION} - @${MKDIR} ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/${PYTHON_VERSION} @${MKDIR} ${PYTHON_SITELIBDIR} .if !defined(WITHOUT_TOOLS) diff --git a/lang/python15/pkg-plist b/lang/python15/pkg-plist index 3c0902f96a34..b5111f22b414 100644 --- a/lang/python15/pkg-plist +++ b/lang/python15/pkg-plist @@ -1,7 +1,5 @@ bin/%%PYTHON_VERSION%% -bin/python share/doc/%%PYTHON_VERSION%%/COPYRIGHT -share/emacs/site-lisp/python-mode.el include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -1011,4 +1009,3 @@ lib/%%PYTHON_VERSION%%/xmllib.pyo @dirrm lib/%%PYTHON_VERSION%% @exec mkdir -p %D/lib/%%PYTHON_VERSION%%/site-packages @dirrm share/doc/%%PYTHON_VERSION%% -@unexec rmdir share/emacs/site-lisp 2>/dev/null || true diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 9d9fb7575a79..9d218c9201d7 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -21,9 +21,9 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install +INSTALL_TARGET= altinstall PLIST= ${WRKDIR}/PLIST -MAN1= python.1 +MAN1= ${PYTHON_VERSION}.1 NO_LATEST_LINK= yes USE_PYTHON= yes @@ -122,10 +122,9 @@ pre-install: @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PKGDIR}/pkg-plist post-install: - strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 @${MKDIR} ${PYTHON_SITELIBDIR} .if !defined(WITHOUT_TOOLS) @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist index 4aad96d17bf9..f9869ec80249 100644 --- a/lang/python20/pkg-plist +++ b/lang/python20/pkg-plist @@ -1,5 +1,4 @@ bin/%%PYTHON_VERSION%% -bin/python include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h @@ -1550,7 +1549,6 @@ lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el @dirrm lib/%%PYTHON_VERSION%%/xml/parsers @dirrm lib/%%PYTHON_VERSION%%/xml/sax @dirrm lib/%%PYTHON_VERSION%%/xml/dom diff --git a/lang/python21/Makefile b/lang/python21/Makefile index aa5388ad1202..770203d70b1f 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -21,8 +21,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -78,8 +78,9 @@ pre-install: .endfor post-install: - @${MKDIR} ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 @${MKDIR} ${PYTHON_SITELIBDIR} .if !defined(NOPORTDOCS) @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ |