[Midnightbsd-cvs] mports [17416] trunk/devel/libsoup: fix plist

[laffer1 at midnightbsd.org]

Revision: 17416
          http://svnweb.midnightbsd.org/mports/?rev=17416
Author:   laffer1
Date:     2014-09-19 22:12:36 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
fix plist

Modified Paths:
--------------
    trunk/devel/libsoup/Makefile
    trunk/devel/libsoup/pkg-plist

Modified: trunk/devel/libsoup/Makefile
===================================================================
--- trunk/devel/libsoup/Makefile	2014-09-20 02:04:39 UTC (rev 17415)
+++ trunk/devel/libsoup/Makefile	2014-09-20 02:12:36 UTC (rev 17416)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.40.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -13,7 +13,7 @@
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
-LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
 
 USES=		tar:xz
@@ -20,25 +20,26 @@
 
 .if !defined(REFERENCE_PORT)
 
-USES+=		gettext gmake pathfix pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomehier glib20 libxml2 referencehack intltool
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_PYTHON_BUILD=	2
 CONFIGURE_ARGS=	--disable-more-warnings
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	VERSION="2.4"
+LIBVERSION=	1.5.0
+PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
-USE_SQLITE=	yes
-LIB_DEPENDS+=	soup-2.4:${PORTSDIR}/devel/libsoup \
-		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+USE_SQLITE=	3
+LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 CONFIGURE_ARGS+=--with-gnome
 .else
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+USE_GNOME+=	introspection:build
 CONFIGURE_ARGS+=--without-gnome
 .endif
 
@@ -45,10 +46,12 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
+	 @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
+		${WRKSRC}/libsoup/tld-parser.py
 
 .if defined(SOUP_SLAVE)
 do-build:
-	cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la
+	cd ${WRKSRC}/libsoup && ${MAKE_CMD} libsoup-gnome-2.4.la
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/

Modified: trunk/devel/libsoup/pkg-plist
===================================================================
--- trunk/devel/libsoup/pkg-plist	2014-09-20 02:04:39 UTC (rev 17415)
+++ trunk/devel/libsoup/pkg-plist	2014-09-20 02:12:36 UTC (rev 17416)
@@ -49,7 +49,7 @@
 lib/libsoup-%%VERSION%%.a
 lib/libsoup-%%VERSION%%.la
 lib/libsoup-%%VERSION%%.so
-lib/libsoup-%%VERSION%%.so.1
+lib/libsoup-%%VERSION%%.so.6
 libdata/pkgconfig/libsoup-%%VERSION%%.pc
 share/gir-1.0/Soup-%%VERSION%%.gir
 share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html