17011761 update less to 458 s11-update
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 13 Feb 2015 09:27:11 -0800
branchs11-update
changeset 3804 83478bd23f4f
parent 3802 c3fd3eae5cb1
child 3806 bdc70b98921a
17011761 update less to 458
components/less/Makefile
components/less/less.license
components/less/less.p5m
--- a/components/less/Makefile	Wed Feb 04 04:20:03 2015 -0800
+++ b/components/less/Makefile	Fri Feb 13 09:27:11 2015 -0800
@@ -20,18 +20,18 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		less
-COMPONENT_VERSION=	436
+COMPONENT_VERSION=	458
 COMPONENT_PROJECT_URL=	http://www.greenwoodsoftware.com/less/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2
+    sha256:e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/less
 
@@ -41,12 +41,20 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CC += $(CC_BITS)
+
+CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
+
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+configure:	$(CONFIGURE_64)
 
-install:	$(INSTALL_32)
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/less/less.license	Wed Feb 04 04:20:03 2015 -0800
+++ b/components/less/less.license	Fri Feb 13 09:27:11 2015 -0800
@@ -1,6 +1,6 @@
-                            Less, version 436
+                            Less, version 458
 
-    This is the distribution of less, version 436, released 07 Jul 2009.
+    This is the distribution of less, version 458, released 04 Apr 2013.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or
@@ -12,15 +12,14 @@
     or
     2. The Less License, in the file LICENSE.
 
-    Please report any problems to [email protected] or [email protected]
+    Please report any problems to [email protected]
     See http://www.greenwoodsoftware.com/less for the latest info.
 
-
                           Less License
                           ------------
 
 Less
-Copyright (C) 1984-2009  Mark Nudelman
+Copyright (C) 1984-2012  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
--- a/components/less/less.p5m	Wed Feb 04 04:20:03 2015 -0800
+++ b/components/less/less.p5m	Fri Feb 13 09:27:11 2015 -0800
@@ -35,14 +35,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/bin
 file path=usr/bin/less
 file path=usr/bin/lessecho
 file path=usr/bin/lesskey
-dir  path=usr/share
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
 file path=usr/share/man/man1/less.1
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1