[csw-devel] SF.net SVN: gar:[9344] csw/mgar/pkg/tmpwatch/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Wed Mar 24 00:42:44 CET 2010
Revision: 9344
http://gar.svn.sourceforge.net/gar/?rev=9344&view=rev
Author: skayser
Date: 2010-03-23 23:42:44 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
tmpwatch: remove customizations now that Ben's patches have been merged upstream
Modified Paths:
--------------
csw/mgar/pkg/tmpwatch/trunk/Makefile
csw/mgar/pkg/tmpwatch/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch
csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch
Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-23 22:32:23 UTC (rev 9343)
+++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-23 23:42:44 UTC (rev 9344)
@@ -1,11 +1,5 @@
-# TODO
-# ! strtoimax implementation missing on Solaris 8/9, gnulib provides
-# a strtoimax implementation. Relevant bug against tmpwatch:
-# https://fedorahosted.org/tmpwatch/ticket/5
-# Any solutions will certainly also be appreciated by the people on the
-# bug report.
GARNAME = tmpwatch
-GARVERSION = 2.9.17
+GARVERSION = 2.10.1
CATEGORIES = apps
DESCRIPTION = Removes files which haven't been accessed for a period of time
@@ -24,15 +18,7 @@
BUILD_DEP_PKGS = CSWlibgnugetopt
RUNTIME_DEP_PKGS = CSWlibgnugetopt
-# Taken from libgcrypt's stringhelp.c
-DISTFILES += stpcpy.c
-
-# Tweak Makefile to honor environment variables
-PATCHFILES = 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch
-# Include missing stpcpy() implementation
-PATCHFILES += 0002-tmpwatch.c-include-stpcpy.c.patch
-
-CONFIGURE_SCRIPTS =
+CONFIGURE_ARGS = $(DIRPATHS)
BUILD_ARGS = tmpwatch
TEST_SCRIPTS =
@@ -40,7 +26,3 @@
EXTRA_LINKER_FLAGS = -lgnugetopt
include gar/category.mk
-
-pre-build-modulated:
- cp $(WORKDIR)/stpcpy.c $(WORKSRC)
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/tmpwatch/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmpwatch/trunk/checksums 2010-03-23 22:32:23 UTC (rev 9343)
+++ csw/mgar/pkg/tmpwatch/trunk/checksums 2010-03-23 23:42:44 UTC (rev 9344)
@@ -1,4 +1 @@
-9d3371e425a1214f59044487b2cf76b9 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch
-af1b38792e28777a049cbe4ca3dd2132 0002-tmpwatch.c-include-stpcpy.c.patch
-6a89324536d839b75ceb2fbdac4bf255 stpcpy.c
-7738f5db4ae0ce3795c224f13a597356 tmpwatch-2.9.17.tar.bz2
+c26ac6aef91e230f748b08b066c406d9 tmpwatch-2.10.1.tar.bz2
Deleted: csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch
===================================================================
--- csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch 2010-03-23 22:32:23 UTC (rev 9343)
+++ csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch 2010-03-23 23:42:44 UTC (rev 9344)
@@ -1,61 +0,0 @@
-From a6bf87119784e5f4cf2ecfeab171e6b59ce725e1 Mon Sep 17 00:00:00 2001
-From: Sebastian Kayser <skayser at opencsw.org>
-Date: Wed, 24 Feb 2010 16:39:37 +0100
-Subject: [PATCH 1/2] Makefile: honor defaults and use DESTDIR instead of ROOT
-
----
- Makefile | 24 +++++++++++++-----------
- 1 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cfb71dd..35297a3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,9 @@ VERSION=2.9.17
- HGTAG = 'tmpwatch-$(VERSION)'
- OS_NAME=$(shell uname -s)
-
--CFLAGS=$(RPM_OPT_FLAGS) -W -Wall -DVERSION=\"$(VERSION)\" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-+CFLAGS ?= $(RPM_OPT_FLAGS) -W -Wall
-+CFLAGS += -DVERSION=\"$(VERSION)\"
-+CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
- ifeq ($(OS_NAME),HP-UX)
- ROOT=/
-@@ -13,12 +15,12 @@ ifeq ($(OS_NAME),HP-UX)
- CC=gcc
- endif
- ifeq ($(OS_NAME),SunOS)
-- ROOT=/
-- PREFIX=/usr/local
-- MANDIR=$(PREFIX)/man
-- SBINDIR=$(PREFIX)/sbin
-- INSTALL=./install-sh
-- CC=gcc
-+ DESTDIR?=/
-+ PREFIX?=/usr/local
-+ MANDIR?=$(PREFIX)/man
-+ SBINDIR?=$(PREFIX)/sbin
-+ INSTALL?=./install-sh
-+ CC?=gcc
- endif
- ifeq ($(OS_NAME),Linux)
- ROOT=/
-@@ -31,10 +33,10 @@ endif
- all: tmpwatch
-
- install: all
-- [ -d $(ROOT)$(SBINDIR) ] || mkdir -p $(ROOT)$(SBINDIR)
-- [ -d $(ROOT)$(MANDIR)/man8 ] || mkdir -p $(ROOT)$(MANDIR)/man8
-- $(INSTALL) -m 755 tmpwatch $(ROOT)$(SBINDIR)/tmpwatch
-- $(INSTALL) -m 644 tmpwatch.8 $(ROOT)$(MANDIR)/man8/tmpwatch.8
-+ [ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR)
-+ [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
-+ $(INSTALL) -m 755 tmpwatch $(DESTDIR)$(SBINDIR)/tmpwatch
-+ $(INSTALL) -m 644 tmpwatch.8 $(DESTDIR)$(MANDIR)/man8/tmpwatch.8
-
- clean:
- rm -f tmpwatch
---
-1.6.6
-
Deleted: csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch
===================================================================
--- csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch 2010-03-23 22:32:23 UTC (rev 9343)
+++ csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch 2010-03-23 23:42:44 UTC (rev 9344)
@@ -1,24 +0,0 @@
-From a04d34c996c8f87f92f96243cd80dd54ff4a9a1a Mon Sep 17 00:00:00 2001
-From: Sebastian Kayser <skayser at opencsw.org>
-Date: Wed, 24 Feb 2010 16:42:46 +0100
-Subject: [PATCH 2/2] tmpwatch.c: include stpcpy.c
-
----
- tmpwatch.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tmpwatch.c b/tmpwatch.c
-index 4091013..a6b47a1 100644
---- a/tmpwatch.c
-+++ b/tmpwatch.c
-@@ -35,6 +35,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include "stpcpy.c"
- #include <time.h>
- #include <sys/stat.h>
- #include <sys/time.h>
---
-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