18277000 Migrate GD2 to 64-bit
18276967 Migrate GNUPG and PINENTRY to 64-bit
18277004 Migrate NMAP to 64-bit
18277008 Migrate RTORRENT to 64-bit
18301508 Remove -lnsl -lsocket in LDFLAGS
--- a/components/gd2/gd2.p5m Tue Feb 25 01:40:06 2014 -0800
+++ b/components/gd2/gd2.p5m Tue Feb 25 08:40:04 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 uncommitted>
@@ -40,19 +40,19 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
#
-file path=usr/bin/annotate
-file path=usr/bin/gd2copypal
-file path=usr/bin/gd2time
-file path=usr/bin/gd2togif
-file path=usr/bin/gd2topng
-file path=usr/bin/gdcmpgif
-file path=usr/bin/gdlib-config
-file path=usr/bin/gdparttopng
-file path=usr/bin/gdtopng
-file path=usr/bin/giftogd2
-file path=usr/bin/pngtogd
-file path=usr/bin/pngtogd2
-file path=usr/bin/webpng
+file usr/bin/$(MACH64)/annotate path=usr/bin/annotate
+file usr/bin/$(MACH64)/gd2copypal path=usr/bin/gd2copypal
+file usr/bin/$(MACH64)/gd2time path=usr/bin/gd2time
+file usr/bin/$(MACH64)/gd2togif path=usr/bin/gd2togif
+file usr/bin/$(MACH64)/gd2topng path=usr/bin/gd2topng
+file usr/bin/$(MACH64)/gdcmpgif path=usr/bin/gdcmpgif
+file usr/bin/$(MACH64)/gdlib-config path=usr/bin/gdlib-config
+file usr/bin/$(MACH64)/gdparttopng path=usr/bin/gdparttopng
+file usr/bin/$(MACH64)/gdtopng path=usr/bin/gdtopng
+file usr/bin/$(MACH64)/giftogd2 path=usr/bin/giftogd2
+file usr/bin/$(MACH64)/pngtogd path=usr/bin/pngtogd
+file usr/bin/$(MACH64)/pngtogd2 path=usr/bin/pngtogd2
+file usr/bin/$(MACH64)/webpng path=usr/bin/webpng
file path=usr/include/gd2/entities.h
file path=usr/include/gd2/gd.h
file path=usr/include/gd2/gd_io.h
--- a/components/gnupg/Makefile Tue Feb 25 01:40:06 2014 -0800
+++ b/components/gnupg/Makefile Tue Feb 25 08:40:04 2014 -0800
@@ -80,6 +80,8 @@
CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX)
CONFIGURE_OPTIONS += --with-bzip2=$(CONFIGURE_PREFIX)
CONFIGURE_OPTIONS += --with-readline=$(CONFIGURE_PREFIX)
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+CONFIGURE_SBINDIR.64 = $(CONFIGURE_PREFIX)/sbin
LIBKSBA_MANIFEST = manifest-$(MACH)-libksba.depend
LIBASSUAN_MANIFEST = manifest-$(MACH)-libassuan.depend
@@ -102,9 +104,9 @@
ASLR_MODE = $(ASLR_ENABLE)
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
( cd $(PROTOUSRSHARELOCALEDIR) ; \
$(CP) -R 'en@boldquot' en )
( cd $(PROTOUSRSHAREMANDIR) ; \
@@ -116,7 +118,7 @@
$(MV) $$f.8 $$f.1m ; fi ; \
done )
-test: $(TEST_32)
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/nmap/Makefile Tue Feb 25 01:40:06 2014 -0800
+++ b/components/nmap/Makefile Tue Feb 25 08:40:04 2014 -0800
@@ -50,10 +50,10 @@
CONFIGURE_OPTIONS += CXX="$(CXX)"
CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)"
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
-CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS) -m64"
CONFIGURE_OPTIONS += LIBS="-lsocket -lnsl"
CONFIGURE_OPTIONS += PYTHON="$(PYTHON)"
-CONFIGURE_OPTIONS += --srcdir=$(BUILD_DIR_32)
+CONFIGURE_OPTIONS += --srcdir=$(BUILD_DIR_64)
CONFIGURE_OPTIONS += --localstatedir=/var
CONFIGURE_OPTIONS += --without-localdirs
CONFIGURE_OPTIONS += --with-zenmap
@@ -73,9 +73,9 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
--- a/components/nmap/nmap.p5m Tue Feb 25 01:40:06 2014 -0800
+++ b/components/nmap/nmap.p5m Tue Feb 25 08:40:04 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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 volatile>
@@ -41,11 +41,11 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2007/129
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/ncat
+file usr/bin/$(MACH64)/ncat path=usr/bin/ncat
file path=usr/bin/ndiff
-file path=usr/bin/nmap
+file usr/bin/$(MACH64)/nmap path=usr/bin/nmap
link path=usr/bin/nmapfe target=zenmap
-file path=usr/bin/nping
+file usr/bin/$(MACH64)/nping path=usr/bin/nping
file path=usr/bin/uninstall_zenmap
link path=usr/bin/xnmap target=zenmap
file path=usr/bin/zenmap
--- a/components/pinentry/Makefile Tue Feb 25 01:40:06 2014 -0800
+++ b/components/pinentry/Makefile Tue Feb 25 08:40:04 2014 -0800
@@ -77,12 +77,13 @@
CONFIGURE_OPTIONS += --disable-pinentry-gtk
CONFIGURE_OPTIONS += --disable-pinentry-qt
CONFIGURE_OPTIONS += --disable-ncurses
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
ASLR_MODE = $(ASLR_ENABLE)
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
$(MKDIR) $(PROTOUSRLIBDIR)
if test -f $(PROTOUSRBINDIR)/pinentry-curses ; then \
$(MV) $(PROTOUSRBINDIR)/pinentry-curses $(PROTOUSRLIBDIR)/ ; fi
--- a/components/rtorrent/Makefile Tue Feb 25 01:40:06 2014 -0800
+++ b/components/rtorrent/Makefile Tue Feb 25 08:40:04 2014 -0800
@@ -57,13 +57,13 @@
# this is needed or we can't compile the rak headers
CC=$(CXX)
-LDFLAGS += -L/usr/gnu/lib -R/usr/gnu/lib -lnsl -lsocket
+LDFLAGS += -L/usr/gnu/lib/$(MACH64) -R/usr/gnu/lib/$(MACH64)
CXXFLAGS += -i
CXXFLAGS += -xspace
CXXFLAGS += $(studio_XREGS)
CXXFLAGS += -I/usr/include/ncurses
-CONFIGURE_OPTIONS.32 += --srcdir=$(BUILD_DIR_32)
+CONFIGURE_OPTIONS.64 += --srcdir=$(BUILD_DIR_64)
CONFIGURE_OPTIONS += --disable-debug
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
@@ -72,9 +72,9 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
--- a/components/rtorrent/rtorrent.p5m Tue Feb 25 01:40:06 2014 -0800
+++ b/components/rtorrent/rtorrent.p5m Tue Feb 25 08:40:04 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# 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 uncommitted>
@@ -36,5 +36,5 @@
license rtorrent.license license='GPLv2'
-file path=usr/bin/rtorrent
+file usr/bin/$(MACH64)/rtorrent path=usr/bin/rtorrent
file path=usr/share/man/man1/rtorrent.1