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

ports/pkg/build.sh

Index: ports/pkg/build.sh
diff --git a/ports/pkg/build.sh b/ports/pkg/build.sh
index f531836a774620d7226610a897ae9f7bb2a525d5..a07e41a700840ccd1d4c353bb2b6c2c978c718b0 100644
--- a/ports/pkg/build.sh
+++ b/ports/pkg/build.sh
@@ -3,13 +3,12 @@
 # found in the LICENSE file.
 
 EXECUTABLES="src/pkg${NACL_EXEEXT}"
-export LIBS+="-lbsd ${NACL_CLI_MAIN_LIB} -pthread"
+NACLPORTS_LIBS+=" -lbsd -pthread"
 
 EXTRA_CONFIGURE_ARGS+=" --prefix=/usr --exec-prefix=/usr"
-NACLPORTS_CFLAGS+=" -Dmain=nacl_main"
 
 if [ "${NACL_SHARED}" = "1" ]; then
-  LIBS+=" -lresolv -ldl -lrt"
+  NACLPORTS_LIBS+=" -lresolv -ldl -lrt"
   EXECUTABLES+=" src/pkg-static${NACL_EXEEXT}"
   EXTRA_CONFIGURE_ARGS+=" --enable-shared=yes --with-staticonly=no"
   NACLPORTS_CPPFLAGS+=" -D_GNU_SOURCE"
@@ -17,6 +16,7 @@ else
   EXTRA_CONFIGURE_ARGS+=" --enable-shared=no --with-staticonly=yes"
 fi
 
+EnableCliMain
 EnableGlibcCompat
 
 ConfigureStep() {
@@ -48,7 +48,7 @@ BuildHost() {
 }
 
 BuildStep() {
-  (unset LIBS && BuildHost)
+  (BuildHost)
   DefaultBuildStep
   if [ "${NACL_SHARED}" = "0" ]; then
     LogExecute mv src/pkg-static${NACL_EXEEXT} src/pkg${NACL_EXEEXT}