From owner-svn-ports-all@FreeBSD.ORG Sun Feb 23 01:48:16 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 8A0B8B5E; Sun, 23 Feb 2014 01:48:16 +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 5CFD01356; Sun, 23 Feb 2014 01:48:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1N1mGf8060632; Sun, 23 Feb 2014 01:48:16 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1N1mGTw060629; Sun, 23 Feb 2014 01:48:16 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201402230148.s1N1mGTw060629@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 23 Feb 2014 01:48:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345687 - in head/sysutils/installwatch: . 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.17 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, 23 Feb 2014 01:48:16 -0000 Author: danilo Date: Sun Feb 23 01:48:15 2014 New Revision: 345687 URL: http://svnweb.freebsd.org/changeset/ports/345687 QAT: https://qat.redports.org/buildarchive/r345687/ Log: - Add stage support Modified: head/sysutils/installwatch/Makefile head/sysutils/installwatch/files/patch-Makefile Modified: head/sysutils/installwatch/Makefile ============================================================================== --- head/sysutils/installwatch/Makefile Sun Feb 23 01:35:05 2014 (r345686) +++ head/sysutils/installwatch/Makefile Sun Feb 23 01:48:15 2014 (r345687) @@ -18,13 +18,8 @@ PLIST_FILES= bin/installwatch lib/instal PORTDOCS= BUGS CHANGELOG INSTALL README TODO OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/sysutils/installwatch/files/patch-Makefile ============================================================================== --- head/sysutils/installwatch/files/patch-Makefile Sun Feb 23 01:35:05 2014 (r345686) +++ head/sysutils/installwatch/files/patch-Makefile Sun Feb 23 01:48:15 2014 (r345687) @@ -1,5 +1,5 @@ ---- Makefile.bak Fri Jan 2 17:45:26 2004 -+++ Makefile Fri Jan 2 17:48:33 2004 +--- ./Makefile.orig 2001-12-22 21:55:11.000000000 -0200 ++++ ./Makefile 2014-02-22 22:45:43.000000000 -0300 @@ -4,7 +4,6 @@ # Well, the only configurable part is the following variable. # Make sure the directory you specify exists. @@ -8,7 +8,7 @@ # End of configurable part -@@ -16,10 +15,10 @@ +@@ -16,19 +15,19 @@ all: installwatch.so installwatch.so: installwatch.o @@ -21,6 +21,18 @@ localdecls.h: ./create-localdecls + + install: all +- if [ -r $(LIBDIR)/installwatch.so ]; then rm $(LIBDIR)/installwatch.so; export LD_PRELOAD=""; cp installwatch.so $(LIBDIR); LD_PRELOAD=$(LIBDIR)/installwatch.so; else cp installwatch.so $(LIBDIR); fi ++ if [ -r ${DESTDIR}$(LIBDIR)/installwatch.so ]; then rm ${DESTDIR}$(LIBDIR)/installwatch.so; export LD_PRELOAD=""; cp installwatch.so ${DESTDIR}$(LIBDIR); LD_PRELOAD=${DESTDIR}$(LIBDIR)/installwatch.so; else cp installwatch.so ${DESTDIR}$(LIBDIR); fi + +- sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch +- chmod 755 $(BINDIR)/installwatch ++ sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > ${DESTDIR}$(BINDIR)/installwatch ++ chmod 755 ${DESTDIR}$(BINDIR)/installwatch + + uninstall: + rm $(LIBDIR)/installwatch.so @@ -41,7 +40,7 @@ tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION)