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

jake_goerzen at users.sourceforge.net jake_goerzen at users.sourceforge.net
Tue Feb 16 19:48:54 CET 2010 

Revision: 8598
          http://gar.svn.sourceforge.net/gar/?rev=8598&view=rev
Author:   jake_goerzen
Date:     2010-02-16 18:48:54 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
build split pkgs; SMF integration; work in progress

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

Added Paths:
-----------
    csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd

Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-16 17:20:18 UTC (rev 8597)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-16 18:48:54 UTC (rev 8598)
@@ -17,32 +17,36 @@
 
 MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += Makefile server.Makefile src.Makefile
+DISTFILES += Makefile server.Makefile src.Makefile cswgkrellmd
 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
+PACKAGES = CSWgkrellm CSWgkrellmd
+PKGFILES_CSWgkrellmd = /opt/csw/sbin/gkrellmd /opt/csw/share/man/gkrellmd.1 /opt/csw/include/gkrellm2/gkrellmd.h /opt/csw/etc/init.d/cswgkrellmd
 
+SPKG_DESC_CSWgkrellmd = System monitor package daemon
+
+RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango
+RUNTIME_DEP_PKGS_CSWgkrellmd = CSWggettextrt CSWglib2
+
 # 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 =
 
+#Disable build64 until fix linking:
+#ld: fatal: file main.o: wrong ELF class: ELFCLASS64
+#BUILD64 = 1
+
 BUILD_ARGS    = INSTALLROOT=$(prefix)
-BUILD_ARGS   += INSTALLDIR=$(bindir)
-BUILD_ARGS   += MANDIR=$(mandir)
-BUILD_ARGS   += INCLUDEDIR=$(includedir)
 BUILD_ARGS   += LOCALEDIR=$(sharedstatedir)/locale
 BUILD_ARGS   += enable_nls=1 solaris
 
-INSTALL_ARGS  = INSTALLROOT=$(DESTDIR)
-INSTALL_ARGS += INSTALLDIR=$(DESTDIR)$(bindir)
-INSTALL_ARGS += MANDIR=$(DESTDIR)$(mandir)
-INSTALL_ARGS += INCLUDEDIR=$(DESTDIR)$(includedir)
+INSTALL_ARGS  = INSTALLROOT=$(DESTDIR)$(prefix)
+INSTALL_ARGS += SINSTALLDIR=$(DESTDIR)$(sbindir)
 INSTALL_ARGS += LOCALEDIR=$(DESTDIR)$(sharedstatedir)/locale
 INSTALL_ARGS += enable_nls=1 install_solaris
 
@@ -56,10 +60,10 @@
 #  chgrp sys $(INSTALLDIR)/$(PACKAGE)
 #  chmod g+s $(INSTALLDIR)/$(PACKAGE)
 #  chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
-#  chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)  
+#  chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)
 
 PROTOTYPE_MODIFIERS = sgid
-PROTOTYPE_FILES_sgid = $(bindir)/gkrellmd?
+PROTOTYPE_FILES_sgid = $(bindir)/gkrellm? $(sbindir)/gkrellmd?
 PROTOTYPE_PERMS_sgid = 2755
 PROTOTYPE_GROUP_sgid = sys
 
@@ -67,6 +71,10 @@
 # It does no harm, though.
 CHECKPKG_OVERRIDES = symbol-not-found|gkrellm
 
+PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswgkrellmd$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+
+INITSMF = /opt/csw/etc/init.d/cswgkrellmd
+
 include gar/category.mk
 
 post-extract-modulated:
@@ -74,3 +82,9 @@
 	-cp $(WORKDIR)/src.Makefile $(WORKSRC)/src/Makefile
 	-cp $(WORKDIR)/server.Makefile $(WORKSRC)/server/Makefile
 	@$(MAKECOOKIE)
+
+post-install-modulated:
+	-ginstall -d $(DESTDIR)/opt/csw/etc/init.d
+	-cp $(WORKDIR)/cswgkrellmd $(DESTDIR)/opt/csw/etc/init.d/
+	-chmod 0755 $(DESTDIR)/opt/csw/etc/init.d/cswgkrellmd
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/gkrellm/trunk/checksums
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/checksums	2010-02-16 17:20:18 UTC (rev 8597)
+++ csw/mgar/pkg/gkrellm/trunk/checksums	2010-02-16 18:48:54 UTC (rev 8598)
@@ -1,6 +1,6 @@
 87043d318f1fecd878671a63b8446b24  0001-Add-LOG_MAKEPRI.patch
-8a1b298516f7d1e18e34080902353aae  0002-Do-not-tingle-with-file-owner.patch
-955c4ffeb0a0223e3120ac5b66134617  Makefile
+6a34a1bc0d7b7af7882b612af3300535  Makefile
+0b90e7e6e08187a73641d84868a1c805  cswgkrellmd
 270917784da6bf1292aba0c82af726d6  gkrellm-2.3.4.tar.bz2
-ff576ffe06797d2e7f7997cc934e210d  server.Makefile
-cce3ee260271f8886a76cbb6ae70d0af  src.Makefile
+6c5b47a9c7e2109ae41aa2eba264b94c  server.Makefile
+6701c6a8214d9cd7f0a2e1726f842eb9  src.Makefile

Modified: csw/mgar/pkg/gkrellm/trunk/files/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/Makefile	2010-02-16 17:20:18 UTC (rev 8597)
+++ csw/mgar/pkg/gkrellm/trunk/files/Makefile	2010-02-16 18:48:54 UTC (rev 8598)
@@ -104,7 +104,7 @@
 INCLUDEDIR = $(INSTALLROOT)/include
 INCLUDEMODE = 644
 INCLUDEDIRMODE = 755
-INSTALL ?= install
+INSTALL ?= /opt/csw/bin/ginstall
 PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig
 LOCALEDIR ?= $(INSTALLROOT)/share/locale
 

Added: csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd	                        (rev 0)
+++ csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd	2010-02-16 18:48:54 UTC (rev 8598)
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# CSWgkrellmd start/stop script
+# Jake Goerzen (jgoerzen at opencsw.org)
+
+PROGRAM="/opt/csw/sbin/gkrellmd"
+OPTIONS="--user nobody --group sys --max-clients 3 --io-timeout 30 --reconnect-timeout 9 --detach"
+
+start()
+{
+                $PROGRAM $OPTIONS
+}
+
+stop()
+{
+        /usr/bin/pkill -x -u nobody gkrellmd
+}
+
+case "$1" in
+start)
+        start
+        ;;
+stop)
+        stop
+        ;;
+*)
+        printf 'Usage: %s {start|stop}\n' $0
+        exit 1
+esac
+
+exit $?
+

Modified: csw/mgar/pkg/gkrellm/trunk/files/server.Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/server.Makefile	2010-02-16 17:20:18 UTC (rev 8597)
+++ csw/mgar/pkg/gkrellm/trunk/files/server.Makefile	2010-02-16 18:48:54 UTC (rev 8598)
@@ -8,7 +8,7 @@
 	INSTALLROOT = /usr/local
 endif
 
-SINSTALLDIR ?= $(INSTALLROOT)/bin
+SINSTALLDIR ?= $(INSTALLROOT)/sbin
 INSTALLDIRMODE ?= 755
 
 INCLUDEDIR ?= $(INSTALLROOT)/include
@@ -213,9 +213,9 @@
 	chmod g+sx $(SINSTALLDIR)/$(PACKAGE_D)
 
 install_solaris:
-	$(MAKE) install INSTALL=/usr/ucb/install
-	chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
-	chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)  
+	$(MAKE) install INSTALL=/opt/csw/bin/ginstall
+	fakeroot chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
+	fakeroot chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)  
 
 install_windows: install_inc install_cfg
 	$(MAKE) BINEXT=".exe" install_bin

Modified: csw/mgar/pkg/gkrellm/trunk/files/src.Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/files/src.Makefile	2010-02-16 17:20:18 UTC (rev 8597)
+++ csw/mgar/pkg/gkrellm/trunk/files/src.Makefile	2010-02-16 18:48:54 UTC (rev 8598)
@@ -248,9 +248,9 @@
 	chmod g+sx $(INSTALLDIR)/$(PACKAGE)
 
 install_solaris:
-	$(MAKE) install INSTALL=/usr/ucb/install
-	chgrp sys $(INSTALLDIR)/$(PACKAGE)
-	chmod g+s $(INSTALLDIR)/$(PACKAGE)  
+	$(MAKE) install INSTALL=/opt/csw/bin/ginstall
+	fakeroot chgrp sys $(INSTALLDIR)/$(PACKAGE)
+	fakeroot 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.

More information about the devel mailing list