[csw-devel] SF.net SVN: gar:[2874] csw/mgar/pkg/cvsps/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu Jan 22 03:34:27 CET 2009


Revision: 2874
          http://gar.svn.sourceforge.net/gar/?rev=2874&view=rev
Author:   bdwalton
Date:     2009-01-22 02:34:27 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
- Converted project to use autoconf/automake.
- Still need implementations or workarounds for: setenv, unsetenv, strsep

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

Added Paths:
-----------
    csw/mgar/pkg/cvsps/trunk/files/0001-adding-initial-autotools-files.patch
    csw/mgar/pkg/cvsps/trunk/files/0002-adding-script-to-do-the-auto-steps.patch
    csw/mgar/pkg/cvsps/trunk/files/0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch
    csw/mgar/pkg/cvsps/trunk/files/0005-add-autoconf-checks-for-lsocket-lnsl.patch
    csw/mgar/pkg/cvsps/trunk/files/0006-corrected-naming-mistake-in-Makefile.am.patch

Modified: csw/mgar/pkg/cvsps/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvsps/trunk/Makefile	2009-01-21 21:51:52 UTC (rev 2873)
+++ csw/mgar/pkg/cvsps/trunk/Makefile	2009-01-22 02:34:27 UTC (rev 2874)
@@ -2,34 +2,40 @@
 GARVERSION = 2.1
 CATEGORIES = apps
 
-DESCRIPTION = Brief description
+DESCRIPTION = Patchsets for CVS
 define BLURB
-  Long description
+CVSps is a program for generating 'patchset' information from a CVS repository. A patchset in this case is defined as a set of changes made to a collection of files, and all committed at the same time (using a single 'cvs commit' command). This information is valuable to seeing the big picture of the evolution of a cvs project. While cvs tracks revision information, it is often difficult to see what changes were committed 'atomically' to the repository.
 endef
 
 MASTER_SITES = http://www.cobite.com/cvsps/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += $(call admfiles,CSWcvsps,)
 
-PATCHFILES = patch-extralibs.diff
+PATCHFILES = 0001-adding-initial-autotools-files.patch
+PATCHFILES += 0002-adding-script-to-do-the-auto-steps.patch
+PATCHFILES += 0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch
+PATCHFILES += 0005-add-autoconf-checks-for-lsocket-lnsl.patch
+PATCHFILES += 0006-corrected-naming-mistake-in-Makefile.am.patch
 
-REQUIRED_PKGS = CSWzlib
+PREREQUISITE_PKGS = CSWzlib CSWautomake CSWautoconf
 
+REQUIRED_PKGS = CSWzlib CSWcvs
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-# We don't have configure
-CONFIGURE_SCRIPTS =
-
-BUILD_ARGS = CC="$(CC)" CFLAGS="-I. -DVERSION=\"$(GARVERSION)\" $(CFLAGS)" prefix="$(prefix)"
-BUILD_ARGS += _EXTRA_LIBS="-lnsl -lsocket"
-
 TEST_SCRIPTS =
 
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk
 
+pre-configure-isa-i386:
+	@echo About to initialize the autotools bits.
+	@(cd $(WORKSRC_FIRSTMOD); chmod +x autoinit.sh; ./autoinit.sh)
+	@$(MAKECOOKIE)
+
+
 install-custom:
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall -d $(DESTDIR)$(mandir)/man1

Modified: csw/mgar/pkg/cvsps/trunk/checksums
===================================================================
--- csw/mgar/pkg/cvsps/trunk/checksums	2009-01-21 21:51:52 UTC (rev 2873)
+++ csw/mgar/pkg/cvsps/trunk/checksums	2009-01-22 02:34:27 UTC (rev 2874)
@@ -1,3 +1,7 @@
 bde2110ed9f5d14de8f8cb04e9d596fe  download/cvsps-2.1.tar.gz
 cb54db01900320e1bf80da166c60c2f8  download/CSWcvsps.gspec
-fdfe30f050b93e6db82c665d830216e3  download/patch-extralibs.diff
+cc014dedc4c04f49f820c083ba903439  download/0001-adding-initial-autotools-files.patch
+bd3516f9223b80e6140247520ed767f8  download/0002-adding-script-to-do-the-auto-steps.patch
+f2039869b307620fe8f1c88cf129d04d  download/0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch
+7d7f7d520ea371bb0e0ed5424831b795  download/0005-add-autoconf-checks-for-lsocket-lnsl.patch
+acbb7ea325559370e1804c88407c5304  download/0006-corrected-naming-mistake-in-Makefile.am.patch

Added: csw/mgar/pkg/cvsps/trunk/files/0001-adding-initial-autotools-files.patch
===================================================================
--- csw/mgar/pkg/cvsps/trunk/files/0001-adding-initial-autotools-files.patch	                        (rev 0)
+++ csw/mgar/pkg/cvsps/trunk/files/0001-adding-initial-autotools-files.patch	2009-01-22 02:34:27 UTC (rev 2874)
@@ -0,0 +1,62 @@
+From 00471f248d519bab09d6aedd13bc4cb00df577d8 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 22 Jan 2009 01:48:47 +0100
+Subject: [PATCH] adding initial autotools files
+
+---
+ Makefile.am  |    2 ++
+ configure.ac |   33 +++++++++++++++++++++++++++++++++
+ 2 files changed, 35 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..efde4db
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,2 @@
++bin_PROGRAMS = cvssp
++cvssp_SOURCES = cache.c cap.c cvs_direct.c cvsps.c list_sort.c stats.c util.c
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..2d7e79d
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,33 @@
++AC_PREREQ([2.63])
++AC_INIT([cvsps], [2.1])
++AC_CONFIG_SRCDIR([util.h])
++AC_CONFIG_HEADERS([config.h])
++
++# We're using automake too
++AM_INIT_AUTOMAKE(cvsps,2.1)
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++
++# Checks for libraries.
++# FIXME: Replace `main' with a function in `-lz':
++AC_CHECK_LIB([z], [gzputs])
++
++# Checks for header files.
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_TYPE_PID_T
++AC_TYPE_SIZE_T
++AC_TYPE_SSIZE_T
++
++# Checks for library functions.
++AC_FUNC_FORK
++AC_FUNC_MALLOC
++AC_FUNC_MKTIME
++AC_CHECK_FUNCS([gethostbyname gettimeofday memmove memset mkdir regcomp setenv socket strchr strdup strerror strrchr strstr tzset])
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
++
+-- 
+1.6.0.5
+

Added: csw/mgar/pkg/cvsps/trunk/files/0002-adding-script-to-do-the-auto-steps.patch
===================================================================
--- csw/mgar/pkg/cvsps/trunk/files/0002-adding-script-to-do-the-auto-steps.patch	                        (rev 0)
+++ csw/mgar/pkg/cvsps/trunk/files/0002-adding-script-to-do-the-auto-steps.patch	2009-01-22 02:34:27 UTC (rev 2874)
@@ -0,0 +1,25 @@
+From b92b9590bec3e41238297d9f15d20b9e79c3e65b Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 22 Jan 2009 01:54:49 +0100
+Subject: [PATCH] adding script to do the auto* steps
+
+---
+ autoinit.sh |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+ create mode 100755 autoinit.sh
+
+diff --git a/autoinit.sh b/autoinit.sh
+new file mode 100755
+index 0000000..d5d5881
+--- /dev/null
++++ b/autoinit.sh
+@@ -0,0 +1,6 @@
++#!/bin/sh
++
++aclocal
++autoconf
++autoheader
++automake --add-missing --foreign
+-- 
+1.6.0.5
+

Added: csw/mgar/pkg/cvsps/trunk/files/0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch
===================================================================
--- csw/mgar/pkg/cvsps/trunk/files/0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch	                        (rev 0)
+++ csw/mgar/pkg/cvsps/trunk/files/0004-make-cvsps.c-aware-of-config.h-from-autoconf.patch	2009-01-22 02:34:27 UTC (rev 2874)
@@ -0,0 +1,25 @@
+From 037ecab1f1c4fb5cb066273c235e850e57305f01 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 22 Jan 2009 02:02:14 +0100
+Subject: [PATCH] make cvsps.c aware of config.h from autoconf
+
+---
+ cvsps.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/cvsps.c b/cvsps.c
+index 1e64e3c..d19b7ab 100644
+--- a/cvsps.c
++++ b/cvsps.c
+@@ -3,6 +3,8 @@
+  * See COPYING file for license information 
+  */
+ 
++#include "config.h"
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+1.6.0.5
+

Added: csw/mgar/pkg/cvsps/trunk/files/0005-add-autoconf-checks-for-lsocket-lnsl.patch
===================================================================
--- csw/mgar/pkg/cvsps/trunk/files/0005-add-autoconf-checks-for-lsocket-lnsl.patch	                        (rev 0)
+++ csw/mgar/pkg/cvsps/trunk/files/0005-add-autoconf-checks-for-lsocket-lnsl.patch	2009-01-22 02:34:27 UTC (rev 2874)
@@ -0,0 +1,30 @@
+From 25e9a38e60200cc65f1b0a9eae1328c7dac678f6 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 22 Jan 2009 02:19:42 +0100
+Subject: [PATCH] add autoconf checks for -lsocket, -lnsl
+
+---
+ configure.ac |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2d7e79d..7a71222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,9 +11,12 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries.
+-# FIXME: Replace `main' with a function in `-lz':
+ AC_CHECK_LIB([z], [gzputs])
+ 
++# socket stuff
++AC_CHECK_LIB([socket], [bind])
++AC_CHECK_LIB([nsl],[gethostbyname])
++
+ # Checks for header files.
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h])
+ 
+-- 
+1.6.0.5
+

Added: csw/mgar/pkg/cvsps/trunk/files/0006-corrected-naming-mistake-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/cvsps/trunk/files/0006-corrected-naming-mistake-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/cvsps/trunk/files/0006-corrected-naming-mistake-in-Makefile.am.patch	2009-01-22 02:34:27 UTC (rev 2874)
@@ -0,0 +1,23 @@
+From c96aa7e5ec93643a0daf8b5b8149e5fb703f73d0 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 22 Jan 2009 02:41:42 +0100
+Subject: [PATCH] corrected naming mistake in Makefile.am
+
+---
+ Makefile.am |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index efde4db..9871652 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,2 +1,4 @@
+-bin_PROGRAMS = cvssp
+-cvssp_SOURCES = cache.c cap.c cvs_direct.c cvsps.c list_sort.c stats.c util.c
++bin_PROGRAMS = cvsps
++cvsps_SOURCES = cache.c cap.c cvs_direct.c cvsps.c list_sort.c stats.c util.c \
++		cbtcommon/debug.c cbtcommon/hash.c cbtcommon/sio.c \
++		cbtcommon/tcpsocket.c cbtcommon/text_util.c
+-- 
+1.6.0.5
+


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