[csw-devel] SF.net SVN: gar:[7150] csw/mgar/pkg/balance/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Nov 6 16:36:38 CET 2009


Revision: 7150
          http://gar.svn.sourceforge.net/gar/?rev=7150&view=rev
Author:   dmichelsen
Date:     2009-11-06 15:36:38 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
balance: Update to 3.42

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

Added Paths:
-----------
    csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch

Removed Paths:
-------------
    csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec
    csw/mgar/pkg/balance/trunk/files/build.diff

Property Changed:
----------------
    csw/mgar/pkg/balance/trunk/


Property changes on: csw/mgar/pkg/balance/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/balance/trunk/Makefile
===================================================================
--- csw/mgar/pkg/balance/trunk/Makefile	2009-11-06 15:10:15 UTC (rev 7149)
+++ csw/mgar/pkg/balance/trunk/Makefile	2009-11-06 15:36:38 UTC (rev 7150)
@@ -1,8 +1,8 @@
 GARNAME = balance
-GARVERSION = 3.11
+GARVERSION = 3.42
 CATEGORIES = net
 
-DESCRIPTION = A TCP proxy and load balancer.
+DESCRIPTION = A TCP proxy and load balancer
 define BLURB
   Balance is a simple but powerful generic TCP proxy with round-robin load
   balancing and failover mechanisms. Its behaviour can be controlled at runtime
@@ -11,15 +11,13 @@
 
 MASTER_SITES = http://www.inlab.de/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWbalance,)
+PATCHFILES = 0001-Adjust-Makefile.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# Configure for build with SunONE
-PATCHFILES = build.diff
-
 CONFIGURE_SCRIPTS =
+
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/balance/trunk/checksums
===================================================================
--- csw/mgar/pkg/balance/trunk/checksums	2009-11-06 15:10:15 UTC (rev 7149)
+++ csw/mgar/pkg/balance/trunk/checksums	2009-11-06 15:36:38 UTC (rev 7150)
@@ -1,3 +1,2 @@
-b3ab07862a1e25dc63c1f5f2a006f474  download/balance-3.11.tar.gz
-3c06491c6dc775fc8883ef7346427343  download/CSWbalance.gspec
-8dfddaec5c9b69f163e581447f1b592b  download/build.diff
+dff93af413acf3cfe6e54f9f8ec99327  0001-Adjust-Makefile.patch
+24bc4063e8af298471d7d0a2ac7462a6  balance-3.42.tar.gz

Added: csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch
===================================================================
--- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch	                        (rev 0)
+++ csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch	2009-11-06 15:36:38 UTC (rev 7150)
@@ -0,0 +1,65 @@
+From f39ca105749c5c407c8e0ff6d53ed0a1fee12470 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Nov 2009 16:33:53 +0100
+Subject: [PATCH] Adjust Makefile
+
+---
+ Makefile |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 90a4b47..3c549ce 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,26 +1,28 @@
+ # $Id: Makefile,v 1.45 2008/04/08 17:39:08 tommy Exp $
+ 
+ #CFLAGS=-g -I.
+-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized
++# CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized
+ 
+ # uncomment for any OS other than Cygwin
+ BALANCE=balance
+ ROOT=root
+ INSTALL=install
+-BINDIR=/usr/sbin
+-MANDIR=${BINDIR}/../man/man1
++# BINDIR=/usr/sbin
++# MANDIR=${BINDIR}/../man/man1
+ 
+ # uncomment for Solaris
+-# LIBRARIES=-lsocket -lnsl
+-# INSTALL=/usr/ucb/install
++LIBRARIES=-lsocket -lnsl
++INSTALL=/usr/ucb/install
+ # BINDIR=/usr/local/libexec
++BINDIR=/opt/csw/sbin
++MANDIR=/opt/csw/share/man/man1
+ 
+ # uncomment for Cygwin
+ # LIBRARIES=-L/usr/local/lib -lcygipc
+ # BALANCE=balance.exe
+ # ROOT=Administrators
+ 
+-CC=gcc
++# CC=gcc
+ RELEASE=3.42
+ 
+ all: balance 
+@@ -48,9 +50,11 @@ clean:
+ 	rm -f $(BALANCE) *.o balance.ps balance.pdf
+ 
+ install:
+-	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  $(BALANCE) \
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755  $(BALANCE) \
+ 		$(DESTDIR)$(BINDIR)/$(BALANCE) 
+-	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  balance.1 \
++	$(INSTALL) -d $(DESTDIR)$(MANDIR)
++	$(INSTALL) -m 755  balance.1 \
+ 		$(DESTDIR)$(MANDIR) 
+ 	mkdir -p $(DESTDIR)/var/run/balance
+ 	chmod 1777 $(DESTDIR)/var/run/balance
+-- 
+1.6.5.1
+

Deleted: csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec
===================================================================
--- csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec	2009-11-06 15:10:15 UTC (rev 7149)
+++ csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec	2009-11-06 15:36:38 UTC (rev 7150)
@@ -1,4 +0,0 @@
-%var            bitname balance
-%var            pkgname CSWbalance
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYRIGHT

Deleted: csw/mgar/pkg/balance/trunk/files/build.diff
===================================================================
--- csw/mgar/pkg/balance/trunk/files/build.diff	2009-11-06 15:10:15 UTC (rev 7149)
+++ csw/mgar/pkg/balance/trunk/files/build.diff	2009-11-06 15:36:38 UTC (rev 7150)
@@ -1,28 +0,0 @@
---- balance-3.11.orig/Makefile	2003-10-04 02:41:44.000000000 -0700
-+++ balance-3.11/Makefile	2004-05-14 13:02:03.201642000 -0700
-@@ -1,12 +1,8 @@
- # $Id: build.diff,v 1.1.1.1 2004/08/17 17:07:34 comand Exp $
- 
--#CFLAGS=-g -I.
--CFLAGS=-O2
--
- # uncomment for Solaris:
--# LIBRARIES=-lsocket -lnsl
-+LIBRARIES=-lsocket -lnsl
- 
--CC=gcc
- RELEASE=3.11
- 
- balance:	balance.c butils.o balance.h
-@@ -24,8 +20,9 @@
- 		rm -f balance
- 
- install:
--		install -o root -g root -m 755  balance /usr/sbin/balance 
--		install -o root -g root -m 755  balance.1 /usr/man/man1 
-+		install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man1
-+		install -o root -g root -m 755  balance $(DESTDIR)$(sbindir)/balance 
-+		install -o root -g root -m 755  balance.1 $(DESTDIR)$(mandir)/man1 
- 		mkdir -p /var/run/balance
- 		chmod 1777 /var/run/balance
- 


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