Switch from using 'nacl_main' to 'main' entry point

ports/xorg-server/build.sh

 #!/bin/bash
 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1"
 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK"
 
 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT}
 
+EnableCliMain
 EnableGlibcCompat
 
 EXTRA_CONFIGURE_ARGS+=" --disable-glx"
 EXTRA_CONFIGURE_ARGS+=" --enable-xfree86-utils=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-pciaccess=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-kdrive"
 EXTRA_CONFIGURE_ARGS+=" --enable-local-transport=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-unix-transport=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-static=yes"
 EXTRA_CONFIGURE_ARGS+=" --enable-shared=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-unit-tests=no"
 EXTRA_CONFIGURE_ARGS+=" --enable-ipv6=no"
 EXTRA_CONFIGURE_ARGS+=" --datarootdir=/share"
 EXTRA_CONFIGURE_ARGS+=" --with-fontrootdir=/share/fonts/X11"
 EXTRA_CONFIGURE_ARGS+=" --with-xkb-bin-directory="
 
 if [ "${NACL_LIBC}" = "newlib" ]; then
   EXTRA_CONFIGURE_ARGS+=" --enable-xvfb=no"
   EXTRA_CONFIGURE_ARGS+=" --enable-xorg=no"
 fi
 
 NACLPORTS_CPPFLAGS+=" -Dmain=SDL_main"
-export LIBS="\
-${NACL_CLI_MAIN_LIB} \
--Wl,--undefined=SDL_main \
--Wl,--undefined=nacl_main \
--Wl,--undefined=nacl_startup_untar \
--lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm \
--l${NACL_CXX_LIB}"
+NACLPORTS_LDFLAGS+=" -Wl,--undefined=nacl_startup_untar"
+NACLPORTS_LDFLAGS+=" -Wl,--undefined=SDL_main"
+NACLPORTS_LIBS+=" -lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm"
 
 PatchStep() {
   DefaultPatchStep
   MakeDir ${SRC_DIR}/hw/kdrive/sdl
   LogExecute cp ${START_DIR}/sdl.c \
                 ${START_DIR}/Makefile.am \
                 ${SRC_DIR}/hw/kdrive/sdl/
 }
 
 ConfigureStep() {
@@ skipping 51 matching lines @@
   LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb
   LogExecute shasum ${ASSEMBLY_DIR}/xorg-xkb.tar > \
       ${ASSEMBLY_DIR}/xorg-xkb.tar.hash
   local XFONTS_DIR=${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN}
   LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar ${ASSEMBLY_DIR}/
   LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar.hash ${ASSEMBLY_DIR}/
 
   ChangeDir ${PUBLISH_DIR}
   LogExecute zip -r xorg-server.zip xorg-server
 }