[csw-devel] SF.net SVN: gar:[20895] csw/mgar/pkg/pound/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 20895
          http://gar.svn.sourceforge.net/gar/?rev=20895&view=rev
Author:   dmichelsen
Date:     2013-04-29 06:56:37 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
pound/trunk: Some more work towards release

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

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile	2013-04-28 18:23:29 UTC (rev 20894)
+++ csw/mgar/pkg/pound/trunk/Makefile	2013-04-29 06:56:37 UTC (rev 20895)
@@ -16,11 +16,9 @@
 DISTFILES += $(DISTNAME).tgz
 
 # adjust log/run files
-PATCHFILES  = patch-pound.h
-PATCHFILES += patch-pound.8
+#PATCHFILES  = patch-pound.h
+#PATCHFILES += patch-pound.8
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 VENDOR_URL = http://www.apsis.ch/pound/
 
 LICENSE = GPL.txt
@@ -45,19 +43,43 @@
 EXTRA_DOCS += z2_2_5_1.py
 EXTRA_DOCS += z2_2_6_1.py
 
+POUNDCFG = $(sysconfdir)/pound.cfg
+
+REINPLACEMENTS += poundcfg
+REINPLACE_MATCH_poundcfg = /usr/local/etc/pound.cfg
+REINPLACE_WITH_poundcfg = $/POUNDCFG)
+REINPLACE_FILES_poundcfg += pound.8
+
+REINPLACEMENTS += certpath
+REINPLACE_MATCH_certpath = /usr/local/etc/pound/cert.pem
+REINPLACE_WITH_certpath = $(sysconfdir)/cert.pem
+REINPLACE_FILES_certpath += pound.8
+
+REINPLACEMENTS += config
+REINPLACE_MATCH_config = /etc/pound/
+REINPLACE_WITH_config = $(sysconfdir)/pound/
+REINPLACE_FILES_config += pound.8
+
+BUILD64 = 1
+ISAEXEC = 1
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-super
-CONFIGURE_ARGS += --enable-msdav
 CONFIGURE_ARGS += --with-maxbuf=8192
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
+BUILD_OVERRIDE_VARS += F_CONF
+BUILD_OVERRIDE_ENV_F_CONF = $(POUNDCFG)
+BUILD_OVERRIDE_VARS += F_PID
+BUILD_OVERRIDE_ENV_F_PID = $(localstatedir)/run/pound.pid
+
 # No test suite available
 TEST_SCRIPTS =
 
 # use a custom install
-INSTALL_SCRIPTS = custom extra-docs
+INSTALL_SCRIPTS = custom
 
-PRESERVECONF = $(sysconfdir)/pound.cfg
+PRESERVECONF = $(POUNDCFG)
 
 include gar/category.mk
 
@@ -70,8 +92,6 @@
 	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)/pound.cfg
-
-install-extra-docs:
 	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
 	ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
 	@$(MAKECOOKIE)

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