[27451] trunk/dports/net/argus-monitor/files/patch-Makefile.tplt

source_changes at macosforge.org source_changes at macosforge.org
Sat Aug 4 00:24:05 PDT 2007


Revision: 27451
          http://trac.macosforge.org/projects/macports/changeset/27451
Author:   markd at macports.org
Date:     2007-08-04 00:24:05 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
More fixes to get a predictible behavior whether the ports has been installed before or not. 

Modified Paths:
--------------
    trunk/dports/net/argus-monitor/files/patch-Makefile.tplt

Modified: trunk/dports/net/argus-monitor/files/patch-Makefile.tplt
===================================================================
--- trunk/dports/net/argus-monitor/files/patch-Makefile.tplt	2007-08-04 07:18:50 UTC (rev 27450)
+++ trunk/dports/net/argus-monitor/files/patch-Makefile.tplt	2007-08-04 07:24:05 UTC (rev 27451)
@@ -1,12 +1,13 @@
 --- Makefile.tplt.org	2007-06-01 16:30:47.000000000 -0700
-+++ Makefile.tplt	2007-08-03 23:21:22.000000000 -0700
-@@ -127,32 +127,27 @@
++++ Makefile.tplt	2007-08-04 00:18:25.000000000 -0700
+@@ -127,81 +127,71 @@
  clean:
  	-rm $(CLEAN)
  
 -install: install-lib install-prog install-conf remove-auth $(INSTALL_DATA) \
-+install: install-lib install-prog install-conf $(INSTALL_DATA) \
- 	$(INSTALL_DATA)/gdata $(INSTALL_DATA)/perl install-locale install-message
+-	$(INSTALL_DATA)/gdata $(INSTALL_DATA)/perl install-locale install-message
++install: install-lib install-prog install-conf remove-auth install-data \
++	install-gdata install-perl install-locale install-message
  
  install-lib:
 -	-mkdir -p $(INSTALL_LIB)
@@ -49,15 +50,21 @@
  
  # in case the format of the auth file has changed
  REMOVEAUTH=1
-@@ -164,44 +159,39 @@
+ remove-auth:
+-	@if test "$(REMOVEAUTH)" -a -f $(INSTALL_DATA)/auth; then rm $(INSTALL_DATA)/auth; fi
++#	@if test "$(REMOVEAUTH)" -a -f $(INSTALL_DATA)/auth; then rm $(INSTALL_DATA)/auth; fi
+ 
+ # this only happens if there isn't already a data dir
+ # if the user is upgrading, we leave it all alone
  # while a+rwx may be not be optimal security-wise,
  # it reduces the amount of support email the author receives
- $(INSTALL_DATA):
+-$(INSTALL_DATA):
 -	mkdir -p $(INSTALL_DATA)/stats $(INSTALL_DATA)/html $(INSTALL_DATA)/notify
 -	touch $(INSTALL_DATA)/log
 -	$(PERL) -e 'print getppid, "\n"' > $(INSTALL_DATA)/notno
 -	chmod a+rwx $(INSTALL_DATA)
 -	chmod a+r $(INSTALL_DATA)/html $(INSTALL_DATA)/log
++install-data:
 +	mkdir -p $(DESTDIR)$(INSTALL_DATA)/stats $(DESTDIR)$(INSTALL_DATA)/html $(DESTDIR)$(INSTALL_DATA)/notify
 +	touch $(DESTDIR)$(INSTALL_DATA)/log
 +	$(PERL) -e 'print getppid, "\n"' > $(DESTDIR)$(INSTALL_DATA)/notno
@@ -95,13 +102,13 @@
 -		chmod a+rx $(INSTALL_DATA)/locale;  \
 -	fi
 -	-cp locale/* $(INSTALL_DATA)/locale
-+$(INSTALL_DATA)/gdata:
++install-gdata:
 +	mkdir -p $(DESTDIR)$(INSTALL_DATA)/gdata;
 +		chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gdata;
 +	mkdir -p $(DESTDIR)$(INSTALL_DATA)/gcache;
 +		chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/gcache; 
 +
-+$(INSTALL_DATA)/perl:
++install-perl:
 +		mkdir $(DESTDIR)$(INSTALL_DATA)/perl;
 +		chmod a+rwx $(DESTDIR)$(INSTALL_DATA)/perl;
 +

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070804/3637eb95/attachment.html


More information about the macports-changes mailing list