From owner-svn-ports-all@FreeBSD.ORG Sat Aug 30 17:18:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11D87C06; Sat, 30 Aug 2014 17:18:30 +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 F15FB109F; Sat, 30 Aug 2014 17:18:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHITY6044483; Sat, 30 Aug 2014 17:18:29 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHIT4n044479; Sat, 30 Aug 2014 17:18:29 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201408301718.s7UHIT4n044479@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sat, 30 Aug 2014 17:18:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366650 - in head/security/heimdal: . files 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-1 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: Sat, 30 Aug 2014 17:18:30 -0000 Author: hrs Date: Sat Aug 30 17:18:28 2014 New Revision: 366650 URL: http://svnweb.freebsd.org/changeset/ports/366650 QAT: https://qat.redports.org/buildarchive/r366650/ Log: Fix build on branches which do not have com_right_r() in libcom_err. Spotted by: ume Added: head/security/heimdal/files/patch-lib-com_err-Makefile.in (contents, props changed) head/security/heimdal/files/patch-lib-hdb-Makefile.in (contents, props changed) Modified: head/security/heimdal/Makefile head/security/heimdal/pkg-plist Modified: head/security/heimdal/Makefile ============================================================================== --- head/security/heimdal/Makefile Sat Aug 30 17:16:02 2014 (r366649) +++ head/security/heimdal/Makefile Sat Aug 30 17:18:28 2014 (r366650) @@ -3,7 +3,7 @@ PORTNAME= heimdal PORTVERSION= 1.5.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= security ipv6 MASTER_SITES= http://www.h5l.org/dist/src/ \ http://ftp.pdc.kth.se/pub/heimdal/src/ \ @@ -84,6 +84,12 @@ X11_CONFIGURE_WITH= x .include +.if ${OSVERSION} < 1000000 +PLIST_SUB+= LIBCOM_ERR="" +.else +PLIST_SUB+= LIBCOM_ERR="@comment " +.endif + .if ${PORT_OPTIONS:MLDAP} WANT_OPENLDAP_SASL?= yes .endif Added: head/security/heimdal/files/patch-lib-com_err-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-lib-com_err-Makefile.in Sat Aug 30 17:18:28 2014 (r366650) @@ -0,0 +1,20 @@ +--- lib/com_err/Makefile.in.orig 2014-08-31 01:54:15.000000000 +0900 ++++ lib/com_err/Makefile.in 2014-08-31 01:58:56.000000000 +0900 +@@ -750,7 +750,7 @@ + uninstall: uninstall-am + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + + installcheck: installcheck-am + install-strip: +@@ -802,7 +802,7 @@ + + install-dvi-am: + +-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES ++install-exec-am: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + install-html: install-html-am Added: head/security/heimdal/files/patch-lib-hdb-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-lib-hdb-Makefile.in Sat Aug 30 17:18:28 2014 (r366650) @@ -0,0 +1,12 @@ +--- lib/hdb/Makefile.in.orig 2014-08-31 01:38:01.000000000 +0900 ++++ lib/hdb/Makefile.in 2014-08-31 01:44:03.000000000 +0900 +@@ -451,7 +451,8 @@ + BUILT_SOURCES = \ + $(gen_files_hdb:.x=.c) \ + hdb_err.c \ +- hdb_err.h ++ hdb_err.h \ ++ hdb_asn1.h + + gen_files_hdb = \ + asn1_Salt.x \ Modified: head/security/heimdal/pkg-plist ============================================================================== --- head/security/heimdal/pkg-plist Sat Aug 30 17:16:02 2014 (r366649) +++ head/security/heimdal/pkg-plist Sat Aug 30 17:18:28 2014 (r366650) @@ -106,6 +106,10 @@ lib/libasn1.a lib/libasn1.so lib/libasn1.so.8 lib/libasn1.so.8.0.0 +%%LIBCOM_ERR%%lib/libcom_err.a +%%LIBCOM_ERR%%lib/libcom_err.so +%%LIBCOM_ERR%%lib/libcom_err.so.1 +%%LIBCOM_ERR%%lib/libcom_err.so.1.1.3 lib/libgssapi.a lib/libgssapi.so lib/libgssapi.so.3