From owner-svn-ports-all@FreeBSD.ORG Sun Nov 30 11:04:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7650A299; Sun, 30 Nov 2014 11:04:03 +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 487DD6AD; Sun, 30 Nov 2014 11:04:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUB433o003712; Sun, 30 Nov 2014 11:04:03 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUB42bG003706; Sun, 30 Nov 2014 11:04:02 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201411301104.sAUB42bG003706@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 30 Nov 2014 11:04:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373660 - in head/converters/libiconv: . 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: Sun, 30 Nov 2014 11:04:03 -0000 Author: tijl Date: Sun Nov 30 11:04:02 2014 New Revision: 373660 URL: https://svnweb.freebsd.org/changeset/ports/373660 QAT: https://qat.redports.org/buildarchive/r373660/ Log: Restore a patch hunk that was removed in r373636. It fixes a reference to the stage directory in an installed binary. Reported by: antoine Modified: head/converters/libiconv/Makefile head/converters/libiconv/files/patch-src__Makefile.in Modified: head/converters/libiconv/Makefile ============================================================================== --- head/converters/libiconv/Makefile Sun Nov 30 10:51:16 2014 (r373659) +++ head/converters/libiconv/Makefile Sun Nov 30 11:04:02 2014 (r373660) @@ -3,7 +3,7 @@ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= converters devel MASTER_SITES= GNU Modified: head/converters/libiconv/files/patch-src__Makefile.in ============================================================================== --- head/converters/libiconv/files/patch-src__Makefile.in Sun Nov 30 10:51:16 2014 (r373659) +++ head/converters/libiconv/files/patch-src__Makefile.in Sun Nov 30 11:04:02 2014 (r373660) @@ -8,3 +8,12 @@ # This is the temporary iconv executable, without internationalization. iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) +@@ -113,7 +112,7 @@ + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) +