From owner-svn-ports-all@FreeBSD.ORG Tue Jun 10 15:08:00 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 336F8EEC; Tue, 10 Jun 2014 15:08:00 +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 076E7202F; Tue, 10 Jun 2014 15:08:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5AF7xRt051046; Tue, 10 Jun 2014 15:07:59 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5AF7xAH051044; Tue, 10 Jun 2014 15:07:59 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201406101507.s5AF7xAH051044@svn.freebsd.org> From: "Vanilla I. Shu" Date: Tue, 10 Jun 2014 15:07:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357319 - in head/science/simlib: . 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 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: Tue, 10 Jun 2014 15:08:00 -0000 Author: vanilla Date: Tue Jun 10 15:07:59 2014 New Revision: 357319 URL: http://svnweb.freebsd.org/changeset/ports/357319 QAT: https://qat.redports.org/buildarchive/r357319/ Log: Stagify. Modified: head/science/simlib/Makefile head/science/simlib/files/patch-src__Makefile.generic Modified: head/science/simlib/Makefile ============================================================================== --- head/science/simlib/Makefile Tue Jun 10 14:48:43 2014 (r357318) +++ head/science/simlib/Makefile Tue Jun 10 15:07:59 2014 (r357319) @@ -19,7 +19,6 @@ CXXFLAGS+= -fPIC NOT_FOR_ARCHS= ia64 powerpc sparc64 NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|make|gmake|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ Modified: head/science/simlib/files/patch-src__Makefile.generic ============================================================================== --- head/science/simlib/files/patch-src__Makefile.generic Tue Jun 10 14:48:43 2014 (r357318) +++ head/science/simlib/files/patch-src__Makefile.generic Tue Jun 10 15:07:59 2014 (r357319) @@ -1,15 +1,22 @@ ---- src/Makefile.generic.orig 2008-04-06 14:25:38.000000000 +0800 -+++ src/Makefile.generic 2008-04-06 14:26:50.000000000 +0800 -@@ -225,9 +225,9 @@ +--- src/Makefile.generic.orig 2014-06-10 23:04:24.274911932 +0800 ++++ src/Makefile.generic 2014-06-10 23:05:00.866911669 +0800 +@@ -224,15 +224,10 @@ clean: + #TODO: add version and symlink install: all - install -d $(PREFIX)/include $(PREFIX)/lib +- install -d $(PREFIX)/include $(PREFIX)/lib - install -m0644 $(SIMLIB_HEADERS) $(PREFIX)/include - install -m0644 $(LIBNAME).a $(PREFIX)/lib/lib$(LIBNAME).a - install -m0644 $(LIBNAME).so $(PREFIX)/lib/lib$(LIBNAME).so -+ $(BSD_INSTALL_DATA) $(SIMLIB_HEADERS) %%PREFIX%%/include -+ $(BSD_INSTALL_PROGRAM) $(LIBNAME).a %%PREFIX%%/lib/lib$(LIBNAME).a -+ $(BSD_INSTALL_PROGRAM) $(LIBNAME).so %%PREFIX%%/lib/lib$(LIBNAME).so - @if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \ - echo "Add $(PREFIX)/lib to /etc/ld.so.conf "; \ - fi +- @if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \ +- echo "Add $(PREFIX)/lib to /etc/ld.so.conf "; \ +- fi +- @echo "This should be run as root" +- ldconfig # update dynamic linker cache ++ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib ++ install -m0644 $(SIMLIB_HEADERS) $(DESTDIR)$(PREFIX)/include ++ install -m0644 $(LIBNAME).a $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).a ++ install -m0644 $(LIBNAME).so $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).so + + ############################################################################# + # Uninstall library