From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 13:39:50 2014 Return-Path: Delivered-To: svn-ports-head@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 EA81593B; Wed, 19 Feb 2014 13:39:50 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC1BA17AC; Wed, 19 Feb 2014 13:39:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JDdovr050387; Wed, 19 Feb 2014 13:39:50 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JDdoPY050385; Wed, 19 Feb 2014 13:39:50 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201402191339.s1JDdoPY050385@svn.freebsd.org> From: John Marino Date: Wed, 19 Feb 2014 13:39:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345092 - in head/devel/adabooch: . 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.17 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: Wed, 19 Feb 2014 13:39:51 -0000 Author: marino Date: Wed Feb 19 13:39:49 2014 New Revision: 345092 URL: http://svnweb.freebsd.org/changeset/ports/345092 QAT: https://qat.redports.org/buildarchive/r345092/ Log: devel/adabooch: Rework installation target For some reason, $prefix was already defined on DragonFly but I didn't realize this was the reason it wouldn't install there until after completely revamping the installation target. In any case, it's much better now. No bump as there are no difference for FreeBSD and it never built on DragonFly. Added: head/devel/adabooch/files/ head/devel/adabooch/files/patch-Makefile.in (contents, props changed) Modified: head/devel/adabooch/Makefile Modified: head/devel/adabooch/Makefile ============================================================================== --- head/devel/adabooch/Makefile Wed Feb 19 13:36:00 2014 (r345091) +++ head/devel/adabooch/Makefile Wed Feb 19 13:39:49 2014 (r345092) @@ -27,10 +27,6 @@ OPTIONS_DEFINE= DOCS .include -post-patch: - @${REINPLACE_CMD} -e 's|(prefix)|(DESTDIR)$$(prefix)|g' \ - ${WRKSRC}/Makefile.in - post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/devel/adabooch/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/adabooch/files/patch-Makefile.in Wed Feb 19 13:39:49 2014 (r345092) @@ -0,0 +1,31 @@ +--- Makefile.in.orig 2013-03-22 12:38:13.000000000 +0000 ++++ Makefile.in +@@ -29,16 +29,18 @@ libs: + $(GPRBUILD) -p -Pbc -XLIBRARY_TYPE=relocatable + + install: +- -mkdir -p $(prefix)/lib/gnat/ +- cp bc.gpr-for-installation $(prefix)/lib/gnat/bc.gpr +- -mkdir -p $(prefix)/include/bc +- cd include; tar -c -f- *.ad[bs] | tar -x -f- -C $(prefix)/include/bc/ +- -mkdir -p $(prefix)/lib/bc/lib-static +- tar -c -f- lib-static | tar -x -f- -C $(prefix)/lib/bc/ +- chmod -w $(prefix)/lib/bc/lib-static/*.ali +- -mkdir -p $(prefix)/lib/bc/lib-relocatable +- tar -c -f- lib-relocatable | tar -x -f- -C $(prefix)/lib/bc/ +- chmod -w $(prefix)/lib/bc/lib-relocatable/*.ali ++ @mkdir -p $(DESTDIR)$(PREFIX)/lib/gnat \ ++ $(DESTDIR)$(PREFIX)/include/bc \ ++ $(DESTDIR)$(PREFIX)/lib/bc/lib-static \ ++ $(DESTDIR)$(PREFIX)/lib/bc/lib-relocatable ++ $(BSD_INSTALL_DATA) bc.gpr-for-installation \ ++ $(DESTDIR)$(PREFIX)/lib/gnat/bc.gpr ++ $(BSD_INSTALL_DATA) include/*.ad[bs] \ ++ $(DESTDIR)$(PREFIX)/include/bc/ ++ $(BSD_INSTALL_DATA) lib-static/*.ali lib-static/*.a \ ++ $(DESTDIR)$(PREFIX)/lib/bc/lib-static/ ++ $(BSD_INSTALL_DATA) lib-relocatable/*.ali lib-relocatable/*.so \ ++ $(DESTDIR)$(PREFIX)/lib/bc/lib-relocatable/ + + # Distribution construction +