Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 06 Apr 2014 17:02:04 +1000
From:      Kubilay Kocak <koobs.freebsd@gmail.com>
To:        Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>,  ports-committers@freebsd.org, svn-ports-all@freebsd.org,  svn-ports-head@freebsd.org
Subject:   Re: svn commit: r350299 - head/lang/python33
Message-ID:  <5340FBEC.9020200@FreeBSD.org>
In-Reply-To: <201404060547.s365l98Y007388@svn.freebsd.org>
References:  <201404060547.s365l98Y007388@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 6/04/2014 3:47 PM, Sunpoet Po-Chuan Hsieh wrote:
> Author: sunpoet
> Date: Sun Apr  6 05:47:08 2014
> New Revision: 350299
> URL: http://svnweb.freebsd.org/changeset/ports/350299
> QAT: https://qat.redports.org/buildarchive/r350299/
> 
> Log:
>   - Fix shebang
>   - Use USES=tar:xz
>   - Bump PORTREVISION for package change
>   - Space/Tab twiddle
> 
> Modified:
>   head/lang/python33/Makefile
> 
> Modified: head/lang/python33/Makefile
> ==============================================================================
> --- head/lang/python33/Makefile	Sun Apr  6 05:47:04 2014	(r350298)
> +++ head/lang/python33/Makefile	Sun Apr  6 05:47:08 2014	(r350299)
> @@ -1,31 +1,30 @@
>  # $FreeBSD$
>  
> -PORTNAME=		python33
> -PORTVERSION=		3.3.5
> -CATEGORIES=		lang python ipv6
> -MASTER_SITES=		PYTHON
> +PORTNAME=	python33
> +PORTVERSION=	3.3.5
> +CATEGORIES=	lang python ipv6
> +MASTER_SITES=	PYTHON
>  MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
> -DISTFILES=		${PYTHON_DISTFILE}
> -DIST_SUBDIR=		python
> +DISTFILES=	${PYTHON_DISTFILE}
> +DIST_SUBDIR=	python
>  
>  MAINTAINER=	python@FreeBSD.org
>  COMMENT=	Interpreted object-oriented programming language
>  
>  LICENSE=	PSFL
>  
> -GNU_CONFIGURE=		yes
> +GNU_CONFIGURE=	yes
>  CONFIGURE_SCRIPT=	../configure # must be relative
> -CONFIGURE_ENV=		OPT="" SVNVERSION="echo freebsd"
> -MAKE_ENV=		VPATH="${PYTHON_WRKSRC}"
> +CONFIGURE_ENV=	OPT="" SVNVERSION="echo freebsd"
> +MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
>  
> -INSTALL_TARGET=		altinstall
> +INSTALL_TARGET=	altinstall
>  
> -USES=		gmake readline
> +USES=		gmake readline shebangfix tar:xz
>  USE_LDCONFIG=	yes
>  USE_PYTHON=	yes
> -USE_XZ=		yes
>  
> -PYTHON_VERSION=		python3.3
> +PYTHON_VERSION=	python3.3
>  PYTHON_NO_DEPENDS=	yes
>  
>  WRKSRC=		${PYTHON_WRKSRC}/portbld.static
> @@ -51,8 +50,15 @@ BIN_FILES=	python python-shared python-c
>  BINLINKS_SUB=	-e 's,(2to3|idle3|pydoc3),\1-${PYTHON_VER},' \
>  		-e 's,(python-shared|python),\1${PYTHON_VER},'
>  
> +SHEBANG_FILES=	../Tools/gdb/libpython.py \
> +		../Tools/pybench/Setup.py
> +SHEBANG_LANG=	python2
> +python_CMD=	${PYTHON_CMD}
> +python2_OLD_CMD=python
> +python2_CMD=	${PYTHON_CMD}
> +
>  OPTIONS_DEFINE=	THREADS PYMALLOC IPV6 FPECTL EXAMPLES NLS
> -OPTIONS_DEFAULT=	THREADS PYMALLOC IPV6
> +OPTIONS_DEFAULT=THREADS PYMALLOC IPV6
>  
>  NLS_DESC=	Enable Gettext support for the locale module
>  
> @@ -109,6 +115,9 @@ CONFIGURE_ARGS+=	--disable-ipv6
>  CONFIGURE_ARGS+=	--with-fpectl
>  .endif
>  
> +post-extract:
> +	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
> +
>  pre-patch:
>  	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
>  		${PATCH_WRKSRC}/Lib/plat-freebsd9
> @@ -116,7 +125,6 @@ pre-patch:
>  		${PATCH_WRKSRC}/Lib/plat-freebsd10
>  	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
>  		${PATCH_WRKSRC}/Lib/plat-freebsd11
> -	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
>  .for script in ${BIN_SCRIPTS}
>  	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
>  		${PATCH_WRKSRC}/Tools/scripts/${script} \
> @@ -210,8 +218,6 @@ post-install:
>  		(cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -)
>  .endif
>  
> -	@${CAT} ${PKGMESSAGE}
> -
>  regression-test: build
>  	@cd ${WRKSRC} && ${GMAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} test
>  
> 

Love the cleanup sunpoet :)

Do any of the above changes also apply to our other Python ports?

Maintaining consistency where its possible to do so would be great, and
helps minimise maintenance complexity for us and behaviour differences
between ports for our users

Koobs



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