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

[dmichelsen at users.sourceforge.net]

Revision: 18581
          http://gar.svn.sourceforge.net/gar/?rev=18581&view=rev
Author:   dmichelsen
Date:     2012-06-28 09:51:26 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
pound, pound2: Reorganize, make pound 1.x old tag, name pound2 just pound

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

Added Paths:
-----------
    csw/mgar/pkg/pound/
    csw/mgar/pkg/pound/tags/pound-1.x/

Removed Paths:
-------------
    csw/mgar/pkg/pound/
    csw/mgar/pkg/pound2/

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound2/trunk/Makefile	2012-06-28 01:02:30 UTC (rev 18572)
+++ csw/mgar/pkg/pound/trunk/Makefile	2012-06-28 09:51:26 UTC (rev 18581)
@@ -1,9 +1,9 @@
-NAME = pound2
-VERSION = 2.4.5
+NAME = pound
+VERSION = 2.6
 CATEGORIES = net
 GARTYPE = v2
 
-DESCRIPTION = reverse proxy load balancer
+DESCRIPTION = Reverse proxy load balancer
 define BLURB
   The Pound program is a reverse proxy, load balancer and HTTPS front-end for
   Web server(s). Pound was developed to enable distributing the load among
@@ -13,52 +13,65 @@
 endef
 
 MASTER_SITES = http://www.apsis.ch/pound/
-DISTFILES  = Pound-$(VERSION).tgz
-DISTNAME   = Pound-$(VERSION)
+DISTNAME = Pound-$(VERSION)
+DISTFILES += $(DISTNAME).tgz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+# adjust log/run files
+PATCHFILES  = patch-pound.h
+PATCHFILES += patch-pound.8
 
-# we require
-RUNTIME_DEP_PKGS = CSWosslrt CSWpcrert
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+VENDOR_URL = http://www.apsis.ch/pound/
+
+LICENSE = GPL.txt
+
+RUNTIME_DEP_PKGS += CSWlibssl-dev
+RUNTIME_DEP_PKGS += CSWlibcurl-dev
+
+PACKAGES += CSWpound
+SPKG_DESC_CSWpound = Reverse proxy load balancer
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWpound += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWpound += CSWlibssl1-0-0
+OBSOLETED_BY_CSWpound = CSWpound2
+
+# This is just for example scripts
+CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython
+
+EXTRA_DOCS += README
+EXTRA_DOCS += FAQ
+EXTRA_DOCS += CHANGELOG
+EXTRA_DOCS += z2_2_5_1.py
+EXTRA_DOCS += z2_2_6_1.py
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-super
 CONFIGURE_ARGS += --enable-msdav
 CONFIGURE_ARGS += --with-maxbuf=8192
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
-# adjust log/run files
-PATCHFILES  = patch-pound.h
-PATCHFILES += patch-pound.8
-
 # No test suite available
 TEST_SCRIPTS =
 
 # use a custom install
-INSTALL_SCRIPTS = custom docs
+INSTALL_SCRIPTS = custom extra-docs
 
+PRESERVECONF = $(sysconfdir)/pound.cfg
+
 include gar/category.mk
 
 install-custom: 
 	ginstall -d $(DESTDIR)$(sbindir)
-	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound2
-	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/pound2ctl
+	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound
+	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/poundctl
 	ginstall -d $(DESTDIR)$(mandir)/man8
-	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound2.8
-	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8
+	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
+	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8
 	ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -d $(DESTDIR)/var/opt/csw/run
+	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg
 
-docs-list  = $(WORKSRC)/README
-docs-list += $(WORKSRC)/FAQ
-docs-list += $(WORKSRC)/CHANGELOG
-docs-list += $(WORKSRC)/z2_2_5_1.py
-docs-list += $(WORKSRC)/z2_2_6_1.py
-install-docs:
+install-extra-docs:
 	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
-	@( for file in $(docs-list) ; do \
-		ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(NAME) ; \
-			done )
+	ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound2/trunk/checksums	2012-06-28 01:02:30 UTC (rev 18572)
+++ csw/mgar/pkg/pound/trunk/checksums	2012-06-28 09:51:26 UTC (rev 18581)
@@ -1,3 +1 @@
-4c4613e857ee14c06c61ab09e28ae503  download/Pound-2.4.5.tgz
-30fabf8e6abf2e1af1cc65bc740c0124  download/patch-pound.8
-e7acc61f9ff01ecaaa628a08b207176f  download/patch-pound.h
+8c913b527332694943c4c67c8f152071  Pound-2.6.tgz

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