Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Apr 2014 20:50:01 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351040 - head/devel/py-gobject
Message-ID:  <201404112050.s3BKo1uG039268@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Fri Apr 11 20:50:00 2014
New Revision: 351040
URL: http://svnweb.freebsd.org/changeset/ports/351040
QAT: https://qat.redports.org/buildarchive/r351040/

Log:
  Fix python module compilation, so propper prefix's are embedded in the
  pyc/pyo files.
  Use USES=tar:bzip, strip via INSTALL_TARGET=install-strip

Modified:
  head/devel/py-gobject/Makefile
  head/devel/py-gobject/pkg-plist

Modified: head/devel/py-gobject/Makefile
==============================================================================
--- head/devel/py-gobject/Makefile	Fri Apr 11 20:47:28 2014	(r351039)
+++ head/devel/py-gobject/Makefile	Fri Apr 11 20:50:00 2014	(r351040)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,24 +23,27 @@ LIB_DEPENDS+=	libffi.so:${PORTSDIR}/deve
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 
-USES=		gmake pathfix pkgconfig
-USE_XZ=		yes
+USES=		gmake pathfix pkgconfig tar:xz
 USE_GNOME=	glib20
 USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-docs --disable-introspection --with-ffi
+INSTALL_TARGET=	install-strip
 
 CONFLICTS=	py*-gtk-0*
 PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
 
-post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${STAGEDIR}${PREFIX}/share/pygobject/2.0/codegen
+PYSHAREDIR=	${PREFIX}/share/pygobject/2.0/codegen
 
-.for l in glib/_glib gobject/_gobject gtk-2.0/gio/_gio gtk-2.0/gio/unix
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${l}.so
-.endfor
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyglib-2.0-python${PYTHON_VER}.so.0
+post-install:
+	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYSHAREDIR} -f ${PYSHAREDIR:S;${PREFIX}/;;}
+	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYSHAREDIR} -f ${PYSHAREDIR:S;${PREFIX}/;;}
 
 .include <bsd.port.mk>

Modified: head/devel/py-gobject/pkg-plist
==============================================================================
--- head/devel/py-gobject/pkg-plist	Fri Apr 11 20:47:28 2014	(r351039)
+++ head/devel/py-gobject/pkg-plist	Fri Apr 11 20:50:00 2014	(r351040)
@@ -103,17 +103,22 @@ share/pygobject/2.0/codegen/argtypes.pyc
 share/pygobject/2.0/codegen/argtypes.pyo
 share/pygobject/2.0/codegen/code-coverage.py
 share/pygobject/2.0/codegen/code-coverage.pyc
+share/pygobject/2.0/codegen/code-coverage.pyo
 share/pygobject/2.0/codegen/codegen.py
 share/pygobject/2.0/codegen/codegen.pyc
+share/pygobject/2.0/codegen/codegen.pyo
 share/pygobject/2.0/codegen/createdefs.py
 share/pygobject/2.0/codegen/createdefs.pyc
+share/pygobject/2.0/codegen/createdefs.pyo
 share/pygobject/2.0/codegen/definitions.py
 share/pygobject/2.0/codegen/definitions.pyc
 share/pygobject/2.0/codegen/definitions.pyo
 share/pygobject/2.0/codegen/defsconvert.py
 share/pygobject/2.0/codegen/defsconvert.pyc
+share/pygobject/2.0/codegen/defsconvert.pyo
 share/pygobject/2.0/codegen/defsgen.py
 share/pygobject/2.0/codegen/defsgen.pyc
+share/pygobject/2.0/codegen/defsgen.pyo
 share/pygobject/2.0/codegen/defsparser.py
 share/pygobject/2.0/codegen/defsparser.pyc
 share/pygobject/2.0/codegen/defsparser.pyo
@@ -122,16 +127,22 @@ share/pygobject/2.0/codegen/docextract.p
 share/pygobject/2.0/codegen/docextract.pyo
 share/pygobject/2.0/codegen/docextract_to_xml.py
 share/pygobject/2.0/codegen/docextract_to_xml.pyc
+share/pygobject/2.0/codegen/docextract_to_xml.pyo
 share/pygobject/2.0/codegen/docgen.py
 share/pygobject/2.0/codegen/docgen.pyc
+share/pygobject/2.0/codegen/docgen.pyo
 share/pygobject/2.0/codegen/h2def.py
 share/pygobject/2.0/codegen/h2def.pyc
+share/pygobject/2.0/codegen/h2def.pyo
 share/pygobject/2.0/codegen/mergedefs.py
 share/pygobject/2.0/codegen/mergedefs.pyc
+share/pygobject/2.0/codegen/mergedefs.pyo
 share/pygobject/2.0/codegen/missingdefs.py
 share/pygobject/2.0/codegen/missingdefs.pyc
+share/pygobject/2.0/codegen/missingdefs.pyo
 share/pygobject/2.0/codegen/mkskel.py
 share/pygobject/2.0/codegen/mkskel.pyc
+share/pygobject/2.0/codegen/mkskel.pyo
 share/pygobject/2.0/codegen/override.py
 share/pygobject/2.0/codegen/override.pyc
 share/pygobject/2.0/codegen/override.pyo
@@ -140,8 +151,10 @@ share/pygobject/2.0/codegen/reversewrapp
 share/pygobject/2.0/codegen/reversewrapper.pyo
 share/pygobject/2.0/codegen/scanvirtuals.py
 share/pygobject/2.0/codegen/scanvirtuals.pyc
+share/pygobject/2.0/codegen/scanvirtuals.pyo
 share/pygobject/2.0/codegen/scmexpr.py
 share/pygobject/2.0/codegen/scmexpr.pyc
+share/pygobject/2.0/codegen/scmexpr.pyo
 share/pygobject/2.0/defs/gappinfo.override
 share/pygobject/2.0/defs/gapplaunchcontext.override
 share/pygobject/2.0/defs/gbufferedinputstream.override



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