Date: Tue, 9 Apr 2002 08:58:31 -0400
From: Alan E <alane@geeksrus.net>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org
Cc: Alan Eldridge <ports@geeksrus.net>
Subject: Re: ports/36353: lang/python{15,20,21} stomps on man pg, bin/* from lang/python
Message-ID: <20020409125831.GA8761@wwweasel.geeksrus.net>
In-Reply-To: <200203270120.g2R1K1e32221@freefall.freebsd.org>
References: <200203270118.g2R1IGl60375@wwweasel.geeksrus.net> <200203270120.g2R1K1e32221@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
The following patch fixes python21. It is dependent on these PRs being
committed:
S Submitted Tracker Resp. Description
o [2002/03/31] ports/36589 ports www/pyweblib: use current python
o [2002/04/08] ports/36914 wjv textproc/py-asv: remove
PYTHON_VERSION=python2.1 restriction
Ports/36589 has the maintainer's approval.
Both contain email from the package author stating that there is no
known restriction against using python 2.2.
This patch:
* removes bin/pydoc, bin/python
* removes share/emacs/site-lisp/python-mode.el
* installs man page as python2.1.1 (do "man python2.1")
With this patch, there are no conflicts between lang/python and
lang/python21.
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
Index: lang/python21/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python21/Makefile,v
retrieving revision 1.84
diff -u -3 -r1.84 Makefile
--- lang/python21/Makefile 22 Jan 2002 12:53:28 -0000 1.84
+++ lang/python21/Makefile 5 Apr 2002 15:58:07 -0000
@@ -19,8 +19,8 @@
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
@@ -76,8 +76,9 @@
.endfor
post-install:
- @${MKDIR} ${PREFIX}/share/emacs/site-lisp
- ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
+ @${MKDIR} ${MANPREFIX}/man1
+ ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+ ${MANPREFIX}/man1/${PYTHON_VERSION}.1
@${MKDIR} ${PYTHON_SITELIBDIR}
.if !defined(NOPORTDOCS)
@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
Index: lang/python21/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/lang/python21/pkg-plist,v
retrieving revision 1.37
diff -u -3 -r1.37 pkg-plist
--- lang/python21/pkg-plist 22 Jan 2002 12:53:28 -0000 1.37
+++ lang/python21/pkg-plist 31 Mar 2002 12:27:38 -0000
@@ -1,5 +1,3 @@
-bin/pydoc
-bin/python
bin/%%PYTHON_VERSION%%
include/%%PYTHON_VERSION%%/Python.h
include/%%PYTHON_VERSION%%/abstract.h
@@ -1990,7 +1988,6 @@
lib/%%PYTHON_VERSION%%/zipfile.py
lib/%%PYTHON_VERSION%%/zipfile.pyc
lib/%%PYTHON_VERSION%%/zipfile.pyo
-share/emacs/site-lisp/python-mode.el
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Complex.py
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Dates.py
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
--
AlanE
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020409125831.GA8761>