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

[igalic at users.sourceforge.net]

Revision: 18156
          http://gar.svn.sourceforge.net/gar/?rev=18156&view=rev
Author:   igalic
Date:     2012-05-29 13:29:31 +0000 (Tue, 29 May 2012)
Log Message:
-----------
trafficserver/trunk: bump version to 3.1.4-unstable
revert the change to the user/group, instead use the build-user
and REINPLACE the final user in the installed config file

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

Modified: csw/mgar/pkg/trafficserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trafficserver/trunk/Makefile	2012-05-29 13:22:46 UTC (rev 18155)
+++ csw/mgar/pkg/trafficserver/trunk/Makefile	2012-05-29 13:29:31 UTC (rev 18156)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = trafficserver
-VERSION = 3.0.5
+VERSION = 3.1.4-unstable
 GARTYPE = v2
 CATEGORIES = server
 
@@ -11,13 +11,16 @@
   Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 endef
 
-MASTER_SITES = http://people.apache.org/~igalic/releases/
+MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/
 DISTFILES  = $(DISTNAME).tar.bz2
 
 PACKAGING_PLATFORMS = solaris10-i386
 BUILD64_ONLY = 1
 ISAEXEC = 1
 
+pkgsysuser  = $(shell /opt/csw/gnu/id -nu)
+pkgsysgroup = $(shell /opt/csw/gnu/id -ng)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/$(NAME)
 CONFIGURE_ARGS += --libexecdir=$(libexecdir)/$(NAME)
@@ -27,31 +30,21 @@
 CONFIGURE_ARGS += --with-pcre=$(prefix)
 CONFIGURE_ARGS += --with-lzma=$(prefix)
 CONFIGURE_ARGS += --with-expat=$(prefix)
+CONFIGURE_ARGS += --enable-hwloc
+CONFIGURE_ARGS += --with-user=$(pkgsysuser)
+CONFIGURE_ARGS += --with-group=$(pkgsysgroup)
 
-pkgsysuser  = $(shell /opt/csw/gnu/id -nu)
-pkgsysgroup = $(shell /opt/csw/gnu/id -ng)
-
-EXTRA_CONFIGURE_EXPORTS += pkgsysuser
-CONFIGURE_ENV_pkgsysuser += $(pkgsysuser)
-EXTRA_CONFIGURE_EXPORTS += pkgsysgroup
-CONFIGURE_ENV_pkgsysgroup = $(pkgsysgroup)
-
-EXTRA_BUILD_EXPORTS += pkgsysuser
-BUILD_ENV_pkgsysuser = $(pkgsysuser)
-EXTRA_BUILD_EXPORTS += $(pkgsysgroup)
-BUILD_ENV_pkgsysgroup = $(pkgsysgroup)
-
-EXTRA_INSTALL_EXPORTS += pkgsysuser
-INSTALL_ENV_pkgsysuser = $(pkgsysuser)
-EXTRA_INSTALL_EXPORTS += $(pkgsysgroup)
-INSTALL_ENV_pkgsysgroup = $(pkgsysgroup)
-
 PROTOTYPE_MODIFIERS += data
 PROTOTYPE_FILES_data += $(sysconfdir)/?.*
 PROTOTYPE_FILES_data += $(datadir)/?.*
 PROTOTYPE_USER_data = nobody
 PROTOTYPE_GROUP_data = nobody
 
+REINPLACE_MATCH = $(pkgsysuser)
+REINPLACE_WITH = nobody
+REINPLACE_FILES += $(sysconfidir)/$(NAME)/records.config
+REINPLACE_WHEN = postinstall
+
 STRIP_LIBTOOL = 1
 
 include gar/category.mk

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