--- a/components/gawk/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/gawk/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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
@@ -36,16 +36,21 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib
+
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-# common targets
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32)
+# common targets
+build: $(BUILD_64)
-test: $(TEST_32)
+install: $(INSTALL_64)
+
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/git/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/git/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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
@@ -44,6 +44,9 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib
+
CONFIGURE_PREFIX = /usr
CONFIGURE_OPTIONS += --without-openssl
CONFIGURE_OPTIONS += --libexecdir=/usr/lib
@@ -65,12 +68,14 @@
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32) $(BUILD_DIR)/.manpages
+build: $(BUILD_64)
+
+install: $(INSTALL_64) $(BUILD_DIR)/.manpages
# There are some known issues around I18N.
-test: $(TEST_32)
+test: $(TEST_64)
# These man pages come in a separate archive with no Makefile
# and Solaris likes some of them moved around hence we'll just
--- a/components/gperf/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/gperf/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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
@@ -36,16 +36,20 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --docdir=/usr/share/doc/gperf
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)"
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
+
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
-test: $(TEST_32)
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/privoxy/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/privoxy/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -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
@@ -47,15 +47,20 @@
autoheader; \
autoconf )
+CC += $(CC_BITS)
+
# Needed to installed most of the files into the proto area.
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS += --localstatedir=/var
+CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_PREFIX)/lib
+
+ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
- $(CP) $(BUILD_DIR_32)/templates/* $(PROTOETCDIR)/templates
+install: $(INSTALL_64)
+ $(CP) $(BUILD_DIR_64)/templates/* $(PROTOETCDIR)/templates
test: $(NO_TESTS)
--- a/components/privoxy/privoxy.p5m Tue Jan 07 05:15:45 2014 -0800
+++ b/components/privoxy/privoxy.p5m Tue Jan 07 09:46:44 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -145,4 +145,4 @@
file path=usr/share/doc/privoxy/user-manual/whatsnew.html
file path=usr/share/man/man1/privoxy.1
-file usr/sbin/privoxy path=usr/lib/privoxy mode=0555
+file path=usr/lib/privoxy mode=0555
--- a/components/webalizer/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/webalizer/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -67,6 +67,8 @@
# Needed to correctly build that 64-bit library.
LDFLAGS += $(CC_BITS)
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_64)
--- a/components/which/Makefile Tue Jan 07 05:15:45 2014 -0800
+++ b/components/which/Makefile Tue Jan 07 09:46:44 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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
@@ -36,18 +36,22 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
CONFIGURE_PREFIX = /usr/gnu
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --disable-iberty
CONFIGURE_OPTIONS += --disable-dependency-tracking
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-# common targets
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32)
+# common targets
+build: $(BUILD_64)
-test: $(TEST_32)
+install: $(INSTALL_64)
+
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)