[csw-devel] SF.net SVN: gar:[10289] csw/mgar/pkg

andrewrn at users.sourceforge.net andrewrn at users.sourceforge.net
Wed Jun 23 13:28:13 CEST 2010


Revision: 10289
          http://gar.svn.sourceforge.net/gar/?rev=10289&view=rev
Author:   andrewrn
Date:     2010-06-23 11:28:12 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
liblockfile: Initial Commit

Added Paths:
-----------
    csw/mgar/pkg/liblockfile/
    csw/mgar/pkg/liblockfile/branches/
    csw/mgar/pkg/liblockfile/tags/
    csw/mgar/pkg/liblockfile/trunk/
    csw/mgar/pkg/liblockfile/trunk/Makefile
    csw/mgar/pkg/liblockfile/trunk/checksums
    csw/mgar/pkg/liblockfile/trunk/files/
    csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
    csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
    csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch


Property changes on: csw/mgar/pkg/liblockfile/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/liblockfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/Makefile	2010-06-23 11:28:12 UTC (rev 10289)
@@ -0,0 +1,33 @@
+GARNAME = liblockfile
+GARVERSION = 1.08
+CATEGORIES = apps
+
+DESCRIPTION = Liblockfile is a shared library with NFS-safe locking functions.
+define BLURB
+	Liblockfile is a shared library with NFS-safe locking functions. It
+	includes the command line utility ``dotlockfile''.
+endef
+
+MASTER_SITES = ftp://ftp.debian.org/debian/pool/main/libl/$(GARNAME)/
+DISTFILES  = $(GARNAME)_$(GARVERSION).orig.tar.gz
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# The copyright information is stored in the COPYRIGHT file
+LICENSE = COPYRIGHT
+
+# Patches for Makefile.in
+PATCHFILES = 0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 0002-Modify-Makefile.in-to-create-directories-first.patch 0003-Stop-ginstall-setting-ownership.patch
+
+# Need to specify the installation prefix as the configuration script
+# doesn't handle different operating systems very well
+CONFIGURE_ARGS = $(DIRPATHS) --prefix=opt/csw
+
+# liblockfile doesn't provide any tests so skip these
+SKIPTEST=1
+
+# We need to specify the ROOT path for this install
+INSTALL_ARGS = ROOT=$(DESTDIR)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/liblockfile/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/liblockfile/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/checksums	2010-06-23 11:28:12 UTC (rev 10289)
@@ -0,0 +1,4 @@
+3b5017e3e326a65ae05c41cedca79fac  0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
+cf6672a7c23066ea1a591dfd6b023ad3  0002-Modify-Makefile.in-to-create-directories-first.patch
+4838df3eadab17ef0a547384a47b9a4b  0003-Stop-ginstall-setting-ownership.patch
+c24e2dfb4a2aab0263fe5ac1564d305e  liblockfile_1.08.orig.tar.gz

Added: csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch	                        (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch	2010-06-23 11:28:12 UTC (rev 10289)
@@ -0,0 +1,51 @@
+From ba46675875a1d81f9fa4755fd012f81e0d4f9068 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 10:38:14 +0200
+Subject: [PATCH 1/3] Modify Makefile to use ginstall instead of install
+
+---
+ Makefile.in |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7ae5406..2424969 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,26 +50,26 @@ xlockfile.o:	lockfile.c
+ 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+ 
+ install_static:	static install_common
+-		install -m 644 liblockfile.a $(ROOT)$(libdir)
++		ginstall -m 644 liblockfile.a $(ROOT)$(libdir)
+ 
+ install_shared:	shared install_common
+-		install -m 755 liblockfile.so \
++		ginstall -m 755 liblockfile.so \
+ 			$(ROOT)$(libdir)/liblockfile.so.$(VER)
+ 		ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+ 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
+-		install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
++		ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ 		if [ "$(MAILGROUP)" != "" ]; then\
+-		  install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
++		  ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+ 		else \
+-		  install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
++		  ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+ 		fi
+-		install -m 644 *.1 $(ROOT)$(mandir)/man1
+-		install -m 644 *.3 $(ROOT)$(mandir)/man3
++		ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
++		ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
+ 
+ install_nfslib:	nfslib
+-		install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
++		ginstall -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+ 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ clean:
+-- 
+1.7.1
+

Added: csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch	                        (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch	2010-06-23 11:28:12 UTC (rev 10289)
@@ -0,0 +1,24 @@
+From 17724440df75bb232a274e852d5731cbffd5ed04 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 11:01:36 +0200
+Subject: [PATCH 2/3] Modify Makefile.in to create directories first
+
+---
+ Makefile.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2424969..af0028c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -59,6 +59,7 @@ install_shared:	shared install_common
+ 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
++		ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
+ 		ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ 		if [ "$(MAILGROUP)" != "" ]; then\
+ 		  ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+-- 
+1.7.1
+

Added: csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch	                        (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch	2010-06-23 11:28:12 UTC (rev 10289)
@@ -0,0 +1,31 @@
+From f853374c16cbdcff6be49361de782a5af6854dfc Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 11:06:33 +0200
+Subject: [PATCH 3/3] Stop ginstall setting ownership.
+
+Solaris package creation takes care of changing ownership to root anyway.
+Without this, this fails on sparc only (bad fakeroot?)
+---
+ Makefile.in |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index af0028c..040a426 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,11 +61,7 @@ install_shared:	shared install_common
+ install_common:
+ 		ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
+ 		ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+-		if [ "$(MAILGROUP)" != "" ]; then\
+-		  ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+-		else \
+-		  ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+-		fi
++		ginstall -m 755 dotlockfile $(ROOT)$(bindir); \
+ 		ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
+ 		ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
+ 
+-- 
+1.7.1
+


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