From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 16:48:29 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 76EF6B4F; Fri, 6 Jun 2014 16:48:29 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49FFF2689; Fri, 6 Jun 2014 16:48:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56GmTHo030272; Fri, 6 Jun 2014 16:48:29 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56GmSbi030270; Fri, 6 Jun 2014 16:48:28 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406061648.s56GmSbi030270@svn.freebsd.org> From: Bryan Drewery Date: Fri, 6 Jun 2014 16:48:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356820 - head/security/gnutls3 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.18 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: Fri, 06 Jun 2014 16:48:29 -0000 Author: bdrewery Date: Fri Jun 6 16:48:28 2014 New Revision: 356820 URL: http://svnweb.freebsd.org/changeset/ports/356820 QAT: https://qat.redports.org/buildarchive/r356820/ Log: - Fix build when info files get regenerated, thus causing info-5 to disappear. Depending on which makeinfo version is used it would spit out 6 files or 5 (.info,1-5). It would not always regenerate though. The bundled info files went to -5. Now force regenerate it always using the base makeinfo(1) and use --no-split so only 1 file is used. PR: 190693 Reported by: many Modified: head/security/gnutls3/Makefile head/security/gnutls3/pkg-plist Modified: head/security/gnutls3/Makefile ============================================================================== --- head/security/gnutls3/Makefile Fri Jun 6 16:13:47 2014 (r356819) +++ head/security/gnutls3/Makefile Fri Jun 6 16:48:28 2014 (r356820) @@ -3,7 +3,7 @@ PORTNAME= gnutls PORTVERSION= 3.1.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/ PKGNAMESUFFIX= ${GNUTLS_SUFFIX} @@ -24,7 +24,7 @@ USE_LDCONFIG= ${PREFIX}/lib/gnutls3 CPPFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ENV= MAKEINFO=/usr/bin/makeinfo +CONFIGURE_ENV= MAKEINFO="/usr/bin/makeinfo --no-split" CONFIGURE_ARGS= --program-suffix=${GNUTLS_SUFFIX} \ --includedir="${PREFIX}/include/gnutls${GNUTLS_SUFFIX}" \ --libdir="${PREFIX}/lib/gnutls${GNUTLS_SUFFIX}" \ @@ -65,6 +65,10 @@ EXAMPLES= doc/examples/*.c post-patch: @${MV} ${WRKSRC}/libdane/gnutls-dane.pc.in \ ${WRKSRC}/libdane/gnutls${GNUTLS_SUFFIX}-dane.pc.in + # Force regenerating as the dist has info-5, but sometimes when + # regnerating it will decide to only create up to info-4, thus + # causing plist discrepency. So just rebuild and use --no-split + @${RM} ${WRKSRC}/doc/gnutls.info* pre-configure: @${CP} ${WRKSRC}/lib/gnutls.pc.in ${WRKSRC}/lib/gnutls${GNUTLS_SUFFIX}.pc.in Modified: head/security/gnutls3/pkg-plist ============================================================================== --- head/security/gnutls3/pkg-plist Fri Jun 6 16:13:47 2014 (r356819) +++ head/security/gnutls3/pkg-plist Fri Jun 6 16:48:28 2014 (r356820) @@ -36,11 +36,6 @@ info/gnutls3/gnutls-modauth.png info/gnutls3/gnutls-pgp.png info/gnutls3/gnutls-x509.png info/gnutls3/gnutls.info -info/gnutls3/gnutls.info-1 -info/gnutls3/gnutls.info-2 -info/gnutls3/gnutls.info-3 -info/gnutls3/gnutls.info-4 -info/gnutls3/gnutls.info-5 info/gnutls3/pkcs11-vision.png %%LIBDANE%%lib/gnutls3/libgnutls-dane.a %%LIBDANE%%lib/gnutls3/libgnutls-dane.la