[csw-devel] SF.net SVN: gar:[8459] csw/mgar/pkg/gkrellm/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Feb 10 15:50:42 CET 2010
Revision: 8459
http://gar.svn.sourceforge.net/gar/?rev=8459&view=rev
Author: dmichelsen
Date: 2010-02-10 14:50:42 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
gkrellm: Update to mGAR v2
Modified Paths:
--------------
csw/mgar/pkg/gkrellm/trunk/Makefile
csw/mgar/pkg/gkrellm/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch
csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch
Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-10 13:36:12 UTC (rev 8458)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-10 14:50:42 UTC (rev 8459)
@@ -17,10 +17,18 @@
MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES += Makefile server.Makefile src.Makefile
+PATCHFILES = 0001-Add-LOG_MAKEPRI.patch
+PATCHFILES += 0002-Do-not-tingle-with-file-owner.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango
+
+# Make sure to remove this after the X11 issues have all been settled
+EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
+
# Disable configure scripts step
CONFIGURE_SCRIPTS =
@@ -41,9 +49,28 @@
# No test suite
TEST_SCRIPTS =
+INSTALL_OVERRIDE_VARS = INSTALL
+INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install
+
+# Fix owner and permissions from src/Makefile:
+# chgrp sys $(INSTALLDIR)/$(PACKAGE)
+# chmod g+s $(INSTALLDIR)/$(PACKAGE)
+# chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
+# chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)
+
+PROTOTYPE_MODIFIERS = sgid
+PROTOTYPE_FILES_sgid = $(bindir)/gkrellmd?
+PROTOTYPE_PERMS_sgid = 2755
+PROTOTYPE_GROUP_sgid = sys
+
+# This is for the missing X11 symbol XSolarisIASetProcessInfo.
+# It does no harm, though.
+CHECKPKG_OVERRIDES = CSWgkrellm|symbol-not-found|gkrellm
+
include gar/category.mk
-pre-configure-modulated:
- @cp $(FILEDIR)/Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/Makefile
- @cp $(FILEDIR)/src.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/src/Makefile
- @cp $(FILEDIR)/server.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/server/Makefile
+post-extract-modulated:
+ -cp $(WORKDIR)/Makefile $(WORKSRC)/Makefile
+ -cp $(WORKDIR)/src.Makefile $(WORKSRC)/src/Makefile
+ -cp $(WORKDIR)/server.Makefile $(WORKSRC)/server/Makefile
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/gkrellm/trunk/checksums
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-10 13:36:12 UTC (rev 8458)
+++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-10 14:50:42 UTC (rev 8459)
@@ -1 +1,6 @@
+87043d318f1fecd878671a63b8446b24 0001-Add-LOG_MAKEPRI.patch
+8a1b298516f7d1e18e34080902353aae 0002-Do-not-tingle-with-file-owner.patch
+955c4ffeb0a0223e3120ac5b66134617 Makefile
270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2
+ff576ffe06797d2e7f7997cc934e210d server.Makefile
+cce3ee260271f8886a76cbb6ae70d0af src.Makefile
Added: csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch (rev 0)
+++ csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch 2010-02-10 14:50:42 UTC (rev 8459)
@@ -0,0 +1,24 @@
+From 9f429e5beefac906601c3dbbc12daa9b317d9284 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 10 Feb 2010 14:58:04 +0100
+Subject: [PATCH] Add LOG_MAKEPRI
+
+---
+ server/main.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/server/main.c b/server/main.c
+index ce0e370..9b2fe7a 100644
+--- a/server/main.c
++++ b/server/main.c
+@@ -37,6 +37,7 @@
+
+ #if !defined(WIN32)
+ #include <syslog.h>
++#define LOG_MAKEPRI(facility,priority) ((facility)|(priority))
+ #endif // !WIN32
+
+ // win32 defines addrinfo but only supports getaddrinfo call on winxp or newer
+--
+1.6.6
+
Added: csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch (rev 0)
+++ csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch 2010-02-10 14:50:42 UTC (rev 8459)
@@ -0,0 +1,43 @@
+From d52165d5155ddaffb8110d5ff7d5d4350eee0737 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 10 Feb 2010 15:18:26 +0100
+Subject: [PATCH] Do not tingle with file owner
+
+---
+ server/Makefile | 4 ++--
+ src/Makefile | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/Makefile b/server/Makefile
+index 98775c1..6bd51a4 100644
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -214,8 +214,8 @@ install_openbsd:
+
+ install_solaris:
+ $(MAKE) install INSTALL=/usr/ucb/install
+- chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
+- chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)
++ #chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
++ #chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)
+
+ install_windows: install_inc install_cfg
+ $(MAKE) BINEXT=".exe" install_bin
+diff --git a/src/Makefile b/src/Makefile
+index 9fe7ed5..9ccd5f7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -249,8 +249,8 @@ install_openbsd:
+
+ install_solaris:
+ $(MAKE) install INSTALL=/usr/ucb/install
+- chgrp sys $(INSTALLDIR)/$(PACKAGE)
+- chmod g+s $(INSTALLDIR)/$(PACKAGE)
++ #chgrp sys $(INSTALLDIR)/$(PACKAGE)
++ #chmod g+s $(INSTALLDIR)/$(PACKAGE)
+
+ install_windows:
+ $(MAKE) BINEXT=".exe" install_bin install_inc
+--
+1.6.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list