From owner-svn-ports-head@FreeBSD.ORG Sat Feb 21 11:05:24 2015 Return-Path: Delivered-To: svn-ports-head@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 8437F310; Sat, 21 Feb 2015 11:05:24 +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 5544F777; Sat, 21 Feb 2015 11:05:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1LB5O7R085142; Sat, 21 Feb 2015 11:05:24 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1LB5OuN085141; Sat, 21 Feb 2015 11:05:24 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201502211105.t1LB5OuN085141@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 21 Feb 2015 11:05:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379496 - head/www/litmus/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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2015 11:05:24 -0000 Author: marino Date: Sat Feb 21 11:05:23 2015 New Revision: 379496 URL: https://svnweb.freebsd.org/changeset/ports/379496 QAT: https://qat.redports.org/buildarchive/r379496/ Log: www/litmus: The "DONTSTRIP" hack didn't work, let's use BSD_INSTALL_* ! Modern binutils squawks if an attempt to strip an non-executable is made, as seen below DONTSTRIP doesn't work, at least not in all cases: DONTSTRIP=1 install -s -o root -g wheel -m 555 ./litmus /wrkdirs/www/litmus/work/stage/usr/local/bin/litmus /usr/libexec/binutils224/elf/strip: /wrkdirs/www/litmus/work/stage/usr/local/bin/litmus: File format not recognized I closer look at the Makefile.in patch revealed that BSD_INSTALL_SCRIPT should have been used instead. While here, convert all the install variables to BSD_INSTALL_* Approved by: just fix it Modified: head/www/litmus/files/patch-Makefile.in Modified: head/www/litmus/files/patch-Makefile.in ============================================================================== --- head/www/litmus/files/patch-Makefile.in Sat Feb 21 10:14:37 2015 (r379495) +++ head/www/litmus/files/patch-Makefile.in Sat Feb 21 11:05:23 2015 (r379496) @@ -1,11 +1,17 @@ ---- Makefile.in.orig 2015-02-11 08:44:24.000000000 +0100 -+++ Makefile.in 2015-02-11 08:44:07.000000000 +0100 -@@ -69,7 +69,7 @@ +--- Makefile.in.orig 2008-09-29 20:22:38 UTC ++++ Makefile.in +@@ -69,11 +69,11 @@ install: $(TESTS) litmus $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(libexecdir)/litmus $(INSTALL) -d $(DESTDIR)$(datadir)/litmus/htdocs - $(INSTALL_PROGRAM) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus -+ DONTSTRIP=1 $(INSTALL_PROGRAM) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus ++ $(BSD_INSTALL_SCRIPT) $(top_builddir)/litmus $(DESTDIR)$(bindir)/litmus for t in $(TESTS); do \ - $(INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done +- $(INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done ++ $(BSD_INSTALL_PROGRAM) $(top_builddir)/$$t $(DESTDIR)$(libexecdir)/litmus/$$t; done for d in $(HTDOCS); do \ +- $(INSTALL_DATA) $(top_srcdir)/htdocs/$$d $(DESTDIR)$(datadir)/litmus/htdocs/$d; done ++ $(BSD_INSTALL_DATA) $(top_srcdir)/htdocs/$$d $(DESTDIR)$(datadir)/litmus/htdocs/$d; done + + props: src/props.o $(ODEPS) + $(CC) $(LDFLAGS) -o $@ src/props.o $(ALL_LIBS)