--- a/components/slang/Makefile	Wed Mar 26 13:35:48 2014 -0700
+++ b/components/slang/Makefile	Tue Apr 01 11:11:03 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -46,6 +46,8 @@
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--sysconfdir=$(ETCDIR)/slsh
 
+ASLR_MODE=$(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_32_and_64)
 

--- a/components/tmux/Makefile	Wed Mar 26 13:35:48 2014 -0700
+++ b/components/tmux/Makefile	Tue Apr 01 11:11:03 2014 -0700
@@ -45,10 +45,12 @@
 # nroff does not work with -mandoc using groff
 MANDIR_PREFORMATED= $(PROTO_DIR)/usr/share/man/cat1
 COMPONENT_POST_INSTALL_ACTION += \
-        /usr/bin/groff -Tascii -mandoc $(SOURCE_DIR)/tmux.1>tmux.1.mod ; \
+        /usr/bin/gnroff -c -Tascii -mandoc $(SOURCE_DIR)/tmux.1>tmux.1.mod ; \
         mkdir -p $(MANDIR_PREFORMATED) ; \
         $(MV) tmux.1.mod $(MANDIR_PREFORMATED)/tmux.1
 
+ASLR_MODE=$(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_64)