Date: Thu, 28 Aug 2014 21:21:57 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366456 - in head: deskutils/virt-manager devel/libvirt devel/libvirt-glib devel/libvirt-java devel/p5-Sys-Virt devel/py-libvirt net-mgmt/collectd net-mgmt/collectd5 net-mgmt/virt-viewe... Message-ID: <201408282121.s7SLLwZC000916@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Aug 28 21:21:57 2014 New Revision: 366456 URL: http://svnweb.freebsd.org/changeset/ports/366456 QAT: https://qat.redports.org/buildarchive/r366456/ Log: security/libssh2: - Convert to USES=libtool and USES=pathfix - Add INSTALL_TARGET=install-strip - Only depend on openssl if GCRYPT option is off - Sanitize libssh2.pc devel/libvirt: - Remove workaround for broken libssh2.pc - Add USES=libtool and bump dependent ports - Convert to INSTALL_TARGET=install-strip devel/libvirt-glib: - Convert to USES=libtool Approved by: portmgr (implicit, bump unstaged port) Modified: head/deskutils/virt-manager/Makefile head/devel/libvirt-glib/Makefile head/devel/libvirt-glib/pkg-plist head/devel/libvirt-java/Makefile head/devel/libvirt/Makefile head/devel/libvirt/pkg-plist head/devel/p5-Sys-Virt/Makefile head/devel/py-libvirt/Makefile head/net-mgmt/collectd/Makefile head/net-mgmt/collectd5/Makefile head/net-mgmt/virt-viewer/Makefile head/net-mgmt/virtinst/Makefile head/net-mgmt/zenpack-libvirt/Makefile head/security/libssh2/Makefile head/security/libssh2/pkg-plist head/sysutils/cfengine33/Makefile head/sysutils/cfengine34/Makefile head/sysutils/cfengine35/Makefile head/sysutils/cfengine36/Makefile Modified: head/deskutils/virt-manager/Makefile ============================================================================== --- head/deskutils/virt-manager/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/deskutils/virt-manager/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= virt-manager PORTVERSION= 0.9.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ Modified: head/devel/libvirt-glib/Makefile ============================================================================== --- head/devel/libvirt-glib/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/libvirt-glib/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= libvirt-glib PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://libvirt.org/libvirt/glib/ @@ -13,9 +13,8 @@ COMMENT= Glib bindings for Libvirt virtu LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt GNU_CONFIGURE= yes -USES= pathfix pkgconfig gmake +USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool USE_GNOME= intltool introspection USE_PYTHON= 2 CPPFLAGS+= -I${LOCALBASE}/include @@ -25,8 +24,4 @@ INSTALL_TARGET= install-strip SHLIB_VER= 1.0 -post-patch: - @${REINPLACE_CMD} 's}--quiet}--quiet --libtool=${LIBTOOL}}' \ - ${WRKSRC}/libvirt-*/Makefile.in - .include <bsd.port.mk> Modified: head/devel/libvirt-glib/pkg-plist ============================================================================== --- head/devel/libvirt-glib/pkg-plist Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/libvirt-glib/pkg-plist Thu Aug 28 21:21:57 2014 (r366456) @@ -100,21 +100,16 @@ include/libvirt-gobject-1.0/libvirt-gobj %%LIB32DIR%%/girepository-1.0/LibvirtGLib-1.0.typelib %%LIB32DIR%%/girepository-1.0/LibvirtGConfig-1.0.typelib %%LIB32DIR%%/girepository-1.0/LibvirtGObject-1.0.typelib -%%LIB32DIR%%/libvirt-gconfig-1.0.a -%%LIB32DIR%%/libvirt-gconfig-1.0.la %%LIB32DIR%%/libvirt-gconfig-1.0.so -%%LIB32DIR%%/libvirt-gconfig-1.0.so.1 -%%LIB32DIR%%/libvirt-glib-1.0.a -%%LIB32DIR%%/libvirt-glib-1.0.la +%%LIB32DIR%%/libvirt-gconfig-1.0.so.0 +%%LIB32DIR%%/libvirt-gconfig-1.0.so.0.1.8 %%LIB32DIR%%/libvirt-glib-1.0.so -%%LIB32DIR%%/libvirt-glib-1.0.so.1 -%%LIB32DIR%%/libvirt-gobject-1.0.a -%%LIB32DIR%%/libvirt-gobject-1.0.la +%%LIB32DIR%%/libvirt-glib-1.0.so.0 +%%LIB32DIR%%/libvirt-glib-1.0.so.0.1.8 %%LIB32DIR%%/libvirt-gobject-1.0.so -%%LIB32DIR%%/libvirt-gobject-1.0.so.1 +%%LIB32DIR%%/libvirt-gobject-1.0.so.0 +%%LIB32DIR%%/libvirt-gobject-1.0.so.0.1.8 %%LIB32DIR%%/python2.7/site-packages/libvirtglib.py -%%LIB32DIR%%/python2.7/site-packages/libvirtglibmod.a -%%LIB32DIR%%/python2.7/site-packages/libvirtglibmod.la %%LIB32DIR%%/python2.7/site-packages/libvirtglibmod.so libdata/pkgconfig/libvirt-gconfig-1.0.pc libdata/pkgconfig/libvirt-glib-1.0.pc Modified: head/devel/libvirt-java/Makefile ============================================================================== --- head/devel/libvirt-java/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/libvirt-java/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= libvirt-java PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= http://libvirt.org/sources/java/ \ ftp://libvirt.org/libvirt/java/ Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/libvirt/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -54,31 +54,22 @@ CONFIGURE_ARGS= --without-sasl \ --without-uml \ --with-ssh2 -# workaround to override pkg-config calls # random_data fix can be removed when 8.x is eol -CONFIGURE_ENV= SSH2_LIBS="-L${LOCALBASE}/lib -lssh2 -lssl" \ - SSH2_CFLAGS="-I${LOCALBASE}/include" \ - ac_cv_type_struct_random_data="" +CONFIGURE_ENV= ac_cv_type_struct_random_data="" # limit production release x.x.x PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector -USES= charsetfix pathfix gmake pkgconfig perl5 +USES= charsetfix gmake libtool pathfix pkgconfig perl5 USE_PERL5= build USE_LDCONFIG= yes -SHLIB_VER= 1002 +INSTALL_TARGET= install-strip +SHLIB_VER= 0.1002.6 PLIST_SUB= PORTVERSION="-${PORTVERSION}" \ SHLIB_VER=${SHLIB_VER} PORTDOCS= * -STRIP_FILES= libvirt.so.${SHLIB_VER} \ - libvirt-qemu.so.${SHLIB_VER} \ - libvirt-lxc.so.${SHLIB_VER} \ - libvirt/lock-driver/lockd.so \ - libvirt/connection-driver/libvirt_driver_vbox.so \ - libvirt/connection-driver/libvirt_driver_secret.so \ - libvirt/connection-driver/libvirt_driver_storage.so .include <bsd.port.options.mk> @@ -119,10 +110,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.for lib in ${STRIP_FILES} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} -.endfor - regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/libvirt/pkg-plist Thu Aug 28 21:21:57 2014 (r366456) @@ -24,15 +24,14 @@ include/libvirt/libvirt-qemu.h include/libvirt/libvirt.h include/libvirt/virterror.h lib/libvirt/lock-driver/lockd.so -lib/libvirt/lock-driver/lockd.la -lib/libvirt-lxc.la lib/libvirt-lxc.so +lib/libvirt-lxc.so.0 lib/libvirt-lxc.so.%%SHLIB_VER%% -lib/libvirt-qemu.la lib/libvirt-qemu.so +lib/libvirt-qemu.so.0 lib/libvirt-qemu.so.%%SHLIB_VER%% -lib/libvirt.la lib/libvirt.so +lib/libvirt.so.0 lib/libvirt.so.%%SHLIB_VER%% libdata/pkgconfig/libvirt.pc libdata/pkgconfig/libvirt-lxc.pc @@ -268,17 +267,11 @@ share/gtk-doc/html/libvirt/up.png %%NLS%%share/locale/zh_TW/LC_MESSAGES/libvirt.mo %%NLS%%share/locale/zu/LC_MESSAGES/libvirt.mo %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so -%%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.la -%%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.la %%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so lib/libvirt/connection-driver/libvirt_driver_network.so -lib/libvirt/connection-driver/libvirt_driver_network.la lib/libvirt/connection-driver/libvirt_driver_secret.so -lib/libvirt/connection-driver/libvirt_driver_secret.la lib/libvirt/connection-driver/libvirt_driver_storage.so -lib/libvirt/connection-driver/libvirt_driver_storage.la lib/libvirt/connection-driver/libvirt_driver_vbox.so -lib/libvirt/connection-driver/libvirt_driver_vbox.la @dirrmtry etc/logrotate.d @dirrm include/libvirt @dirrm lib/libvirt/connection-driver Modified: head/devel/p5-Sys-Virt/Makefile ============================================================================== --- head/devel/p5-Sys-Virt/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/p5-Sys-Virt/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= Sys-Virt PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/devel/py-libvirt/Makefile ============================================================================== --- head/devel/py-libvirt/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/devel/py-libvirt/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,6 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/python/ \ ftp://libvirt.org/libvirt/python/ Modified: head/net-mgmt/collectd/Makefile ============================================================================== --- head/net-mgmt/collectd/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/net-mgmt/collectd/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 4.10.9 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/net-mgmt/collectd5/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ PKGNAMESUFFIX= 5 Modified: head/net-mgmt/virt-viewer/Makefile ============================================================================== --- head/net-mgmt/virt-viewer/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/net-mgmt/virt-viewer/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= virt-viewer PORTVERSION= 0.5.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ Modified: head/net-mgmt/virtinst/Makefile ============================================================================== --- head/net-mgmt/virtinst/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/net-mgmt/virtinst/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= virtinst PORTVERSION= 0.600.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/net-mgmt/zenpack-libvirt/Makefile ============================================================================== --- head/net-mgmt/zenpack-libvirt/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/net-mgmt/zenpack-libvirt/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.96 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/ DISTNAME= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} Modified: head/security/libssh2/Makefile ============================================================================== --- head/security/libssh2/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/security/libssh2/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ \ @@ -14,9 +14,9 @@ COMMENT= Library implementing the SSH2 p LICENSE= BSD3CLAUSE -USE_OPENSSL= yes -USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool pathfix USE_LDCONFIG= yes OPTIONS_DEFINE= GCRYPT TRACE ZLIB @@ -26,19 +26,26 @@ TRACE_DESC= Enable debug packet traces TRACE_CONFIGURE_ENABLE= debug GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt -GCRYPT_CONFIGURE_ON= --with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl -GCRYPT_CFLAGS= -I${LOCALBASE}/include -GCRYPT_LDFLAGS= -L${LOCALBASE}/lib +GCRYPT_CONFIGURE_ON= --with-libgcrypt --without-openssl +GCRYPT_CONFIGURE_OFF= --without-libgcrypt --with-openssl +GCRYPT_CPPFLAGS= -I${LOCALBASE}/include +GCRYPT_LIBS= -L${LOCALBASE}/lib ZLIB_CONFIGURE_WITH= libz +.include <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MGCRYPT} +USE_OPENSSL= yes +.endif + .include <bsd.port.pre.mk> post-patch: + @${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \ + ${WRKSRC}/libssh2.pc.in .if defined(WITH_OPENSSL_BASE) - @${REINPLACE_CMD} -e '/LIBSREQUIRED=/ s|libssl,libcrypto||' \ - ${WRKSRC}/configure.ac ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \ + ${WRKSRC}/configure .endif - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in .include <bsd.port.post.mk> Modified: head/security/libssh2/pkg-plist ============================================================================== --- head/security/libssh2/pkg-plist Thu Aug 28 20:31:21 2014 (r366455) +++ head/security/libssh2/pkg-plist Thu Aug 28 21:21:57 2014 (r366456) @@ -1,10 +1,10 @@ include/libssh2.h include/libssh2_publickey.h include/libssh2_sftp.h +lib/libssh2.a lib/libssh2.so lib/libssh2.so.1 -lib/libssh2.la -lib/libssh2.a +lib/libssh2.so.1.0.1 man/man3/libssh2_agent_connect.3.gz man/man3/libssh2_agent_disconnect.3.gz man/man3/libssh2_agent_free.3.gz Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/sysutils/cfengine33/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= cfengine PORTVERSION= 3.3.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 33 Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine34/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/sysutils/cfengine34/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= cfengine PORTVERSION= 3.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ Modified: head/sysutils/cfengine35/Makefile ============================================================================== --- head/sysutils/cfengine35/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/sysutils/cfengine35/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,7 +3,7 @@ PORTNAME= cfengine PORTVERSION= 3.5.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Thu Aug 28 20:31:21 2014 (r366455) +++ head/sysutils/cfengine36/Makefile Thu Aug 28 21:21:57 2014 (r366456) @@ -3,6 +3,7 @@ PORTNAME= cfengine PORTVERSION= 3.6.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408282121.s7SLLwZC000916>