behave like other systems except use of RPATH

diff --git CMakeLists.txt CMakeLists.txt
index 0a05ebb1..677d586b 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -135,7 +135,7 @@ endif(USE_PYTHON)
 
 set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
 
-if(APPLE AND NOT EMSCRIPTEN)
+if(FALSE)
   set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
   set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS)
   set(NG_INSTALL_DIR_CMAKE_DEFAULT Contents/Resources/CMake)
@@ -144,7 +144,7 @@ if(APPLE)
   set(NG_INSTALL_DIR_INCLUDE_DEFAULT Contents/Resources/include)
 
   set(NG_RPATH_TOKEN "@loader_path")
-else(APPLE AND NOT EMSCRIPTEN)
+else()
   set(NG_INSTALL_DIR_BIN_DEFAULT bin)
   set(NG_INSTALL_DIR_LIB_DEFAULT lib)
   if(WIN32)
@@ -157,7 +157,7 @@ else(APPLE)
   set(NG_INSTALL_DIR_INCLUDE_DEFAULT include)
 
   set(NG_RPATH_TOKEN "\$ORIGIN")
-endif(APPLE AND NOT EMSCRIPTEN)
+endif()
 
 set(NG_INSTALL_DIR_PYTHON ${NG_INSTALL_DIR_PYTHON_DEFAULT} CACHE STRING "Install directory for Python files")
 set(NG_INSTALL_DIR_BIN ${NG_INSTALL_DIR_BIN_DEFAULT} CACHE STRING "Install directory for executables")
@@ -263,13 +263,13 @@ if (USE_GUI)
     find_package(TCL 8.5 REQUIRED)
     find_package(TclStub 8.5 REQUIRED)
     find_package(Threads REQUIRED)
-    if(APPLE)
+    if(APPLE AND MACPORTS_NO_X11)
           set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit")
           target_link_libraries(netgen_gui INTERFACE "-framework AppKit")
-    else(APPLE)
+    else(APPLE AND MACPORTS_NO_X11)
           find_package(X11 REQUIRED) 
           target_link_libraries( netgen_gui INTERFACE ${X11_Xmu_LIB} ${X11_X11_LIB})
-    endif(APPLE)
+    endif(APPLE AND MACPORTS_NO_X11)
     find_package(OpenGL REQUIRED)
 
     target_compile_definitions(netgen_gui INTERFACE -DTCL -DOPENGL -DUSE_TOGL_2 -DUSE_TCL_STUBS -DUSE_TK_STUBS)
@@ -287,10 +287,10 @@ if (USE_GUI)
     if(WIN32)
       target_compile_definitions(netgen_gui INTERFACE -DTOGL_WGL)
     endif()
-    if(APPLE)
+    if(APPLE AND MACPORTS_NO_X11)
       target_compile_definitions(netgen_gui INTERFACE -DTOGL_NSOPENGL)
     endif()
-    if(UNIX AND NOT APPLE)
+    if(UNIX AND NOT MACPORTS_NO_X11)
       target_compile_definitions(netgen_gui INTERFACE -DTOGL_X11)
     endif()
 
@@ -653,7 +653,7 @@ open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh || open -a
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Netgen1</string>
+	<string>Netgen</string>
 	<key>CFBundleIconFile</key>
 	<string>Netgen.icns</string>
         <key>NSHighResolutionCapable</key>