[Midnightbsd-cvs] mports [17763] trunk/x11-toolkits/py-gtk2/pkg-plist: py-gtk2 fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Oct 15 20:42:03 EDT 2014 

Revision: 17763
          http://svnweb.midnightbsd.org/mports/?rev=17763
Author:   laffer1
Date:     2014-10-15 20:42:02 -0400 (Wed, 15 Oct 2014)
Log Message:
-----------
py-gtk2 fix build

Modified Paths:
--------------
    trunk/x11-toolkits/py-gtk2/Makefile
    trunk/x11-toolkits/py-gtk2/distinfo
    trunk/x11-toolkits/py-gtk2/pkg-descr
    trunk/x11-toolkits/py-gtk2/pkg-plist

Property Changed:
----------------
    trunk/x11-toolkits/py-gtk2/pkg-descr

Modified: trunk/x11-toolkits/py-gtk2/Makefile
===================================================================
--- trunk/x11-toolkits/py-gtk2/Makefile	2014-10-16 00:37:37 UTC (rev 17762)
+++ trunk/x11-toolkits/py-gtk2/Makefile	2014-10-16 00:42:02 UTC (rev 17763)
@@ -1,31 +1,32 @@
 # $MidnightBSD$
 
-PORTNAME=	py-gtk
+PORTNAME=	gtk
 PORTVERSION=	2.24.0
+PORTREVISION=	1
 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
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A set of Python bindings for GTK+
+COMMENT=	Set of Python bindings for GTK+
+
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack libglade2 pygobject
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	libglade2 pygobject
+USE_PYTHON=	2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-lintl" \
-		PYTHON="${PYTHON_VERSION}"
+CONFIGURE_ENV=	PYTHON="${PYTHON_VERSION}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-docs
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/py-gtk
 EG_SRC_DIR=	${WRKSRC}/examples
@@ -33,11 +34,12 @@
 
 CONFLICTS=	py*-gtk-0*
 
-OPTIONS=	NUMPY "Enable numpy support (pulls in gcc44)" off
+OPTIONS_DEFINE=	NUMPY DOCS EXAMPLES
+NUMPY_DESC=	Numpy support (pulls in lang/gcc)
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_NUMPY)
+.if ${PORT_OPTIONS:MNUMPY}
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 CONFIGURE_ARGS+=--enable-numpy
@@ -52,26 +54,23 @@
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-thread
 CFLAGS+=		${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-thread
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .endif
-.endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${RM} ${WRKSRC}/examples/pygtk-demo/pygtk-demo.in
 	${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
+	cd ${EG_SRC_DIR} && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MAPPING ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/THREADS ${DOCSDIR}
 .endif
+	@${STRIP_CMD} ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/*.so
+	@${STRIP_CMD} ${PYTHON_SITELIBDIR}/gtk-2.0/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11-toolkits/py-gtk2/distinfo
===================================================================
--- trunk/x11-toolkits/py-gtk2/distinfo	2014-10-16 00:37:37 UTC (rev 17762)
+++ trunk/x11-toolkits/py-gtk2/distinfo	2014-10-16 00:42:02 UTC (rev 17763)
@@ -1,3 +1,2 @@
 SHA256 (gnome2/pygtk-2.24.0.tar.bz2) = cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
-RMD160 (gnome2/pygtk-2.24.0.tar.bz2) = 33f597def646261483cbbf5491aeb27bf0d22ea6
 SIZE (gnome2/pygtk-2.24.0.tar.bz2) = 2361097

Modified: trunk/x11-toolkits/py-gtk2/pkg-descr
===================================================================
--- trunk/x11-toolkits/py-gtk2/pkg-descr	2014-10-16 00:37:37 UTC (rev 17762)
+++ trunk/x11-toolkits/py-gtk2/pkg-descr	2014-10-16 00:42:02 UTC (rev 17763)
@@ -2,7 +2,6 @@
 
  PyGTK
  =====
- Author: James Henstridge <james at daa.com.au>
 
  This archive contains modules that allow you to use gtk in Python
  programs.  At present, it is a fairly complete set of bindings.


Property changes on: trunk/x11-toolkits/py-gtk2/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-toolkits/py-gtk2/pkg-plist
===================================================================
--- trunk/x11-toolkits/py-gtk2/pkg-plist	2014-10-16 00:37:37 UTC (rev 17762)
+++ trunk/x11-toolkits/py-gtk2/pkg-plist	2014-10-16 00:42:02 UTC (rev 17763)
@@ -100,12 +100,10 @@
 lib/pygtk/2.0/pygtk-demo.py
 lib/pygtk/2.0/pygtk-demo.pyc
 lib/pygtk/2.0/pygtk-demo.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/atk.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyc
@@ -116,16 +114,12 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.so
 libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/MAPPING
@@ -698,7 +692,6 @@
 %%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

More information about the Midnightbsd-cvs mailing list