[csw-devel] SF.net SVN: gar:[15048] csw/mgar/pkg/lsof/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15048
          http://gar.svn.sourceforge.net/gar/?rev=15048&view=rev
Author:   dmichelsen
Date:     2011-07-12 16:09:44 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
lsof: Update to 4.84 and isaexec

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

Added Paths:
-----------
    csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch

Modified: csw/mgar/pkg/lsof/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lsof/trunk/Makefile	2011-07-12 14:07:37 UTC (rev 15047)
+++ csw/mgar/pkg/lsof/trunk/Makefile	2011-07-12 16:09:44 UTC (rev 15048)
@@ -1,5 +1,8 @@
+# TBD:
+# - Probably VxFS bindings
+
 NAME = lsof
-VERSION = 4.83
+VERSION = 4.84
 CATEGORIES = utils
 
 DESCRIPTION = List open files
@@ -11,25 +14,33 @@
 endef
 
 MASTER_SITES = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
-TOPDIST   = $(NAME)_$(VERSION)
-SRCDIST   = $(TOPDIST)_src
-DISTFILES = $(TOPDIST).tar.bz2
+DISTNAME = $(NAME)_$(VERSION)
+DISTFILES = $(DISTNAME).tar.bz2
 DISTFILES += lsof-license
-WORKSRC   = $(WORKDIR)/$(TOPDIST)/$(SRCDIST)
 
-SPKG_SOURCEURL = http://people.freebsd.org/~abe/
+# This seems to be necessary as the above comment says
+PATCHFILES += 0001-Use-lgrp.h.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)_(\d+(?:\.\d+)*).tar.bz2
+SRCDIST = $(DISTNAME)_src
+WORKSRC   = $(WORKDIR)/$(DISTNAME)/$(SRCDIST)
 
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
+VENDOR_URL = http://people.freebsd.org/~abe/
 LICENSE = lsof-license
 
 BUILD64 = 1
+ISAEXEC = 1
 
 CONFIGURE_SCRIPTS = custom
 CONFIGURE_ARGS    = -n solariscc
 
 TEST_SCRIPTS = custom
+
+# Tests require root
+SKIPTEST ?= 1
+
 INSTALL_SCRIPTS = custom
 
 # Environment variables affecting Solaris builds:
@@ -50,33 +61,39 @@
 SOLARIS_INSTR = $(ISA)
 SOLARIS_KERNBITS = $(MEMORYMODEL)
 
-PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
+BUILD_OVERRIDE_VARS = CDEF
+BUILD_OVERRIDE_VAR_CDEF = $(CFLAGS)
 
+PROTOTYPE_MODIFIERS = lsof
+PROTOTYPE_FILES_lsof = $(bindir)/lsof
+PROTOTYPE_GROUP_lsof = sys
+PROTOTYPE_PERMS_lsof = 2755
+
 include gar/category.mk
 
 INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION)
 
 post-extract-modulated:
 	@echo " ==> Extracting source distribution"
-	$(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar ))
-	$(MAKECOOKIE)
+	@$(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(DISTNAME) ; tar xf $(SRCDIST).tar ))
+	@$(MAKECOOKIE)
 
 configure-custom:
 	@echo " ==> Configuring in $(WORKSRC)"
 	( cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) )
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 test-custom:
 	@echo " ==> Testing in $(WORKSRC)/tests"
-	@$(MAKE) -C $(WORKSRC)/tests all opt
-	$(MAKECOOKIE)
+	$(MAKE) -C $(WORKSRC)/tests
+	@$(MAKECOOKIE)
 
 install-custom:
 	@echo " ==> Installing $(NAME) $(VERSION) for $(MODULATION)"
 	echo DESTDIR: $(DESTDIR)
 	@( cd $(WORKSRC) ; \
 		ginstall -d $(DESTDIR)$(bindir) ; \
-		ginstall -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \
+		ginstall -m 755 lsof $(DESTDIR)$(bindir) ; \
 		ginstall -d $(DESTDIR)$(mandir)/man8 ; \
 		ginstall -m 444 lsof.8 $(DESTDIR)$(mandir)/man8 )
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/lsof/trunk/checksums
===================================================================
--- csw/mgar/pkg/lsof/trunk/checksums	2011-07-12 14:07:37 UTC (rev 15047)
+++ csw/mgar/pkg/lsof/trunk/checksums	2011-07-12 16:09:44 UTC (rev 15048)
@@ -1,2 +1 @@
-a42fe89c6b596930d79cc119928b6176  lsof-license
-8f731a6251b8c0143d585df0d5ca779e  lsof_4.83.tar.bz2
+a09326df500ef7e4550af546868338d6  lsof_4.84.tar.bz2

Added: csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch
===================================================================
--- csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch	                        (rev 0)
+++ csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch	2011-07-12 16:09:44 UTC (rev 15048)
@@ -0,0 +1,25 @@
+From 2c3ce069cf55b3fc13d580ee3ec38f7c3130b562 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 12 Jul 2011 17:38:27 +0200
+Subject: [PATCH] Use lgrp.h
+
+---
+ lsof_4.84_src/dialects/sun/machine.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lsof_4.84_src/dialects/sun/machine.h b/lsof_4.84_src/dialects/sun/machine.h
+index 3a8b96a..8c2186d 100644
+--- a/lsof_4.84_src/dialects/sun/machine.h
++++ b/lsof_4.84_src/dialects/sun/machine.h
+@@ -55,7 +55,7 @@
+  * #include.
+  */
+ 
+-/* #include <sys/lgrp.h> */
++#include <sys/lgrp.h>
+ # endif	/* solaris>=90000 */
+ 
+ 
+-- 
+1.7.6
+


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