Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jan 2020 13:33:08 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522489 - in head/lang: python python2 python3
Message-ID:  <202001091333.009DX8Bt002354@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Jan  9 13:33:08 2020
New Revision: 522489
URL: https://svnweb.freebsd.org/changeset/ports/522489

Log:
  Garbage collecte unusable things from lang/python{,2,3} metaports.

Modified:
  head/lang/python/Makefile   (contents, props changed)
  head/lang/python2/Makefile   (contents, props changed)
  head/lang/python3/Makefile   (contents, props changed)

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Thu Jan  9 13:33:04 2020	(r522488)
+++ head/lang/python/Makefile	Thu Jan  9 13:33:08 2020	(r522489)
@@ -33,37 +33,4 @@ do-install:
 .endfor
 	${LN} -sf python${PYTHON_MAJOR_VER}-config ${STAGEDIR}${PREFIX}/bin/python-config
 
-# Major upgrade support
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
-
-.if defined(USE_PORTMASTER)
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
-.endif
-
-PKG_LIST=	${PKG_BIN} query -a '%n-%v'
-PKG_LIST_FILES=	${PKG_INFO} -l
-
-upgrade-site-packages:
-	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
-		${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
-		${FALSE}; \
-	 fi
-
-	@GREP_ARGS="-q"; \
-	for ver in `echo ${_PYTHON_ALLBRANCHES:C/${PYTHON_VER}//}`; do \
-		GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
-	done; \
-	UPD=""; \
-	for pkg in `${PKG_LIST}`; do \
-		${PKG_LIST_FILES} $${pkg} | ${GREP} $${GREP_ARGS} && \
-			UPD="$${UPD} $${pkg}"; \
-	done; \
-	if [ "$${UPD}" ]; then \
-		if [ -n ${PORTUPGRADE_ARGS} ]; then \
-			${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \
-		else \
-			${PORTUPGRADE_CMD} -f $${UPD}; \
-		fi; \
-	fi; \
-
 .include <bsd.port.mk>

Modified: head/lang/python2/Makefile
==============================================================================
--- head/lang/python2/Makefile	Thu Jan  9 13:33:04 2020	(r522488)
+++ head/lang/python2/Makefile	Thu Jan  9 13:33:08 2020	(r522489)
@@ -26,8 +26,6 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
-.include <bsd.port.pre.mk>
-
 do-install:
 .for file in idle pydoc python
 	${LN} -sf ${file}${PYTHON_VER} \
@@ -40,14 +38,4 @@ do-install:
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
-# Major upgrade support
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
-
-.if defined(USE_PORTMASTER)
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
-.endif
-
-PKG_LIST=	${PKG_BIN} query -a '%n-%v'
-PKG_LIST_FILES=	${PKG_INFO} -l
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/lang/python3/Makefile
==============================================================================
--- head/lang/python3/Makefile	Thu Jan  9 13:33:04 2020	(r522488)
+++ head/lang/python3/Makefile	Thu Jan  9 13:33:08 2020	(r522489)
@@ -23,8 +23,6 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
-.include <bsd.port.pre.mk>
-
 do-install:
 	${LN} -sf python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}
@@ -39,14 +37,4 @@ do-install:
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
-# Major upgrade support
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
-
-.if defined(USE_PORTMASTER)
-PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
-.endif
-
-PKG_LIST=	${PKG_BIN} query -a '%n-%v'
-PKG_LIST_FILES=	${PKG_INFO} -l
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001091333.009DX8Bt002354>