[csw-devel] SF.net SVN: gar:[16894] csw/mgar

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jan 23 15:12:33 CET 2012


Revision: 16894
          http://gar.svn.sourceforge.net/gar/?rev=16894&view=rev
Author:   dmichelsen
Date:     2012-01-23 14:12:28 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Change semantics of BUILD64, add BUILD64_LIBS_ONLY

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.mk
    csw/mgar/pkg/GeoIP/trunk/Makefile
    csw/mgar/pkg/adns/trunk/Makefile
    csw/mgar/pkg/apr-iconv/trunk/Makefile
    csw/mgar/pkg/apr-util/trunk/Makefile
    csw/mgar/pkg/argtable/trunk/Makefile
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/autotrace/trunk/Makefile
    csw/mgar/pkg/babl/trunk/Makefile
    csw/mgar/pkg/bdb3/trunk/Makefile
    csw/mgar/pkg/boost/trunk/Makefile
    csw/mgar/pkg/bzip2/trunk/Makefile
    csw/mgar/pkg/c-ares/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfitsio/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/chrpath/trunk/Makefile
    csw/mgar/pkg/cloog/trunk/Makefile
    csw/mgar/pkg/cpptest/trunk/Makefile
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus-glib/trunk/Makefile
    csw/mgar/pkg/eet/trunk/Makefile
    csw/mgar/pkg/eina/trunk/Makefile
    csw/mgar/pkg/enchant/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/evolution/trunk/Makefile
    csw/mgar/pkg/evolution-ds/trunk/Makefile
    csw/mgar/pkg/evolution-exchange/trunk/Makefile
    csw/mgar/pkg/evolution-mapi/trunk/Makefile
    csw/mgar/pkg/evolution-webcal/trunk/Makefile
    csw/mgar/pkg/examples/64-bit/trunk/Makefile
    csw/mgar/pkg/examples/multiple-versions/trunk/Makefile
    csw/mgar/pkg/exiv2/trunk/Makefile
    csw/mgar/pkg/expect/trunk/Makefile
    csw/mgar/pkg/fbopenssl/trunk/Makefile
    csw/mgar/pkg/ffmpeg/trunk/Makefile
    csw/mgar/pkg/file/trunk/Makefile
    csw/mgar/pkg/fltk/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
    csw/mgar/pkg/freeglut/trunk/Makefile
    csw/mgar/pkg/freetds/trunk/Makefile
    csw/mgar/pkg/freetype/trunk/Makefile
    csw/mgar/pkg/fribidi/trunk/Makefile
    csw/mgar/pkg/ftgl/trunk/Makefile
    csw/mgar/pkg/gamin/trunk/Makefile
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile
    csw/mgar/pkg/gd/trunk/Makefile
    csw/mgar/pkg/gdbm/trunk/Makefile
    csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
    csw/mgar/pkg/gdome2/trunk/Makefile
    csw/mgar/pkg/gengetopt/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/giflib/trunk/Makefile
    csw/mgar/pkg/gkrellm/trunk/Makefile
    csw/mgar/pkg/glew/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
    csw/mgar/pkg/gnulib/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg_minimal/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/googletest/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/gsasl/trunk/Makefile
    csw/mgar/pkg/gsm/trunk/Makefile
    csw/mgar/pkg/gtk2/trunk/Makefile
    csw/mgar/pkg/gts/trunk/Makefile
    csw/mgar/pkg/guile/trunk/Makefile
    csw/mgar/pkg/host-sflow/trunk/Makefile
    csw/mgar/pkg/hwloc/trunk/Makefile
    csw/mgar/pkg/id3lib/trunk/Makefile
    csw/mgar/pkg/idzebra/trunk/Makefile
    csw/mgar/pkg/ilmbase/trunk/Makefile
    csw/mgar/pkg/ilmbase2/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/imlib2_loaders/trunk/Makefile
    csw/mgar/pkg/jack/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/lame/trunk/Makefile
    csw/mgar/pkg/lensfun/trunk/Makefile
    csw/mgar/pkg/liba52/trunk/Makefile
    csw/mgar/pkg/libao/trunk/Makefile
    csw/mgar/pkg/libao2/trunk/Makefile
    csw/mgar/pkg/libarchive/trunk/Makefile
    csw/mgar/pkg/libart/trunk/Makefile
    csw/mgar/pkg/libassuan/trunk/Makefile
    csw/mgar/pkg/libast/trunk/Makefile
    csw/mgar/pkg/libatk/trunk/Makefile
    csw/mgar/pkg/libcairo/trunk/Makefile
    csw/mgar/pkg/libcddb/trunk/Makefile
    csw/mgar/pkg/libcdio/trunk/Makefile
    csw/mgar/pkg/libconfuse/trunk/Makefile
    csw/mgar/pkg/libcroco/trunk/Makefile
    csw/mgar/pkg/libdatrie/trunk/Makefile
    csw/mgar/pkg/libdbi/trunk/Makefile
    csw/mgar/pkg/libdbi-drivers/trunk/Makefile
    csw/mgar/pkg/libdnet/trunk/Makefile
    csw/mgar/pkg/libebml/trunk/Makefile
    csw/mgar/pkg/libeggdbus/trunk/Makefile
    csw/mgar/pkg/libemf/trunk/Makefile
    csw/mgar/pkg/libev/trunk/Makefile
    csw/mgar/pkg/libevent/trunk/Makefile
    csw/mgar/pkg/libevent2/trunk/Makefile
    csw/mgar/pkg/libexif/trunk/Makefile
    csw/mgar/pkg/libexpat0/trunk/Makefile
    csw/mgar/pkg/libexplain/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libffi/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libflac8/trunk/Makefile
    csw/mgar/pkg/libfpx/trunk/Makefile
    csw/mgar/pkg/libgadu/trunk/Makefile
    csw/mgar/pkg/libgc/trunk/Makefile
    csw/mgar/pkg/libgcrypt/trunk/Makefile
    csw/mgar/pkg/libgdbm3/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libgmp/trunk/Makefile
    csw/mgar/pkg/libgmp3/trunk/Makefile
    csw/mgar/pkg/libgnugetopt/trunk/Makefile
    csw/mgar/pkg/libgpg_error/trunk/Makefile
    csw/mgar/pkg/libgsf/trunk/Makefile
    csw/mgar/pkg/libgss/trunk/Makefile
    csw/mgar/pkg/libical/trunk/Makefile
    csw/mgar/pkg/libiconv/trunk/Makefile
    csw/mgar/pkg/libicu46/trunk/Makefile
    csw/mgar/pkg/libicu48/trunk/Makefile
    csw/mgar/pkg/libid3tag/trunk/Makefile
    csw/mgar/pkg/libidl/trunk/Makefile
    csw/mgar/pkg/libidn/trunk/Makefile
    csw/mgar/pkg/libiptcdata/trunk/Makefile
    csw/mgar/pkg/libjpeg62/trunk/Makefile
    csw/mgar/pkg/libkate/trunk/Makefile
    csw/mgar/pkg/libksba/trunk/Makefile
    csw/mgar/pkg/liblasi/trunk/Makefile
    csw/mgar/pkg/liblqr/trunk/Makefile
    csw/mgar/pkg/libmad/trunk/Makefile
    csw/mgar/pkg/libmatio/trunk/Makefile
    csw/mgar/pkg/libmatroska/trunk/Makefile
    csw/mgar/pkg/libmcal/trunk/Makefile
    csw/mgar/pkg/libmcrypt/trunk/Makefile
    csw/mgar/pkg/libmhash/trunk/Makefile
    csw/mgar/pkg/libmikmod/trunk/Makefile
    csw/mgar/pkg/libmpeg2/trunk/Makefile
    csw/mgar/pkg/libmpfr/trunk/Makefile
    csw/mgar/pkg/libnet/trunk/Makefile
    csw/mgar/pkg/libnotify/trunk/Makefile
    csw/mgar/pkg/libntlm/trunk/Makefile
    csw/mgar/pkg/libogg/trunk/Makefile
    csw/mgar/pkg/liboggz/trunk/Makefile
    csw/mgar/pkg/liboil/trunk/Makefile
    csw/mgar/pkg/liborc/trunk/Makefile
    csw/mgar/pkg/libpaper/trunk/Makefile
    csw/mgar/pkg/libpng/trunk/Makefile
    csw/mgar/pkg/libpopt/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/libsamplerate/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libsdl/trunk/Makefile
    csw/mgar/pkg/libsexy/trunk/Makefile
    csw/mgar/pkg/libshout/trunk/Makefile
    csw/mgar/pkg/libsigcpp/trunk/Makefile
    csw/mgar/pkg/libsigsegv/trunk/Makefile
    csw/mgar/pkg/libsigsegv0/trunk/Makefile
    csw/mgar/pkg/libsmi/trunk/Makefile
    csw/mgar/pkg/libsndfile/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libspectre/trunk/Makefile
    csw/mgar/pkg/libspf2/trunk/Makefile
    csw/mgar/pkg/libssh2/trunk/Makefile
    csw/mgar/pkg/libstatgrab/trunk/Makefile
    csw/mgar/pkg/libstlport/trunk/Makefile
    csw/mgar/pkg/libtasn1/trunk/Makefile
    csw/mgar/pkg/libthai/trunk/Makefile
    csw/mgar/pkg/libtheora/trunk/Makefile
    csw/mgar/pkg/libtorrent/trunk/Makefile
    csw/mgar/pkg/libunique/trunk/Makefile
    csw/mgar/pkg/libunistring/trunk/Makefile
    csw/mgar/pkg/liburiparser/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libwebp/trunk/Makefile
    csw/mgar/pkg/libwnck/trunk/Makefile
    csw/mgar/pkg/libxdg-basedir/trunk/Makefile
    csw/mgar/pkg/libxml++/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/libxspf/trunk/Makefile
    csw/mgar/pkg/libyaml/trunk/Makefile
    csw/mgar/pkg/loudmouth/trunk/Makefile
    csw/mgar/pkg/lpc10/trunk/Makefile
    csw/mgar/pkg/lzlib/trunk/Makefile
    csw/mgar/pkg/lzo/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mcrypt/trunk/Makefile
    csw/mgar/pkg/memcached/trunk/Makefile
    csw/mgar/pkg/mibdump/trunk/Makefile
    csw/mgar/pkg/mod_nss/trunk/Makefile
    csw/mgar/pkg/mozldap/trunk/Makefile
    csw/mgar/pkg/mpc/trunk/Makefile
    csw/mgar/pkg/mpeg4ip/trunk/Makefile
    csw/mgar/pkg/mpg123/trunk/Makefile
    csw/mgar/pkg/netcdf/trunk/Makefile
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/nettle/trunk/Makefile
    csw/mgar/pkg/nspr/trunk/Makefile
    csw/mgar/pkg/oniguruma/trunk/Makefile
    csw/mgar/pkg/opendbx/trunk/Makefile
    csw/mgar/pkg/openexr/trunk/Makefile
    csw/mgar/pkg/openjpeg/trunk/Makefile
    csw/mgar/pkg/openldap23/trunk/Makefile
    csw/mgar/pkg/oracle-instantclient/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/p11-kit/trunk/Makefile
    csw/mgar/pkg/p4/trunk/Makefile
    csw/mgar/pkg/pakchois/trunk/Makefile
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango-libthai/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/perl/trunk/Makefile
    csw/mgar/pkg/pixman/trunk/Makefile
    csw/mgar/pkg/plib/trunk/Makefile
    csw/mgar/pkg/pngwriter/trunk/Makefile
    csw/mgar/pkg/poppler/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/ppl/trunk/Makefile
    csw/mgar/pkg/proj/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/pth/trunk/Makefile
    csw/mgar/pkg/pulseaudio/trunk/Makefile
    csw/mgar/pkg/qhull/trunk/Makefile
    csw/mgar/pkg/readline/trunk/Makefile
    csw/mgar/pkg/readline43/trunk/Makefile
    csw/mgar/pkg/readline52/trunk/Makefile
    csw/mgar/pkg/rrdtool/trunk/Makefile
    csw/mgar/pkg/rtmpdump/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/scintilla/trunk/Makefile
    csw/mgar/pkg/sharutils/trunk/Makefile
    csw/mgar/pkg/slang/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/speex/trunk/Makefile
    csw/mgar/pkg/startup-notification/trunk/Makefile
    csw/mgar/pkg/svrcore/trunk/Makefile
    csw/mgar/pkg/taglib/trunk/Makefile
    csw/mgar/pkg/talloc/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tre/trunk/Makefile
    csw/mgar/pkg/twolame/trunk/Makefile
    csw/mgar/pkg/umfpack/trunk/Makefile
    csw/mgar/pkg/unixodbc/trunk/Makefile
    csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile
    csw/mgar/pkg/urt/trunk/Makefile
    csw/mgar/pkg/varnish/trunk/Makefile
    csw/mgar/pkg/wavpack/trunk/Makefile
    csw/mgar/pkg/which/trunk/Makefile
    csw/mgar/pkg/wmf/trunk/Makefile
    csw/mgar/pkg/x11/liblbxutil/trunk/Makefile
    csw/mgar/pkg/x11/liboldx/trunk/Makefile
    csw/mgar/pkg/x11/libwindowswm/trunk/Makefile
    csw/mgar/pkg/x11/libxevie/trunk/Makefile
    csw/mgar/pkg/x11/libxkbui/trunk/Makefile
    csw/mgar/pkg/x11/libxp/trunk/Makefile
    csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile
    csw/mgar/pkg/x11/libxprintutil/trunk/Makefile
    csw/mgar/pkg/x11/libxtrap/trunk/Makefile
    csw/mgar/pkg/xerces-c/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4menu/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
    csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile
    csw/mgar/pkg/xfce/xfconf/trunk/Makefile
    csw/mgar/pkg/xmlrpc_c/trunk/Makefile
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/yaz/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/Makefile

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-01-23 14:12:28 UTC (rev 16894)
@@ -503,7 +503,7 @@
 # Just keeps the first appearance of each word
 remove-duplicates = $(if $1,$(firstword $1) $(call remove-duplicates,$(filter-out $(firstword $1),$1)))
 
-REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)))
+REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(or $(BUILD64),$(BUILD64_LIBS_ONLY)),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)))
 NEEDED_ISAS ?= $(strip $(filter     $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \
                        $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))))
 BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS))

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/gar/v2/gar.mk	2012-01-23 14:12:28 UTC (rev 16894)
@@ -767,7 +767,7 @@
 else
 ISAEXEC_DIRS ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))
-MERGE_DIRS_isa-extra ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA))
+MERGE_DIRS_isa-extra ?= $(if $(or $(BUILD64),$(ISAEXEC)),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA))
 MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED))
 

Modified: csw/mgar/pkg/GeoIP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/adns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/adns/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/adns/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 SPKG_DESC_CSWlibadns1 = Advanced, easy to use, asynchronous-capable DNS client library, libadns.so.1
 PKGFILES_CSWlibadns1 += $(call pkgfiles_lib,libadns.so.1)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_OVERRIDE_VARS = MKSHLIB_1 MKSHLIB_3
 BUILD_OVERRIDE_VAR_MKSHLIB_1 = $(CC) $(LDFLAGS) -G -h $$(SHLIBSONAME) -o

Modified: csw/mgar/pkg/apr-iconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -78,7 +78,7 @@
 # EXTRA_INC += $(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
 # EXTRA_LIB += $(prefix)/instantclient_10_2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/argtable/trunk/Makefile
===================================================================
--- csw/mgar/pkg/argtable/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/argtable/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 
 EXTRA_LDFLAGS = -lintl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,11 +37,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibaudiofile-dev = CSWlibaudiofile0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra += copy-config-only
-MERGE_SCRIPTS_isa-extra += copy-relocated-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/autotrace/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -53,7 +53,7 @@
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 # Not until we have a 64-bit imagemagick
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-magick

Modified: csw/mgar/pkg/babl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/babl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/babl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Replace manually until this is fixed:
 #   https://bugzilla.gnome.org/show_bug.cgi?id=664800

Modified: csw/mgar/pkg/bdb3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -90,9 +90,6 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
 
-# We need the binaries
-EXTRA_MERGE_DIRS_isa-extra = $(bindir)
-
 include gar/category.mk
 
 LIBS += -lnsl

Modified: csw/mgar/pkg/boost/trunk/Makefile
===================================================================
--- csw/mgar/pkg/boost/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/boost/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -80,7 +80,7 @@
 JAMDIR_i386 = solarisx86
 JAMDIR = $(JAMDIR_$(GARCH))
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 # These can't be just passed from Make's PARALLELMFLAGS because of the -l flag.
 BJAM_PARALLELMFLAGS_current9s = -j 32

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,7 +37,7 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CFLAGS += -KPIC
 EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64

Modified: csw/mgar/pkg/c-ares/trunk/Makefile
===================================================================
--- csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibcaresdevel = CSWlibcares
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-32.h,p"

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -106,7 +106,7 @@
 # the server and client component
 PRESERVECONF = $(sysconfdir)/$(NAME)rc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_DEP_PKGS = CSWbdb48devel
 BUILD_DEP_PKGS += CSWlibpcre-dev

Modified: csw/mgar/pkg/cfitsio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 
 LICENSE = License.txt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD_ARGS = all testprog

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,12 +22,10 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-examples
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 DOCS  = NEWS README
 DOCS += ChmLib-ds6.zip ChmLib-ce.zip
 

Modified: csw/mgar/pkg/chrpath/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 # new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/cloog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cloog/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cloog/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -12,7 +12,7 @@
 MASTER_SITES = http://www.bastoul.net/cloog/pages/download/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 GARCOMPILER = GNU
 
 LICENSE = $(FILEDIR)/COPYING

Modified: csw/mgar/pkg/cpptest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpptest/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cpptest/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 OBSOLETED_BY_CSWlibcpptest-dev += CSWlibcpptestdevel
 CATALOGNAME_CSWlibcpptestdevel = libcpptest_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CXXFLAGS = -norunpath
 

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cups/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -302,7 +302,7 @@
 # For some reason -norunpath is not used here, investigate later
 CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LINKER_FLAGS += -liconv
 EXTRA_LINKER_FLAGS += -norunpath

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -104,7 +104,7 @@
 # Needed for sockaddr_in6
 EXTRA_CFLAGS += -D__EXTENSIONS__
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/dbus-glib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -55,7 +55,7 @@
 CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GObject-related-functions.html
 CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/eet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/eet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/eet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 
 CPPFLAGS = abc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/eina/trunk/Makefile
===================================================================
--- csw/mgar/pkg/eina/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/eina/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 EXTRA_CPPFLAGS = -D__FUNCTION__=
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/enchant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,7 +68,7 @@
 
 #NOISALIST = 1
 # libdbus not 64-bit yet
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/esound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -52,11 +52,7 @@
 PRESERVECONF = $(sysconfdir)/esd.conf
 MIGRATE_FILES_CSWesound = esd.conf
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra += copy-relocated-only
-MERGE_SCRIPTS_isa-extra += copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/evolution/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-ds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-exchange/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-mapi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-webcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/examples/64-bit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/64-bit/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/examples/64-bit/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 prefix = $(BUILD_PREFIX)/foo
 libdir = $(BUILD_PREFIX)/lib
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/examples/multiple-versions/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/examples/multiple-versions/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 TEST_SCRIPTS =
 WORKSRC = $(WORKDIR)/hello-$(VERSION)
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/exiv2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiv2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/exiv2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Sun Studio doesn't unerstand g++ features

Modified: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/expect/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -72,7 +72,7 @@
 
 TEST_TARGET = 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fbopenssl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fbopenssl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 # These are no header files in there, is this correct?
 RUNTIME_DEP_PKGS_CSWlibfbopenssl-dev += CSWlibfbopenssl0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS = 
 BUILD_SCRIPTS = custom

Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -190,7 +190,7 @@
 #EXTRA_MODULATORS = SHARED
 #MODULATIONS_SHARED = yes no
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 GARCOMPILER = GNU
 

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/file/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,7 +68,7 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 PYCOMPILE = 1
 

Modified: csw/mgar/pkg/fltk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 DEP_PKGS = CSWzlib CSWjpeg CSWpng
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --disable-localpng
@@ -31,9 +31,6 @@
 
 EXTRA_BUILD_EXPORTS = libdir
 
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk.so.1.1
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk_forms.so.1.1
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk_images.so.1.1

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 PACKAGES = CSWfconfig
 CATALOGNAME = fontconfig
 

Modified: csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 ARCHALL_CSWlibxcbdoc = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 CATALOGNAME = xcbutil
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,7 +44,7 @@
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 CPPFLAGS =
 EXTRA_CFLAGS = -I/opt/csw/include -DSUN_OGL_NO_VERTEX_MACROS
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # No 64 bit libs on Solaris 9 x86

Modified: csw/mgar/pkg/freetds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetds/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freetds/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -60,7 +60,7 @@
 # Make sure library is self-sufficient
 EXTRA_LINKER_FLAGS = -liconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Testsuite needs a running Sybase/SQLServer database
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/freetype/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetype/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freetype/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,6 +40,6 @@
 GNUMAKE = gmake
 EXTRA_CONFIGURE_EXPORTS = GNUMAKE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/fribidi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fribidi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fribidi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 SPKG_SOURCEURL = http://www.fribidi.org/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 NOISALIST = 1
 # Unless the Solaris 10 compilation problem with both SUNW mesa and CSW mesa
 # installed exists disable 64 bit for now.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)

Modified: csw/mgar/pkg/gamin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gamin/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gamin/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,8 +68,7 @@
 # Overwrite existing -L/opt/csw/lib or installed libs will be picked up first
 LINKER_FLAGS = -lsocket -lnsl
 
-BUILD64 = 1
-MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir)
+BUILD64_LIBS_ONLY = 1
 
 # This is not passed to configure, although it is defined (but wrong) in configure.in
 EXTRA_CONFIGURE_EXPORTS += ENV_CFLAGS

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -79,7 +79,7 @@
 
 # Uncomment this if we want to build both 32 bit and 64 bit binaries
 # By default, only 32 bit binaries are built
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_DEP_PKGS = CSWlibapr1-0 CSWganglia-dev
 

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gd/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -60,7 +60,7 @@
 # This is evaluated twice, quote properly
 EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\"
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -75,8 +75,6 @@
 # GD does not have a testsuite
 TEST_SCRIPTS =
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 # This is ok as there are a number of search pathes for fonts in there.
 # We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list.
 CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h

Modified: csw/mgar/pkg/gdbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdbm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdbm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 # This is catchall
 RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # gdbm package has no test suite
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -89,9 +89,6 @@
 
 BUILD64 = 1
 
-# We need the binaries to query 64 bit modules
-MERGE_DIRS_isa-extra = $(bindir) $(libdir)
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv-prefix
 CONFIGURE_ARGS += --with-libintl-prefix

Modified: csw/mgar/pkg/gdome2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdome2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdome2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 
 SPKG_SOURCEURL = http://gdome2.cs.unibo.it/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/gengetopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gengetopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gengetopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 SPKG_SOURCEURL = http://www.gnu.org/software/gengetopt/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS) 
 

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -212,7 +212,7 @@
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 EXTRA_LINKER_FLAGS = -xnorunpath
 

Modified: csw/mgar/pkg/giflib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/giflib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/giflib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,7 +44,7 @@
 RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibgif4
 RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibungif4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --x-includes=/usr/openwin/include

Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 
 #Disable build64 until fix linking:
 #ld: fatal: file main.o: wrong ELF class: ELFCLASS64
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 BUILD_ARGS    = INSTALLROOT=$(prefix)
 BUILD_ARGS   += LOCALEDIR=$(sharedstatedir)/locale

Modified: csw/mgar/pkg/glew/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glew/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glew/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 OBSOLETED_BY_CSWlibglew-dev = CSWglew
 
 NOISALIST = 1
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 LDOPT-64 = -64
 EXTRA_CFLAGS-sparc = -xcode=pic32

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -160,7 +160,7 @@
 
 EXTRA_LDFLAGS = -lsocket
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu

Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 MAKE = gmake

Modified: csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 
 #SPKG_SOURCEURL = http://projects.gnome.org/gconf/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib

Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -57,7 +57,7 @@
 # man-page only, override for now
 CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 REINPLACE_FILES_xdg = libgnomevfs/xdgmime.c
 
 NOISALIST = 1
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,7 +37,7 @@
 CHECKPKG_OVERRIDES_CSWlibbonobo2 += shared-lib-package-contains-so-symlink
 CHECKPKG_OVERRIDES_CSWlibbonobo2 += non-uniform-lib-versions-in-package
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS += CPP

Modified: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,6 +40,5 @@
 BUILD64 = 1
 
 EXTRA_MERGE_INCLUDE_FILES  = $(libdir)/libname-server-2.a
-EXTRA_MERGE_DIRS_isa-extra = $(bindir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/gnulib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnulib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnulib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 WORKSRC = $(WORKDIR)/posixlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 INSTALL_SCRIPTS = custom
 

Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -78,7 +78,7 @@
 
 # Unfortunately GNU PTH does not handle 64 bit sanely:
 #   "/opt/csw/include/pth.h", line 93: #error: "FD_SETSIZE is larger than what GNU Pth can handle."
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libcurl=$(prefix)

Modified: csw/mgar/pkg/gnupg_minimal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 RUNTIME_DEP_PKGS_CSWgnupgminimal = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv
 RUNTIME_DEP_PKGS_CSWgnupgminimal += CSWoldaprt CSWreadline CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --program-suffix=-minimal

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -66,7 +66,7 @@
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # We put all libs in one package as they are .so.26 and are all bumped together

Modified: csw/mgar/pkg/googletest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,6 +21,6 @@
 UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz
 EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd
 # EXTRA_LDFLAGS = -lCrun -lm
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 include gar/category.mk

Modified: csw/mgar/pkg/gpgme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 
 RUNTIME_DEP_PKGS = CSWgpgerr CSWpth
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/gsasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsasl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gsasl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 # Disable 64 bit until krb5 is available in 64 bit
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 

Modified: csw/mgar/pkg/gsm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gsm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 #       BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 #       EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS =
 

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -284,9 +284,6 @@
 sysconfdir-suffix-64 = /64
 sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
 
-# We need the binaries to query 64 bit modules
-MERGE_DIRS_isa-extra = $(bindir) $(libdir)
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shm
 CONFIGURE_ARGS += --enable-xkb

Modified: csw/mgar/pkg/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gts/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -33,6 +33,6 @@
 
 PATCHFILES = gts-fabsf.diff
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/guile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 GARCOMPILER = GNU
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS  = $(DIRPATHS) 
 CONFIGURE_ARGS += --enable-error-on-warning=no
 

Modified: csw/mgar/pkg/host-sflow/trunk/Makefile
===================================================================
--- csw/mgar/pkg/host-sflow/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/host-sflow/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/hwloc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hwloc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/hwloc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,7 +41,7 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 #CONFIGURE_ARGS += --disable-visibility
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 GARFLAVOR = DBG
 

Modified: csw/mgar/pkg/id3lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/id3lib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/id3lib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -46,6 +46,6 @@
 SUBDIR64-i386 = amd64
 EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/idzebra/trunk/Makefile
===================================================================
--- csw/mgar/pkg/idzebra/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/idzebra/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 VENDOR_URL = http://www.indexdata.com/zebra
 
 # Just wait a _little_ longer until yaz is ready in 64 bit, which itself needs libicu in 64 bit
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/ilmbase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ilmbase/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,6 +68,6 @@
 REINPLACE_WITH = |-norunpath$$1
 REINPLACE_FILES += ltmain.sh
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/ilmbase2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ilmbase2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -67,7 +67,7 @@
 EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC
 EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION))
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit
 # lib is installed test has to be disabled

Modified: csw/mgar/pkg/imlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 STRIP_LIBTOOL = 1
 
 # Make glib and gtk 64 bit first
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 sysconfdir = /etc/opt/csw
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,12 +20,9 @@
 RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag
 RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bmp.so
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tiff.so
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bz2.so

Modified: csw/mgar/pkg/imlib2_loaders/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))

Modified: csw/mgar/pkg/jack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jack/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/jack/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/waf
 CONFIGURE_ARGS = configure --prefix=$(prefix)

Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -73,7 +73,7 @@
 CONFIGURE_ARGS += --disable-static --disable-profiled
 CONFIGURE_ARGS += --with-ldap
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -126,7 +126,7 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # We turn off almost everything as we are just interested in the library.
 NODIRPATHS = --docdir

Modified: csw/mgar/pkg/lame/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lame/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lame/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 SPKG_DESC_CSWlibmp3lame0 = Library for LAME, libmp3lame.so.0
 PKGFILES_CSWlibmp3lame0 = $(call pkgfiles_lib,libmp3lame.so.0)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro
 
 # Disable intrinsics until this has been resolved:

Modified: csw/mgar/pkg/lensfun/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lensfun/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lensfun/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 LD=$(CC)
 EXTRA_COMMON_EXPORTS = LD
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 # This is not autoconf, but some hand-hacked Python thingie.
 CONFIGURE_ARGS  = --prefix=$(prefix)
 CONFIGURE_ARGS += --bindir=$(bindir)

Modified: csw/mgar/pkg/liba52/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 EXTRA_LINKER_FLAGS = -lsunmath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 
@@ -38,8 +38,6 @@
 # especially activating 64 bit.
 BUILD_ARGS = CFLAGS="$(CFLAGS)"
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWa52dec = $(bindir)/.*
 PKGFILES_CSWa52dec += $(mandir)/man1/.*
 

Modified: csw/mgar/pkg/libao/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libao/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libao/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,7 +41,7 @@
 
 PRESERVECONF = $(LIBAO_CONF)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libao2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libao2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libao2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,6 +28,6 @@
 
 # The file libao.conf is delivered with the newer libao4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -47,7 +47,7 @@
 
 EXTRA_INC = $(includedir)/cryptopp
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # There is currently one test failing. Skip until this is fixed:
 #   http://code.google.com/p/libarchive/issues/detail?id=171

Modified: csw/mgar/pkg/libart/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static

Modified: csw/mgar/pkg/libassuan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libassuan/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libassuan/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibassuan-dev += CSWlibassuan0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Disable tests until this is fixed:
 #   https://bugs.g10code.com/gnupg/msg4081

Modified: csw/mgar/pkg/libast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,9 +21,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/libatk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libatk/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libatk/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 OBSOLETED_BY_CSWlibatk-dev = CSWlibatkdevel
 CATALOGNAME_CSWlibatkdevel = libatk_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-debug=yes

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -75,7 +75,7 @@
 # We do NOT want -L/opt/csw/lib in there as the pathes are detected properly and this disturbs libtool later on
 LINKER_FLAGS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --disable-full-testing

Modified: csw/mgar/pkg/libcddb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibcddbutil = CSWlibcddb CSWlibcdio
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 http_proxy='$(http_proxy)'

Modified: csw/mgar/pkg/libcdio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,11 +19,9 @@
 
 RUNTIME_DEP_PKGS = CSWgcc4corert CSWgcc4g++rt CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 # There is a minor test regarding timezones failing.
 # Disable tests for now until this is fixed:
 #   https://savannah.gnu.org/support/index.php?107175

Modified: csw/mgar/pkg/libconfuse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libconfuse/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libconfuse/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibconfuse-dev += CSWlibconfuse0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-nls

Modified: csw/mgar/pkg/libcroco/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 
 RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 CSWlibxml2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libdatrie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdatrie/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibdatrie1
 RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-html-docdir=$(docdir)/libdatrie-dev/html

Modified: csw/mgar/pkg/libdbi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 REINPLACE_USRLOCAL += doc/programmers-guide/x276.html
 REINPLACE_USRLOCAL += doc/programmers-guide/quickstart-code.html
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(docdir)/libdbi
 

Modified: csw/mgar/pkg/libdbi-drivers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi-drivers/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdbi-drivers/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -13,7 +13,7 @@
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libdnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdnet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdnet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,14 +14,12 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PATCHFILES  = 0001-Using-the-m4-subdirectory-for-macros.patch
 PATCHFILES += 0002-Moved-acinclude.m4-to-the-m4-directory.patch
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PACKAGES = CSWlibdnet1
 CATALOGNAME_CSWlibdnet1 = libdnet1
 PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1\.0\.1)

Modified: csw/mgar/pkg/libebml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libebml/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libebml/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 LICENSE = LICENSE.LGPL
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_SCRIPTS = 

Modified: csw/mgar/pkg/libeggdbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 PKGFILES_CSWlibeggdbusdevel = $(PKGFILES_DEVEL)
 
 # libdbus isn't 64-bit yet
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 # *We* can do 64 bit, but the tests dump core in CSWglib2 2.23.5,REV=2010.03.09
 # Re-enable when glib2 gets refreshed.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibemf1 = $(PKGFILES_RT)

Modified: csw/mgar/pkg/libev/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 CONFIGURE_ARGS  = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 LICENSE = LICENSE
 CHECKPKG_OVERRIDES_CSWlibev += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libev.so.3.0.0
 include gar/category.mk

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 TEST_TARGET = verify
 

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -64,7 +64,7 @@
 CPPFLAGS =
 EXTRA_CFLAGS += $(INCLUDE_FLAGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 TEST_TARGET = verify
 

Modified: csw/mgar/pkg/libexif/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexif/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexif/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibexif-dev += CSWlibexif12
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-docs

Modified: csw/mgar/pkg/libexpat0/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexpat0/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexpat0/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 SPKG_DESC_CSWlibexpat0 = XML parser toolkit, libexpat.so.0
 PKGFILES_CSWlibexpat0 += $(call pkgfiles_lib,libexpat.so.0)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir
 

Modified: csw/mgar/pkg/libexplain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexplain/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexplain/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain30
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libfaac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,9 +28,7 @@
 PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff
 PATCHFILES += mpeg4ip.h.diff psych.h.diff
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/libfaad2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfaad2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -46,7 +46,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-drm

Modified: csw/mgar/pkg/libffi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libffi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libffi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -49,7 +49,7 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libfishsound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 OPT_FLAGS_SOS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD_ARGS = AM_CFLAGS= SHLIB_VERSION_ARG= libfishsound_la_LDFLAGS=

Modified: csw/mgar/pkg/libflac8/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libflac8/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libflac8/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -83,7 +83,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 # For sqrt, atan2, pow
 EXTRA_LINKER_FLAGS += -lm
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libgadu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgadu/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgadu/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,6 +44,6 @@
 # There are zero-sized structs
 EXTRA_CFLAGS += -features=extensions
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,6 +44,6 @@
 #   FAIL: gctest
 # The bugreport has been posted on
 #   http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2012-January/004904.html
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 OBSOLETED_BY_CSWlibgcrypt-utils = CSWgcrypt
 CATALOGNAME_CSWgcrypt = libgcrypt_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-asm

Modified: csw/mgar/pkg/libgdbm3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgdbm3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgdbm3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 # This is catchall
 RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm3
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # gdbm package has no test suite

Modified: csw/mgar/pkg/libglade2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 SUNX11SUB_amd64 = amd64/
 EXTRA_LDFLAGS = -lm /usr/openwin/lib/$(SUNX11SUB_$(ISA))libXext.so
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgmp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 
 SPKG_SOURCEURL = http://gmplib.org/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Disabling sparcv8plus with GCC
 # /var/tmp//ccPKyHnL.s: Assembler messages:

Modified: csw/mgar/pkg/libgmp3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 SPKG_SOURCEURL = http://gmplib.org/
 
 GARCOMPILER = GCC4
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis 
 EXTRA_BUILD_ISAS_i386  = pentium

Modified: csw/mgar/pkg/libgnugetopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgnugetopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgnugetopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 
 EXTRA_CFLAGS += -Xc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgpg_error/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,6 +38,6 @@
 
 RUNTIME_DEP_PKGS = CSWggettextrt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgsf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgsf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgsf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -77,7 +77,7 @@
 
 # Missing 64-bit libs:
 # libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/libgss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgss/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgss/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 RUNTIME_DEP_PKGS_CSWgss += CSWlibgss3
 RUNTIME_DEP_PKGS_CSWgss += CSWlibintl8
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libical/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibicaldevel = CSWlibical
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibicaldevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -69,7 +69,7 @@
 #
 # OBSOLETED_BY_CSWlibiconv-utils += CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # 'gmake test' shows three errors of coredumping printf's
 #

Modified: csw/mgar/pkg/libicu46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu46/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libicu46/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -69,7 +69,7 @@
 
 EXTRA_CXXFLAGS = -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libicu48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu48/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libicu48/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -90,7 +90,7 @@
 # packages using the libs will bail out as they assume the libs are self-contained.
 LINKER_FLAGS = -lCrun -lCstd -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libid3tag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 RUNTIME_DEP_PKGS = CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/libidl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libidl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libidl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 # pkgfiles is catchall
 RUNTIME_DEP_PKGS_CSWlibidl-dev += CSWlibidl2-0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS += CPP

Modified: csw/mgar/pkg/libidn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libidn/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libidn/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -50,7 +50,7 @@
 INSTALL_OVERRIDE_VARS = SHELL
 INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # We don't need it and if defined the test breaks
 LD_OPTIONS =

Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 # Python isn't 64-bit yet

Modified: csw/mgar/pkg/libjpeg62/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libjpeg62/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libjpeg62/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 SPKG_DESC_CSWlibjpeg62 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.62
 PKGFILES_CSWlibjpeg62 = $(call pkgfiles_lib,libjpeg.so.62)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Ok, here comes a good one: a dynamic library is only generated when warnings are suppressed.
 # This is because in ltconfig the test to look if -KPIC actually works detects if there are

Modified: csw/mgar/pkg/libkate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -57,15 +57,13 @@
 RUNTIME_DEP_PKGS_CSWpy-libkate += CSWpython
 PYCOMPILE = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Disable testsuite until this is fixed:
 #   http://code.google.com/p/libkate/issues/detail?id=20
 SKIPTEST ?= 1
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk
 
 post-configure-modulated:

Modified: csw/mgar/pkg/libksba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libksba/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libksba/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibksba-dev += CSWlibksba8
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -48,7 +48,7 @@
 # That is ok
 CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CXX_FLAGS = -lCstd -norunpath
 

Modified: csw/mgar/pkg/liblqr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblqr/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liblqr/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 OBSOLETED_BY_CSWliblqr-dev += CSWliblqrdevel
 CATALOGNAME_CSWliblqrdevel = liblqr_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libmad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmad/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmad/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibmad-dev = CSWlibmad0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libmatio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmatio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared

Modified: csw/mgar/pkg/libmatroska/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -49,7 +49,7 @@
 RUNTIME_DEP_PKGS = CSWlibebml3
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_SCRIPTS = 

Modified: csw/mgar/pkg/libmcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += $(DRIVERNAME)-$(DRIVERVERSION).tar.gz

Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 EXTRA_BUILD_ISAS_i386 = pentium_pro

Modified: csw/mgar/pkg/libmhash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 EXTRA_CPPFLAGS = -D__const=const
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 # sparcv9 compile fails with optimization beyond -xO1 at HAVAL256: FAIL: frag_test

Modified: csw/mgar/pkg/libmikmod/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmikmod/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmikmod/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,10 +32,10 @@
 # This stupid configure script adds '-fast' overwriting -xarch ande especially activating 64 bit.
 BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS=
 
-BUILD64_platform-solaris8-sparc = 1
-BUILD64_platform-solaris10-sparc = 1
-BUILD64_platform-solaris10-i386 = 1
-BUILD64 = $(BUILD64_platform-$(PLATFORM))
+BUILD64_LIBS_ONLY_platform-solaris8-sparc = 1
+BUILD64_LIBS_ONLY_platform-solaris10-sparc = 1
+BUILD64_LIBS_ONLY_platform-solaris10-i386 = 1
+BUILD64_LIBS_ONLY = $(BUILD64_platform-$(PLATFORM))
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
@@ -46,8 +46,6 @@
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL))
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWmpeg2dec = $(bindir)/.*
 PKGFILES_CSWmpeg2dec += $(mandir)/man1/.*
 

Modified: csw/mgar/pkg/libmpfr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpfr/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmpfr/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 BUILD_DEP_PKGS = CSWlibgmp-dev
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/libnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libnet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 
 SPKG_SOURCEURL = http://www.packetfactory.net/libnet/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 DISTNAME = Libnet-$(VERSION)
 

Modified: csw/mgar/pkg/libnotify/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 EXTRA_INC = $(libdir_install)/dbus-1.0/include
 
 # Enable when CSWdbusglib is done in 64 bit
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibnotifydevel  = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libntlm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libntlm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libntlm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,6 +29,6 @@
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libogg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libogg/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libogg/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,6 +24,6 @@
 
 VENDOR_URL = http://www.vorbis.com/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liboggz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liboggz/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liboggz/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 OBSOLETED_BY_CSWoggz = CSWliboggz
 CATALOGNAME_CSWliboggz = liboggz_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # This is just docs
 CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/html/group__install.html

Modified: csw/mgar/pkg/liboil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liboil/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liboil/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,6 +31,6 @@
 OBSOLETED_BY_CSWliboil-dev += CSWliboildevel
 CATALOGNAME_CSWliboildevel = liboil_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liborc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 VENDOR_URL = http://code.entropywave.com/projects/orc/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libpaper/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 
 EXTRA_CFLAGS = -Xc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libpng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpng/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpng/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,6 +41,6 @@
 # The CSWpng package must also pull in libpng.so.3 and libpng12.so.0
 OBSOLETED_BY_CSWlibpng15-15 = CSWpng
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libpopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 PKGFILES_CSWlibpopt-dev += $(PKGFILES_DEVEL)
 OBSOLETES_CSWlibpopt-dev += CSWlibpopt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NORUNPATH = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -104,11 +104,8 @@
 
 EXTRA_LINKER_FLAGS = -lnsl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
-# Skip 64 bit binaries - they are just big and gain nothing
-MERGE_DIRS_isa-extra = $(libdir)
-
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib

Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsamplerate/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsamplerate/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -45,7 +45,7 @@
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
 

Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 RUNTIME_DEP_PKGS_CSWlibschro = CSWliboil
 RUNTIME_DEP_PKGS_CSWlibschrodevel = CSWlibschro
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibschrodevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libsdl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsdl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsdl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 OBSOLETED_BY_CSWlibsdl-dev += CSWlibsdldevel
 CATALOGNAME_CSWlibsdldevel = libsdl_devel
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
 TEST_TARGET = test

Modified: csw/mgar/pkg/libsexy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 VENDOR_URL = http://www.chipx86.com/blog/tag/libsexy/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibsexydevel  = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libshout/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libshout/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libshout/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibshout-dev = CSWlibshout3
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 #         GAR default: -xO3 -xarch=v8 -I/opt/csw/include
 # Configure hardwired: -xO4 -fast -w -fsimple -native -xcg92

Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigcpp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel
 CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 EXTRA_CXXFLAGS += -norunpath
 EXTRA_CONFIGURE_ENV = MAKE=gmake
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static

Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigsegv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigsegv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 
 VENDOR_URL = http://www.gnu.org/software/libsigsegv/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/libsigsegv0/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigsegv0/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigsegv0/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 VENDOR_URL = http://www.gnu.org/software/libsigsegv/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/libsmi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsmi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsmi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 OBSOLETED_BY_CSWlibsmi-mibs = CSWlibsmimibs
 CATALOGNAME_CSWlibsmimibs = libsmi_mibs_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs
 EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs

Modified: csw/mgar/pkg/libsndfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsndfile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -72,7 +72,7 @@
 PKGFILES_CSWlibsndfile-dev += $(docdir)/.*
 RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Relocate docs to standard location
 EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),'

Modified: csw/mgar/pkg/libsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsoup/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsoup/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 STRIP_LIBTOOL = 1
 
 # Not working until gconf2 is 64-bit
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 # One test fails for some unknown reason
 #TEST_TARGET = check

Modified: csw/mgar/pkg/libspectre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libspectre/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libspectre/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 RUNTIME_DEP_PKGS_CSWlibspectre-dev = CSWlibspectre1
 
 # Disable for now as libgs is missing 64 bit
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libspf2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libspf2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libspf2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibspf2-dev = CSWlibspf2-2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LINKER_FLAGS = -lresolv  -lsocket  -lnsl 
 

Modified: csw/mgar/pkg/libssh2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libssh2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libssh2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 OBSOLETED_BY_CSWlibssh2-dev += CSWlibssh2devel
 CATALOGNAME_CSWlibssh2devel = libssh2_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libz

Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 # Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient
 LINKER_FLAGS = -lkstat -ldevinfo -lsocket -lnsl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NORUNPATH = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-curses-prefix=/usr

Modified: csw/mgar/pkg/libstlport/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libstlport/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libstlport/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libtasn1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtasn1/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtasn1/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 # we don't really need it anyway, so disable for now.
 NOISALIST = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libthai/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 RUNTIME_DEP_PKGS_CSWlibthaidevel = CSWlibthai
 PREREQUISUITE_PKGS = $(RUNTIME_DEP_PKGS_CSWlibthai)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libtheora/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtheora/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtheora/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoradec1
 RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoraenc1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-examples

Modified: csw/mgar/pkg/libtorrent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 RUNTIME_DEP_PKGS_CSWlibtorrent      = CSWosslrt CSWlibsigc++
 RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug
 
 PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libunique/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunique/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libunique/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibcairo-dev
 RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWpangodevel
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 EXTRA_LINKER_FLAGS = -lsocket -lnsl

Modified: csw/mgar/pkg/libunistring/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunistring/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libunistring/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libunistring/libunistring_15.html
 CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/libunistring.info
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset\.alias
 

Modified: csw/mgar/pkg/liburiparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liburiparser/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liburiparser/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 RUNTIME_DEP_PKGS_CSWliburiparserdevel = CSWliburiparser1
 CHECKPKG_OVERRIDES_CSWliburiparserdevel += surplus-dependency|CSWliburiparser1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_SCRIPTS  = $(WORKSRC)/configure
 CONFIGURE_SCRIPTS += $(WORKSRC)/doc/configure
 

Modified: csw/mgar/pkg/libvorbis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -52,7 +52,7 @@
 
 VENDOR_URL = http://www.vorbis.com/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm
 

Modified: csw/mgar/pkg/libwebp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libwebp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libwebp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 RUNTIME_DEP_PKGS_CSWwebp += CSWpng
 RUNTIME_DEP_PKGS_CSWwebp += CSWjpeg
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # On amd64 -xO3 results in an assembler error
 OPT_FLAGS_SOS-amd64 = -xO2

Modified: csw/mgar/pkg/libwnck/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libwnck/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libwnck/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 # For cos(3m)
 EXTRA_LINKER_FLAGS = -lm 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,6 +28,6 @@
 # localstatedir = /var$(prefix)
 #
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 PATCHFILES += opencsw-paths.patch
 include gar/category.mk

Modified: csw/mgar/pkg/libxml++/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml++/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxml++/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 EXTRA_CONFIGURE_EXPORTS = MAKE
 MAKE = gmake
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -75,7 +75,7 @@
 CONFIGURE_ARGS_64 = --without-python
 CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 PYCOMPILE = 1
 

Modified: csw/mgar/pkg/libxspf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,11 +28,9 @@
 RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWliburiparser1
 RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWlibxspf4 = $(PKGFILES_RT)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libyaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libyaml/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libyaml/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,6 +14,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 TEST_SCRIPTS =
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 WORKSRC = $(WORKDIR)/yaml-$(VERSION)
 include gar/category.mk

Modified: csw/mgar/pkg/loudmouth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/loudmouth/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/loudmouth/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 
 VENDOR_URL = http://groups.google.com/group/loudmouth-dev
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-glibtest
 

Modified: csw/mgar/pkg/lpc10/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lpc10/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lpc10/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 SPKG_SOURCEURL = http://www.arl.wustl.edu/~jaf/lpc/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Some way to go for the manual build
 

Modified: csw/mgar/pkg/lzlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lzlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 EXTRA_CXXFLAGS = -xcode=pic32
 EXTRA_LINKER_FLAGS = -lCrun -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared

Modified: csw/mgar/pkg/lzo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzo/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lzo/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 
 VENDOR_URL = http://www.oberhumer.com/opensource/lzo/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 RUNTIME_DEP_PKGS = CSWlibmhash
 
 # 64-bit build enables buffers >= 2GB (see README).
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Required for updated libmhash (mbuffer builds against it) which allows for
 # flexible const/non-const definitions.  There should be a more intelligent 

Modified: csw/mgar/pkg/mcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 # PATCHFILES  = 0001-Do-not-use-Wall-on-Sun-Compiler.patch
 
 # There's a problem with the 64-bit build.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memcached/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/memcached/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 # Make special version for Solaris 10 with enabled DTrace
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 # SASL is not 64 bit yet!
 #CONFIGURE_ARGS += --enable-sasl

Modified: csw/mgar/pkg/mibdump/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,9 +21,7 @@
 
 RUNTIME_DEP_PKGS = CSWlibsmi
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/mod_nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 DISTFILES += CSWap2modnss.postinstall
 DISTFILES += CSWap2modnss.preremove
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 GARCOMPILER = SOS12U2

Modified: csw/mgar/pkg/mozldap/trunk/Makefile

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list