Date: Sat, 8 Mar 2014 13:49:34 +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: r347496 - in head/devel: libsoup libsoup-gnome libsoup/files Message-ID: <201403081349.s28DnYOD059976@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Mar 8 13:49:33 2014 New Revision: 347496 URL: http://svnweb.freebsd.org/changeset/ports/347496 QAT: https://qat.redports.org/buildarchive/r347496/ Log: Stagify Use new lib_depend syntax. Add USES=libtool Use USE_GNOME introspection component Obtained from: GNOME dev repo Deleted: head/devel/libsoup/files/patch-libsoup_tld-parser.py Modified: head/devel/libsoup-gnome/Makefile head/devel/libsoup-gnome/pkg-plist head/devel/libsoup/Makefile head/devel/libsoup/pkg-plist Modified: head/devel/libsoup-gnome/Makefile ============================================================================== --- head/devel/libsoup-gnome/Makefile Sat Mar 8 13:46:00 2014 (r347495) +++ head/devel/libsoup-gnome/Makefile Sat Mar 8 13:49:33 2014 (r347496) @@ -15,5 +15,4 @@ PLIST= ${.CURDIR}/pkg-plist SOUP_SLAVE= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/devel/libsoup-gnome/pkg-plist ============================================================================== --- head/devel/libsoup-gnome/pkg-plist Sat Mar 8 13:46:00 2014 (r347495) +++ head/devel/libsoup-gnome/pkg-plist Sat Mar 8 13:49:33 2014 (r347496) @@ -1,10 +1,10 @@ include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h -lib/libsoup-gnome-%%VERSION%%.a lib/libsoup-gnome-%%VERSION%%.la lib/libsoup-gnome-%%VERSION%%.so lib/libsoup-gnome-%%VERSION%%.so.1 +lib/libsoup-gnome-%%VERSION%%.so.%%LIBVERSION%% libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc @dirrm include/libsoup-gnome-%%VERSION%%/libsoup @dirrm include/libsoup-gnome-%%VERSION%% Modified: head/devel/libsoup/Makefile ============================================================================== --- head/devel/libsoup/Makefile Sat Mar 8 13:46:00 2014 (r347495) +++ head/devel/libsoup/Makefile Sat Mar 8 13:49:33 2014 (r347496) @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/libsoup/Makefile 18456 2013-05-12 14:40:21Z kwm $ +# $MCom: ports/trunk/devel/libsoup/Makefile 19016 2014-03-08 09:05:27Z kwm $ PORTNAME= libsoup PORTVERSION= 2.40.3 @@ -10,64 +10,66 @@ MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A SOAP (Simple Object Access Protocol) implementation in C +COMMENT= SOAP (Simple Object Access Protocol) implementation in C -BUILD_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking \ - python2:${PORTSDIR}/lang/python2 -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt +BUILD_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking USE_XZ= yes .if !defined(REFERENCE_PORT) -USES= gettext pathfix gmake pkgconfig -USE_GNOME= gnomehier glib20 libxml2 ltverhack referencehack intltool +USES= gettext gmake libtool 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 -NO_STAGE= yes 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 do-install: - ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/ - ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${PREFIX}/lib/ - ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${PREFIX}/lib/ - ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${PREFIX}/lib/ - cd ${WRKSRC}/libsoup && ${GMAKE} install-libsoupgnomeincludeHEADERS + ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/ + cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS .endif post-install: .if defined(SOUP_SLAVE) - @${MKDIR} ${PREFIX}/libdata/pkgconfig - @${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \ - ${PREFIX}/libdata/pkgconfig/ + @${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ .else - @${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ - ${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h + ${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ + ${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsoup*.so* .endif .include <bsd.port.mk> Modified: head/devel/libsoup/pkg-plist ============================================================================== --- head/devel/libsoup/pkg-plist Sat Mar 8 13:46:00 2014 (r347495) +++ head/devel/libsoup/pkg-plist Sat Mar 8 13:49:33 2014 (r347496) @@ -50,6 +50,7 @@ lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.la lib/libsoup-%%VERSION%%.so lib/libsoup-%%VERSION%%.so.1 +lib/libsoup-%%VERSION%%.so.%%LIBVERSION%% libdata/pkgconfig/libsoup-%%VERSION%%.pc share/gir-1.0/Soup-%%VERSION%%.gir share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403081349.s28DnYOD059976>