[csw-devel] SF.net SVN: gar:[13507] csw/mgar/pkg/memconf/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13507
          http://gar.svn.sourceforge.net/gar/?rev=13507&view=rev
Author:   dmichelsen
Date:     2011-03-01 10:36:18 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
memconf: Update to 2.17

Modified Paths:
--------------
    csw/mgar/pkg/memconf/trunk/Makefile
    csw/mgar/pkg/memconf/trunk/checksums

Modified: csw/mgar/pkg/memconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memconf/trunk/Makefile	2011-03-01 09:29:37 UTC (rev 13506)
+++ csw/mgar/pkg/memconf/trunk/Makefile	2011-03-01 10:36:18 UTC (rev 13507)
@@ -1,5 +1,5 @@
 NAME = memconf
-VERSION = 2.16
+VERSION = 2.17
 CATEGORIES = utils
 
 DESCRIPTION = Perl script that displays memory modules installed
@@ -21,6 +21,9 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+# We prepended /opt/csw/bin but keep /usr/lcoal/bin
+CHECKPKG_OVERRIDES_CSWmemconf += file-with-bad-content|/usr/local|root/opt/csw/bin/memconf
+
 include gar/category.mk
 
 WORKSRC = $(WORKDIR)
@@ -31,7 +34,10 @@
 	@rm -rf $(DESTDIR)
 	@ginstall -d $(DESTDIR)$(bindir)
 	@ginstall -d $(DESTDIR)$(mandir)/man1
-	@cp $(WORKSRC)/$(NAME) $(DESTDIR)$(bindir)/$(NAME)
+	@# Make sure /opt/csw/bin is used before /usr/local/bin, but keep /usr/local/bin anyway
+	@cat $(WORKSRC)/$(NAME) | \
+		perl -npe 's,(:/usr/local/bin),:$(bindir)$$1,' \
+		> $(DESTDIR)$(bindir)/$(NAME)
 	@cp $(WORKSRC)/$(NAME).man $(DESTDIR)$(mandir)/man1/$(NAME).1
 	@chmod 755 $(DESTDIR)$(bindir)/$(NAME)
 	@chmod 644 $(DESTDIR)$(mandir)/man1/$(NAME).1

Modified: csw/mgar/pkg/memconf/trunk/checksums
===================================================================
--- csw/mgar/pkg/memconf/trunk/checksums	2011-03-01 09:29:37 UTC (rev 13506)
+++ csw/mgar/pkg/memconf/trunk/checksums	2011-03-01 10:36:18 UTC (rev 13507)
@@ -1,3 +1,2 @@
-818efbe29da417ad462e3f6345690c3d  COPYING
 53e202902c198e56d9223803e4e857be  memconf.gz
 5e13adbfce546b47d8cc84261c3738e2  memconf.man


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.