svn commit: r300956 - in head: . Mk lang lang/python-doc-html lang/python24 lang/python25 www www/zope www/zope211

Ruslan Mahmatkhanov rm at FreeBSD.org
Mon Jul 16 17:04:30 UTC 2012 

Author: rm
Date: Mon Jul 16 17:04:29 2012
New Revision: 300956
URL: http://svn.freebsd.org/changeset/ports/300956

Log:
  - remove expired ports
    * lang/python24 and lang/python25: unmaintained upstream
    * www/zope and www/zope211: unmaintained upstream (the only
      consumers of python24)
  - clean-up python versions < 2.6 from lang/python-doc-html
  - clean-up python24/25 from Mk/bsd.ports.mk
  - add www/zope213 glue to bsd.python.mk
  - clean-up zope versions != 2.13 from bsd.python.mk
  
  Submitted by:	miwi (based on)
  Approved by:	portmgr (miwi)

Deleted:
  head/lang/python24/
  head/lang/python25/
  head/www/zope/
  head/www/zope211/
Modified:
  head/MOVED
  head/Mk/bsd.python.mk
  head/lang/Makefile
  head/lang/python-doc-html/Makefile
  head/www/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 16 16:46:10 2012	(r300955)
+++ head/MOVED	Mon Jul 16 17:04:29 2012	(r300956)
@@ -3549,3 +3549,7 @@ science/ics||2012-07-07|ICS is no more a
 mail/postfix25||2012-07-07|Has expired: no further upstream development; please consider upgrading
 misc/alevt||2012-07-16|Has expired: No more upstream
 multimedia/moonlight||2012-07-16|Has expired: BROKEN for more than 6 month
+lang/python24||2012-07-16|End Of Life reached
+lang/python25||2012-07-16|End Of Life reached
+www/zope||2012-07-16|End Of Life reached
+www/zope211||2012-07-16|End Of Life reached

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Mon Jul 16 16:46:10 2012	(r300955)
+++ head/Mk/bsd.python.mk	Mon Jul 16 17:04:29 2012	(r300956)
@@ -202,9 +202,9 @@ Python_Include_MAINTAINER=	python at FreeBS
 #
 
 _PYTHON_PORTBRANCH=		2.7
-_PYTHON_ALLBRANCHES=	2.7 2.6 2.5 2.4 3.2 3.1	# preferred first
-_ZOPE_PORTBRANCH=		2.7
-_ZOPE_ALLBRANCHES=		2.7 2.8 2.9 2.10 3.2
+_PYTHON_ALLBRANCHES=	2.7 2.6 3.2 3.1	# preferred first
+_ZOPE_PORTBRANCH=		2.13
+_ZOPE_ALLBRANCHES=		2.13
 
 
 # Determine version number of Zope to use
@@ -256,7 +256,7 @@ _ZOPE_VERSION=	${_ZOPE_PORTBRANCH} # jus
 
 ZOPE_VERSION?=	${_ZOPE_VERSION}
 
-PYTHON_VERSION=	python2.4
+PYTHON_VERSION=	python2.7
 .endif	# defined(USE_ZOPE)
 
 
@@ -392,22 +392,6 @@ PYTHON_REL=			268
 PYTHON_SUFFIX=		26
 PYTHON_VER=			2.6
 
-# Python-2.5
-.elif ${PYTHON_VERSION} == "python2.5"
-PYTHON_PORTVERSION?=2.5.6
-PYTHON_PORTSDIR=	${PORTSDIR}/lang/python25
-PYTHON_REL=			256
-PYTHON_SUFFIX=		25
-PYTHON_VER=			2.5
-
-# Python-2.4
-.elif ${PYTHON_VERSION} == "python2.4"
-PYTHON_PORTVERSION?=2.4.5
-PYTHON_PORTSDIR=	${PORTSDIR}/lang/python24
-PYTHON_REL=			245
-PYTHON_SUFFIX=		24
-PYTHON_VER=			2.4
-
 # Python versions in development
 .elif defined(FORCE_PYTHON_VERSION)
 PYTHON_PORTSDIR=	# empty
@@ -422,8 +406,6 @@ PYTHON_VER!=		${PYTHON_CMD} -c 'import s
 check-makevars::
 	@${ECHO} "Makefile error: bad value for PYTHON_VERSION: ${PYTHON_VERSION}."
 	@${ECHO} "Legal values are:"
-	@${ECHO} "  python2.4"
-	@${ECHO} "  python2.5"
 	@${ECHO} "  python2.6"
 	@${ECHO} "  python2.7 (default)"
 	@${ECHO} "  python3.1"
@@ -530,30 +512,12 @@ CONFIGURE_ENV+=	PYTHON="${PYTHON_CMD}"
 
 # Zope-related variables
 .if defined(USE_ZOPE)
-.if ${ZOPE_VERSION} == "3.2"
-SZOPEBASEDIR?=			www/Zope3
-ZOPE_PORTSDIR=			${PORTSDIR}/www/zope3
-ZOPESKELDIR=			${ZOPEBASEDIR}/zopeskel
-.elif ${ZOPE_VERSION} == "2.10"
-SZOPEBASEDIR?=			www/Zope210
-ZOPE_PORTSDIR=			${PORTSDIR}/www/zope210
-ZOPESKELDIR=			${ZOPEBASEDIR}/skel
-.elif ${ZOPE_VERSION} == "2.9"
-SZOPEBASEDIR?=			www/Zope29
-ZOPE_PORTSDIR=			${PORTSDIR}/www/zope29
-ZOPESKELDIR=			${ZOPEBASEDIR}/skel
-.elif ${ZOPE_VERSION} == "2.8"
-SZOPEBASEDIR?=			www/Zope28
-ZOPE_PORTSDIR=			${PORTSDIR}/www/zope28
-ZOPESKELDIR=			${ZOPEBASEDIR}/skel
-.elif ${ZOPE_VERSION} == "2.7"
-SZOPEBASEDIR?=			www/Zope
-ZOPE_PORTSDIR=			${PORTSDIR}/www/zope
-ZOPESKELDIR=			${ZOPEBASEDIR}/skel
+.if ${ZOPE_VERSION} == "2.13"
+ZOPE_PORTSDIR=		${PORTSDIR}/www/zope213
 .else
 check-makevars::
 	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
-	@${ECHO} "Legal values are: 2.7 (default), 2.8, 2.9, 2.10, 3.2"
+	@${ECHO} "Legal values are: 2.13 (default)"
 	@${FALSE}
 .endif
 ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Mon Jul 16 16:46:10 2012	(r300955)
+++ head/lang/Makefile	Mon Jul 16 17:04:29 2012	(r300956)
@@ -273,8 +273,6 @@
     SUBDIR += python-doc-pdf-letter
     SUBDIR += python-doc-text
     SUBDIR += python-mode.el
-    SUBDIR += python24
-    SUBDIR += python25
     SUBDIR += python26
     SUBDIR += python27
     SUBDIR += python31

Modified: head/lang/python-doc-html/Makefile
==============================================================================
--- head/lang/python-doc-html/Makefile	Mon Jul 16 16:46:10 2012	(r300955)
+++ head/lang/python-doc-html/Makefile	Mon Jul 16 17:04:29 2012	(r300956)
@@ -30,7 +30,6 @@ DOCFORMAT?=	html
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_REL} >= 260
 .  if ${DOCFORMAT} == "html" || ${DOCFORMAT} == "text"
 WRKSRC=		${WRKDIR}/${DISTNAME}
 .  else
@@ -39,9 +38,6 @@ WRKSRC=		${WRKDIR}/docs-pdf
 .  if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
 IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
 .  endif
-.else
-IGNORE=		there is no documentation for this Python version, because it deprecated upstream
-.endif
 
 pre-install:
 	@cd ${WRKSRC} && \

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Mon Jul 16 16:46:10 2012	(r300955)
+++ head/www/Makefile	Mon Jul 16 17:04:29 2012	(r300956)
@@ -2128,8 +2128,6 @@
     SUBDIR += zend-framework
     SUBDIR += zenphoto
     SUBDIR += zerowait-httpd
-    SUBDIR += zope
-    SUBDIR += zope211
     SUBDIR += zope213
 
 .include <bsd.port.subdir.mk>

More information about the svn-ports-head mailing list