From owner-svn-ports-all@FreeBSD.ORG Wed Feb 19 09:02:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0587986; Wed, 19 Feb 2014 09:02:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C0CE71C52; Wed, 19 Feb 2014 09:02:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1J92tNM038668; Wed, 19 Feb 2014 09:02:55 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1J92rnS038654; Wed, 19 Feb 2014 09:02:53 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201402190902.s1J92rnS038654@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 19 Feb 2014 09:02:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345036 - in head/security: openvas-client openvas-libnasl openvas-libraries openvas-plugins openvas-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 09:02:56 -0000 Author: amdmi3 Date: Wed Feb 19 09:02:53 2014 New Revision: 345036 URL: http://svnweb.freebsd.org/changeset/ports/345036 QAT: https://qat.redports.org/buildarchive/r345036/ Log: - Support staging - Use new LIB_DEPENDS syntax - Fix build of openvas-server on 10.x Modified: head/security/openvas-client/Makefile head/security/openvas-client/pkg-plist head/security/openvas-libnasl/Makefile head/security/openvas-libnasl/pkg-plist head/security/openvas-libraries/Makefile head/security/openvas-libraries/pkg-plist head/security/openvas-plugins/Makefile head/security/openvas-server/Makefile head/security/openvas-server/pkg-plist Modified: head/security/openvas-client/Makefile ============================================================================== --- head/security/openvas-client/Makefile Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-client/Makefile Wed Feb 19 09:02:53 2014 (r345036) @@ -10,15 +10,12 @@ MASTER_SITES= http://wald.intevation.org MAINTAINER= ports@FreeBSD.org COMMENT= GUI client for OpenVAS -MAN1= OpenVAS-Client.1 openvasclient-mkcert.1 - GNU_CONFIGURE= yes USES= gmake pkgconfig USE_GNOME= gtk20 MAKE_JOBS_UNSAFE=yes -NO_STAGE= yes .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" .include Modified: head/security/openvas-client/pkg-plist ============================================================================== --- head/security/openvas-client/pkg-plist Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-client/pkg-plist Wed Feb 19 09:02:53 2014 (r345036) @@ -1,4 +1,6 @@ bin/OpenVAS-Client bin/openvasclient-mkcert lib/openvas/openvas-ssh-client-rpm-creator.sh +man/man1/OpenVAS-Client.1.gz +man/man1/openvasclient-mkcert.1.gz @dirrmtry lib/openvas Modified: head/security/openvas-libnasl/Makefile ============================================================================== --- head/security/openvas-libnasl/Makefile Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-libnasl/Makefile Wed Feb 19 09:02:53 2014 (r345036) @@ -14,17 +14,14 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/se libgnutls.so:${PORTSDIR}/security/gnutls \ libgpg-error.so:${PORTSDIR}/security/libgpg-error \ libgpgme.so:${PORTSDIR}/security/gpgme \ - libopenvas.so.2:${PORTSDIR}/security/openvas-libraries \ - libopenvas_hg.so.2:${PORTSDIR}/security/openvas-libraries \ + libopenvas.so:${PORTSDIR}/security/openvas-libraries \ + libopenvas_hg.so:${PORTSDIR}/security/openvas-libraries \ libtasn1.so:${PORTSDIR}/security/libtasn1 GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= bison iconv pkgconfig -MAN1= openvas-libnasl-config.1 openvas-nasl.1 - -NO_STAGE= yes .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" LDFLAGS+= -lgcrypt Modified: head/security/openvas-libnasl/pkg-plist ============================================================================== --- head/security/openvas-libnasl/pkg-plist Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-libnasl/pkg-plist Wed Feb 19 09:02:53 2014 (r345036) @@ -5,4 +5,6 @@ lib/libopenvasnasl.a lib/libopenvasnasl.la lib/libopenvasnasl.so lib/libopenvasnasl.so.2 +man/man1/openvas-libnasl-config.1.gz +man/man1/openvas-nasl.1.gz @dirrmtry include/openvas Modified: head/security/openvas-libraries/Makefile ============================================================================== --- head/security/openvas-libraries/Makefile Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-libraries/Makefile Wed Feb 19 09:02:53 2014 (r345036) @@ -10,8 +10,8 @@ MASTER_SITES= http://wald.intevation.org MAINTAINER= ports@FreeBSD.org COMMENT= Libraries for OpenVAS -LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt USES= pkgconfig GNU_CONFIGURE= yes @@ -19,9 +19,6 @@ USE_LDCONFIG= yes USE_GNOME= glib20 MAKE_JOBS_UNSAFE= yes -MAN1= libopenvas-config.1 - -NO_STAGE= yes .include "${.CURDIR}/Makefile.common" .include Modified: head/security/openvas-libraries/pkg-plist ============================================================================== --- head/security/openvas-libraries/pkg-plist Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-libraries/pkg-plist Wed Feb 19 09:02:53 2014 (r345036) @@ -37,4 +37,5 @@ lib/libopenvas_hg.a lib/libopenvas_hg.la lib/libopenvas_hg.so lib/libopenvas_hg.so.2 +man/man1/libopenvas-config.1.gz @dirrm include/openvas Modified: head/security/openvas-plugins/Makefile ============================================================================== --- head/security/openvas-plugins/Makefile Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-plugins/Makefile Wed Feb 19 09:02:53 2014 (r345036) @@ -12,9 +12,9 @@ COMMENT= Plugins for OpenVAS BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \ openvasd:${PORTSDIR}/security/openvas-server -LIB_DEPENDS= openvas.2:${PORTSDIR}/security/openvas-libraries \ - openvasnasl.2:${PORTSDIR}/security/openvas-libnasl \ - gnutls.26:${PORTSDIR}/security/gnutls +LIB_DEPENDS= libopenvas.so:${PORTSDIR}/security/openvas-libraries \ + libopenvasnasl.so:${PORTSDIR}/security/openvas-libnasl \ + libgnutls.so:${PORTSDIR}/security/gnutls RUN_DEPENDS= openvasd:${PORTSDIR}/security/openvas-server \ ${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils \ ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync @@ -24,7 +24,6 @@ GNU_CONFIGURE= yes LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CPPFLAGS+= "`${LIBNET_CONFIG} --cflags`" -NO_STAGE= yes .include .include "${.CURDIR}/../openvas-libraries/Makefile.common" Modified: head/security/openvas-server/Makefile ============================================================================== --- head/security/openvas-server/Makefile Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-server/Makefile Wed Feb 19 09:02:53 2014 (r345036) @@ -10,17 +10,15 @@ MASTER_SITES= http://wald.intevation.org MAINTAINER= ports@FreeBSD.org COMMENT= Security scanner: a fork of Nessus -LIB_DEPENDS= openvas.2:${PORTSDIR}/security/openvas-libraries \ - openvasnasl.2:${PORTSDIR}/security/openvas-libnasl +LIB_DEPENDS= libopenvas.so:${PORTSDIR}/security/openvas-libraries \ + libopenvasnasl.so:${PORTSDIR}/security/openvas-libnasl GNU_CONFIGURE= yes USES= gettext pkgconfig USE_RC_SUBR= openvasd -MAN1= openvas-mkrand.1 openvas-mkcert-client.1 openvasd-config.1 -MAN8= openvasd.8 openvas-adduser.8 openvas-rmuser.8 openvas-mkcert.8 - -NO_STAGE= yes .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" +LDFLAGS+= -lgcrypt + .include Modified: head/security/openvas-server/pkg-plist ============================================================================== --- head/security/openvas-server/pkg-plist Wed Feb 19 09:01:18 2014 (r345035) +++ head/security/openvas-server/pkg-plist Wed Feb 19 09:02:53 2014 (r345036) @@ -9,6 +9,13 @@ include/openvas/nessusraw.h include/openvas/nessustcp.h include/openvas/nessusudp.h include/openvas/threadcompat.h +man/man1/openvas-mkcert-client.1.gz +man/man1/openvas-mkrand.1.gz +man/man1/openvasd-config.1.gz +man/man8/openvas-adduser.8.gz +man/man8/openvas-mkcert.8.gz +man/man8/openvas-rmuser.8.gz +man/man8/openvasd.8.gz openvas/lib/openvas/openvas-services sbin/openvas-adduser sbin/openvas-mkcert