From 23c5c0c7d811d1e68cb54b423b4b78f34209e5e1 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 1 Sep 2014 19:52:11 +0000
Subject: Convert to USES=libtool and USES=python

Obtained from:	gnome-dev
---
 devel/glib20/Makefile  | 18 ++++++++++--------
 devel/glib20/pkg-plist | 10 +++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'devel/glib20')

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 7b297d204e80..cdf461b6d1da 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.36.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,17 +22,16 @@ PORTSCOUT=	limitw:1,even
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libffi.so:${PORTSDIR}/devel/libffi
 
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
 # (wchar_t is used by glibmm, rawtherapee triggered this)
-USES+=		gettext gmake iconv:wchar_t pathfix pkgconfig shebangfix perl5
-USE_GNOME=	ltverhack
-USE_PYTHON=	yes
-PYTHON_PY3K_PLIST_HACK=	yes
-CONFIGURE_ARGS=	--enable-static \
-		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
+USES+=		gettext gmake iconv:wchar_t libtool pathfix perl5 \
+		pkgconfig python shebangfix
+PYTHON_FEATURES=	py3kplist
+CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
+		--enable-static \
 		--with-pcre=system \
 		--disable-fam
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=
@@ -42,6 +41,9 @@ INSTALL_TARGET=	install-strip
 
 SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
 
+LIBVERSION=	0.3600.3
+PLIST_SUB+=	LIBVERSION=${LIBVERSION}
+
 OPTIONS_DEFINE=	COLLATION_FIX DEBUG
 COLLATION_FIX_DESC=	fix string collation
 
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 4ffc74514a22..e9016c103563 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -262,25 +262,25 @@ include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libgio-2.0.a
-lib/libgio-2.0.la
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
+lib/libgio-2.0.so.%%LIBVERSION%%
 lib/libglib-2.0.a
-lib/libglib-2.0.la
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
+lib/libglib-2.0.so.%%LIBVERSION%%
 lib/libgmodule-2.0.a
-lib/libgmodule-2.0.la
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.%%LIBVERSION%%
 lib/libgobject-2.0.a
-lib/libgobject-2.0.la
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.%%LIBVERSION%%
 lib/libgthread-2.0.a
-lib/libgthread-2.0.la
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.%%LIBVERSION%%
 libdata/pkgconfig/gio-2.0.pc
 libdata/pkgconfig/gio-unix-2.0.pc
 libdata/pkgconfig/glib-2.0.pc
-- 
cgit v1.2.3