[csw-devel] SF.net SVN: gar:[8692] csw/mgar/pkg/gkrellm/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 8692
          http://gar.svn.sourceforge.net/gar/?rev=8692&view=rev
Author:   jake_goerzen
Date:     2010-02-19 18:53:27 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
patch file gkrellm.h

Modified Paths:
--------------
    csw/mgar/pkg/gkrellm/trunk/Makefile
    csw/mgar/pkg/gkrellm/trunk/checksums
    csw/mgar/pkg/gkrellm/trunk/files/src.Makefile

Added Paths:
-----------
    csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch

Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-19 17:51:13 UTC (rev 8691)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-19 18:53:27 UTC (rev 8692)
@@ -19,6 +19,7 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += Makefile server.Makefile src.Makefile cswgkrellmd
 PATCHFILES = 0001-Add-LOG_MAKEPRI.patch
+PATCHFILES += gkrellm.h.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2

Modified: csw/mgar/pkg/gkrellm/trunk/checksums
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/checksums	2010-02-19 17:51:13 UTC (rev 8691)
+++ csw/mgar/pkg/gkrellm/trunk/checksums	2010-02-19 18:53:27 UTC (rev 8692)
@@ -2,5 +2,6 @@
 6a34a1bc0d7b7af7882b612af3300535  Makefile
 0b90e7e6e08187a73641d84868a1c805  cswgkrellmd
 270917784da6bf1292aba0c82af726d6  gkrellm-2.3.4.tar.bz2
+80c3eb3d6d3be4613a1b772b2b92ffd1  gkrellm.h.patch
 6c5b47a9c7e2109ae41aa2eba264b94c  server.Makefile
-6701c6a8214d9cd7f0a2e1726f842eb9  src.Makefile
+d29832f484d1f33b1f8571a732e1f891  src.Makefile

Added: csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch	                        (rev 0)
+++ csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch	2010-02-19 18:53:27 UTC (rev 8692)
@@ -0,0 +1,21 @@
+diff -rupN gkrellm-2.3.4/src/gkrellm.h gkrellm-2.3.4.new/src/gkrellm.h
+--- gkrellm-2.3.4/src/gkrellm.h	2010-01-05 00:14:58.000000000 +0100
++++ gkrellm-2.3.4.new/src/gkrellm.h	2010-02-19 19:18:50.867583892 +0100
+@@ -132,13 +132,13 @@
+ 
+ #if !defined(WIN32)
+ 
+-#define	LOCAL_THEMES_DIR		"/usr/local/share/gkrellm2/themes"
++#define	LOCAL_THEMES_DIR		"/opt/csw/share/gkrellm2/themes"
+ #if !defined(SYSTEM_THEMES_DIR)
+-#define	SYSTEM_THEMES_DIR		"/usr/share/gkrellm2/themes"
++#define	SYSTEM_THEMES_DIR		"/opt/csw/gkrellm2/themes"
+ #endif
+-#define	LOCAL_PLUGINS_DIR		"/usr/local/lib/gkrellm2/plugins"
++#define	LOCAL_PLUGINS_DIR		"/opt/csw/lib/gkrellm2/plugins"
+ #if !defined(SYSTEM_PLUGINS_DIR)
+-#define	SYSTEM_PLUGINS_DIR		"/usr/lib/gkrellm2/plugins"
++#define	SYSTEM_PLUGINS_DIR		"/opt/csw/gkrellm2/plugins"
+ #endif
+ 
+ #else

Modified: csw/mgar/pkg/gkrellm/trunk/files/src.Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/src.Makefile	2010-02-19 17:51:13 UTC (rev 8691)
+++ csw/mgar/pkg/gkrellm/trunk/files/src.Makefile	2010-02-19 18:53:27 UTC (rev 8692)
@@ -249,8 +249,8 @@
 
 install_solaris:
 	$(MAKE) install INSTALL=/opt/csw/bin/ginstall
-	fakeroot chgrp sys $(INSTALLDIR)/$(PACKAGE)
-	fakeroot chmod g+s $(INSTALLDIR)/$(PACKAGE)
+	# chgrp sys $(INSTALLDIR)/$(PACKAGE)
+	# chmod g+s $(INSTALLDIR)/$(PACKAGE)
 
 install_windows:
 	$(MAKE) BINEXT=".exe" install_bin install_inc


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