Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Feb 2014 01:48:16 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345687 - in head/sysutils/installwatch: . files
Message-ID:  <201402230148.s1N1mGTw060629@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>

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)
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402230148.s1N1mGTw060629>