From owner-svn-ports-all@FreeBSD.ORG Tue Oct 29 16:56:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 455EE1D5; Tue, 29 Oct 2013 16:56:42 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 334AC24F6; Tue, 29 Oct 2013 16:56:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TGugpb048367; Tue, 29 Oct 2013 16:56:42 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TGufOQ048365; Tue, 29 Oct 2013 16:56:41 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201310291656.r9TGufOQ048365@svn.freebsd.org> From: Koop Mast Date: Tue, 29 Oct 2013 16:56:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331971 - head/x11-toolkits/py-gtk2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 16:56:42 -0000 Author: kwm Date: Tue Oct 29 16:56:41 2013 New Revision: 331971 URL: http://svnweb.freebsd.org/changeset/ports/331971 Log: Stageify, use COPYTREE_SHARE instead of doing tar and chown/chmod ourself. Restrict to python -2.7 [1]. Submitted by: mva@ [1] Modified: head/x11-toolkits/py-gtk2/Makefile head/x11-toolkits/py-gtk2/pkg-plist Modified: head/x11-toolkits/py-gtk2/Makefile ============================================================================== --- head/x11-toolkits/py-gtk2/Makefile Tue Oct 29 16:47:46 2013 (r331970) +++ head/x11-toolkits/py-gtk2/Makefile Tue Oct 29 16:56:41 2013 (r331971) @@ -4,11 +4,12 @@ PORTNAME= gtk PORTVERSION= 2.24.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 2 DISTNAME= pygtk-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,14 +19,12 @@ COMMENT= Set of Python bindings for GTK+ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo -LATEST_LINK= py-gtk2 USE_BZIP2= yes USES= pathfix gettext gmake pkgconfig USE_GNOME= libglade2 pygobject -USE_PYTHON= yes +USE_PYTHON= -2.7 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lintl" \ - PYTHON="${PYTHON_VERSION}" +CONFIGURE_ENV= PYTHON="${PYTHON_VERSION}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-docs @@ -37,9 +36,8 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py CONFLICTS= py*-gtk-0* OPTIONS_DEFINE= NUMPY -NUMPY_DESC= Numpy support (pulls in gcc44) +NUMPY_DESC= Numpy support (pulls in lang/gcc) -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNUMPY} @@ -64,16 +62,16 @@ CONFIGURE_ARGS+= --disable-thread post-install: .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - - ${CHOWN} -R ${BINOWN}:${BINGRP} ${EXAMPLESDIR} - ${FIND} ${EXAMPLESDIR} -type d -print | ${XARGS} ${CHMOD} 0555 - ${FIND} ${EXAMPLESDIR} -type f -print | ${XARGS} ${CHMOD} 0444 + @${RM} ${WRKSRC}/examples/pygtk-demo/pygtk-demo.in + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${EG_SRC_DIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/MAPPING ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/THREADS ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/MAPPING ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/THREADS ${STAGEDIR}${DOCSDIR} .endif + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gtk-2.0/gtk/*.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gtk-2.0/*.so .include Modified: head/x11-toolkits/py-gtk2/pkg-plist ============================================================================== --- head/x11-toolkits/py-gtk2/pkg-plist Tue Oct 29 16:47:46 2013 (r331970) +++ head/x11-toolkits/py-gtk2/pkg-plist Tue Oct 29 16:56:41 2013 (r331971) @@ -698,7 +698,6 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/treemodel.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/ui_manager.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/pygtk-demo -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/pygtk-demo.in %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/pygtk-demo.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/dnd.py