39 files changed, 4 insertions, 3842 deletions
diff --git a/netware/ApacheCore.imp b/netware/ApacheCore.imp
deleted file mode 100644
index 3f7783797..000000000
--- a/netware/ApacheCore.imp
+++ /dev/null
@@ -1,365 +0,0 @@
- ap_MD5Final,
- ap_MD5Init,
- ap_MD5Update,
- ap_acquire_mutex,
- ap_add_cgi_vars,
- ap_add_common_vars,
- ap_add_loaded_module,
- ap_add_module,
- ap_add_named_module,
- ap_add_per_dir_conf,
- ap_add_per_url_conf,
- ap_add_version_component,
- ap_allow_options,
- ap_allow_overrides,
- ap_append_arrays,
- ap_array_cat,
- ap_auth_name,
- ap_auth_type,
- ap_basic_http_header,
- ap_bclose,
- ap_bcreate,
- ap_bfilbuf,
- ap_bfileno,
- ap_bflsbuf,
- ap_bflush,
- ap_bgetopt,
- ap_bgets,
- ap_bhalfduplex,
- ap_block_alarms,
- ap_blookc,
- ap_bnonblock,
- ap_bonerror,
- ap_bpushfd,
- ap_bputs,
- ap_bread,
- ap_bsetflag,
- ap_bsetopt,
- ap_bskiplf,
- ap_bspawn_child,
- ap_bwrite,
- ap_bytes_in_free_blocks,
- ap_bytes_in_pool,
- ap_call_exec,
- ap_can_exec,
- ap_cfg_closefile,
- ap_cfg_getc,
- ap_cfg_getline,
- ap_chdir_file,
- ap_check_alarm,
- ap_check_cmd_context,
- ap_checkmask,
- ap_cleanup_for_exec,
- ap_clear_module_list,
- ap_clear_pool,
- ap_clear_table,
- ap_close_piped_log,
- ap_construct_server,
- ap_construct_url,
- ap_content_type_tolower,
- ap_copy_array,
- ap_copy_array_hdr,
- ap_copy_table,
- ap_count_dirs,
- ap_cpystrn,
- ap_create_environment,
- ap_create_mutex,
- ap_create_per_dir_config,
- ap_custom_response,
- ap_default_port_for_request,
- ap_default_port_for_scheme,
- ap_default_type,
- ap_destroy_mutex,
- ap_destroy_pool,
- ap_destroy_sub_req,
- ap_die,
- ap_discard_request_body,
- ap_document_root,
- ap_each_byterange,
- ap_error_log2stderr,
- ap_escape_html,
- ap_escape_path_segment,
- ap_escape_quotes,
- ap_escape_shell_cmd,
- ap_exists_scoreboard_image,
- ap_finalize_request_protocol,
- ap_find_command,
- ap_find_command_in_modules,
- ap_find_last_token,
- ap_find_linked_module,
- ap_find_module_name,
- ap_find_path_info,
- ap_find_token,
- ap_get_basic_auth_pw,
- ap_get_client_block,
- ap_get_gmtoff,
- ap_get_limit_req_body,
- ap_get_remote_host,
- ap_get_remote_logname,
- ap_get_server_built,
- ap_get_server_name,
- ap_get_server_port,
- ap_get_server_version,
- ap_get_time,
- ap_get_token,
- ap_getparents,
- ap_getword,
- ap_getword_conf,
- ap_getword_conf_nc,
- ap_getword_nc,
- ap_getword_nulls,
- ap_getword_nulls_nc,
- ap_getword_white,
- ap_getword_white_nc,
- ap_gm_timestr_822,
- ap_gname2id,
- ap_handle_command,
- ap_hard_timeout,
- ap_ht_time,
- ap_ind,
- ap_index_of_response,
- ap_init_virtual_host,
- ap_internal_redirect,
- ap_internal_redirect_handler,
- ap_is_directory,
- ap_is_fnmatch,
- ap_is_initial_req,
- ap_is_matchexp,
- ap_is_url,
- ap_kill_cleanup,
- ap_kill_cleanups_for_fd,
- ap_kill_cleanups_for_socket,
- ap_kill_timeout,
- ap_log_assert,
- ap_log_error_old,
- ap_log_reason,
- ap_log_unixerr,
- ap_make_array,
- ap_make_dirstr,
- ap_make_dirstr_parent,
- ap_make_dirstr_prefix,
- ap_make_full_path,
- ap_make_sub_pool,
- ap_make_table,
- ap_matches_request_vhost,
- ap_md5,
- ap_md5_binary,
- ap_md5contextTo64,
- ap_md5digest,
- ap_meets_conditions,
- ap_no2slash,
- ap_note_auth_failure,
- ap_note_basic_auth_failure,
- ap_note_cleanups_for_fd,
- ap_note_cleanups_for_file,
- ap_note_cleanups_for_socket,
- ap_note_digest_auth_failure,
- ap_note_subprocess,
- ap_open_mutex,
- ap_open_piped_log,
- ap_os_escape_path,
- ap_overlap_tables,
- ap_overlay_tables,
- ap_palloc,
- ap_parseHTTPdate,
- ap_parse_hostinfo_components,
- ap_parse_uri,
- ap_parse_uri_components,
- ap_pcalloc,
- ap_pcfg_open_custom,
- ap_pcfg_openfile,
- ap_pclosedir,
- ap_pclosef,
- ap_pclosesocket,
- ap_pduphostent,
- ap_pfclose,
- ap_pfdopen,
- ap_pfopen,
- ap_pgethostbyname,
- ap_popendir,
- ap_popenf,
- ap_pregcomp,
- ap_pregfree,
- ap_pregsub,
- ap_psignature,
- ap_psocket,
- ap_pstrdup,
- ap_pstrndup,
- ap_push_array,
- ap_pvsprintf,
- ap_rationalize_mtime,
- ap_register_cleanup,
- ap_release_mutex,
- ap_remove_loaded_module,
- ap_remove_module,
- ap_requires,
- ap_reset_timeout,
- ap_rflush,
- ap_rind,
- ap_rputc,
- ap_rputs,
- ap_run_cleanup,
- ap_run_sub_req,
- ap_rwrite,
- ap_satisfies,
- ap_scan_script_header_err,
- ap_scan_script_header_err_buff,
- ap_scan_script_header_err_core,
- ap_send_fb,
- ap_send_fb_length,
- ap_send_fd,
- ap_send_fd_length,
- ap_send_http_header,
- ap_send_http_trace,
- ap_send_mmap,
- ap_send_size,
- ap_server_root_relative,
- ap_set_byterange,
- ap_set_content_length,
- ap_set_etag,
- ap_set_keepalive,
- ap_set_last_modified,
- ap_setup_client_block,
- ap_should_client_block,
- ap_soft_timeout,
- ap_some_auth_required,
- ap_spawn_child,
- ap_srm_command_loop,
- ap_str_tolower,
- ap_strcasecmp_match,
- ap_strcmp_match,
- ap_sub_req_lookup_file,
- ap_sub_req_lookup_uri,
- ap_sync_scoreboard_image,
- ap_table_add,
- ap_table_addn,
- ap_table_get,
- ap_table_merge,
- ap_table_mergen,
- ap_table_set,
- ap_table_setn,
- ap_table_unset,
- ap_tm2sec,
- ap_uname2id,
- ap_unblock_alarms,
- ap_unescape_url,
- ap_unparse_uri_components,
- ap_update_mtime,
- ap_uudecode,
- ap_uuencode,
- ap_vbprintf,
- ap_vformatter,
- ap_vsnprintf,
- regcomp,
- regexec,
- regfree,
- access_module,
- alias_module,
- ap_bprintf,
- ap_bvputs,
- ap_day_snames,
- ap_extended_status,
- ap_limit_section,
- ap_loaded_modules,
- ap_log_error,
- ap_log_printf,
- ap_log_rerror,
- ap_month_snames,
- ap_null_cleanup,
- ap_psprintf,
- ap_pstrcat,
- ap_restart_time,
- ap_rprintf,
- ap_rvputs,
- ap_scoreboard_image,
- ap_send_header_field,
- ap_server_argv0,
- ap_server_root,
- ap_set_file_slot,
- ap_set_flag_slot,
- ap_set_string_slot,
- ap_set_string_slot_lower,
- ap_snprintf,
- ap_suexec_enabled,
- ap_table_do,
- apache_main,
- asis_module,
- auth_module,
- autoindex_module,
- config_log_module,
- core_module,
- dir_module,
- env_module,
- imap_module,
- includes_module,
- mime_module,
- negotiation_module,
- setenvif_module,
- so_module,
- top_module,
- ap_fnmatch,
- ap_method_number_of,
- ap_exists_config_define,
- ap_single_module_configure,
- ap_make_etag,
- ap_array_pstrcat,
- ap_find_list_item,
- ap_MD5Encode,
- ap_validate_password,
- ap_size_list_item,
- ap_get_list_item,
- ap_scoreboard_fname,
- ap_pid_fname,
- ap_excess_requests_per_child,
- ap_threads_per_child,
- ap_max_requests_per_child,
- ap_daemons_to_start,
- ap_daemons_min_free,
- ap_daemons_max_free,
- ap_daemons_limit,
- ap_user_name,
- ap_user_id,
- ap_group_id,
- ap_standalone,
- ap_server_confname,
- ap_sub_req_method_uri,
- ap_regerror,
- ap_regexec,
- ap_field_noparam,
- ap_pbase64decode,
- ap_pbase64encode,
- ap_base64encode,
- ap_base64encode_binary,
- ap_base64encode_len,
- ap_base64decode,
- ap_base64decode_binary,
- ap_base64decode_len,
- ap_SHA1Init,
- ap_SHA1Update_binary,
- ap_SHA1Update,
- ap_SHA1Final,
- ap_sha1_base64,
- ap_my_generation,
- ap_get_virthost_addr,
- ap_listeners,
- ap_listenbacklog,
- clean_parent_exit,
- init_tsd,
- ap_set_config_vectors,
- ap_strcasestr,
- ap_to64,
- ap_vrprintf,
- regerror,
- ap_add_file_conf,
- ap_configtestonly,
- ap_is_rdirectory,
- ap_remove_spaces,
- ap_scan_script_header_err_strs,
- ap_start_shutdown,
- ap_start_restart,
- ap_stripprefix,
- ap_send_error_response,
- ap_os_canonical_filename,
- ap_os_http_method,
- os_readdir,
- os_opendir
diff --git a/netware/BisonExtStandard.bat b/netware/BisonExtStandard.bat
deleted file mode 100755
index 1a2e06950..000000000
--- a/netware/BisonExtStandard.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-bison --output=ext\standard\parsedate.c -v -d -p phplib ext\standard\parsedate.y
diff --git a/netware/BisonFlexZend.bat b/netware/BisonFlexZend.bat
deleted file mode 100755
index 5ed6aa3a1..000000000
--- a/netware/BisonFlexZend.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
-flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
-REM flex -i -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
-bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
-flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
-REM flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
diff --git a/netware/ZendEngine2.mak b/netware/ZendEngine2.mak
deleted file mode 100644
index effd30983..000000000
--- a/netware/ZendEngine2.mak
+++ /dev/null
@@ -1,160 +0,0 @@
-# Temporarily here -- later may go into some batch file 
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = ZEND
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-C_SRC = zend.c \
-        zend_alloc.c \
-        zend_API.c \
-        zend_builtin_functions.c \
-        zend_compile.c \
-        zend_constants.c \
-        zend_dynamic_array.c \
-        zend_execute.c \
-        zend_execute_API.c \
-        zend_extensions.c \
-        zend_hash.c \
-        zend_highlight.c \
-        zend_indent.c \
-        zend_ini.c \
-        zend_ini_parser.c \
-        zend_ini_scanner.c \
-        zend_language_parser.c \
-        zend_language_scanner.c \
-        zend_list.c \
-        zend_llist.c \
-        zend_multibyte.c \
-        zend_object_handlers.c \
-        zend_objects.c \
-        zend_opcode.c \
-        zend_operators.c \
-        zend_ptr_stack.c \
-        zend_qsort.c \
-        zend_sprintf.c \
-        zend_stack.c \
-        zend_static_allocator.c \
-        zend_ts_hash.c \
-        zend_variables.c
-
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle std
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED
-C_FLAGS += -DNETWARE -DZTS
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DTHREAD_SWITCH
-
-# These are required to use dlclose so that the PHP extensions are automatically unloaded
-# when apache is unloaded
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-
-C_FLAGS += -I. -I- -I../netware -I$(SDK_DIR)/include	# ../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	C_FLAGS  += -DZEND_DEBUG=1
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics
-	LD_FLAGS += -sym codeview4 -sym internal
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline auto -sym off
-	C_FLAGS  += -DZEND_DEBUG=0
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-	
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Linking $@...
-	@$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleansrc
-cleansrc:
-	@echo Deleting all generated source files...
-	-@del "zend_ini_parser.c"
-	-@del "zend_ini_parser.h"
-	-@del "zend_ini_scanner.c"
-	-@del "zend_language_parser.c"
-	-@del "zend_language_parser.h"
-	-@del "zend_language_scanner.c"
-	-@del "zend_ini_parser.output"
-	-@del "zend_language_parser.output"
-
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
diff --git a/netware/build.bat b/netware/build.bat
deleted file mode 100755
index 5c8e310a5..000000000
--- a/netware/build.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-cd ..\%1
-
-if "%2" == "clean" make -f ..\netware\%1.mak clean
-if "%2" == "/?" goto USAGE
-
-if "%1" == "zend" call ..\netware\BisonFlexZend
-if "%1" == "ZendEngine2" call ..\netware\BisonFlexZend
-
-REM Build command
-make -f ..\netware\%1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: build moduleName [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\netware
-\ No newline at end of file
diff --git a/netware/buildext.bat b/netware/buildext.bat
deleted file mode 100755
index 6cea5530c..000000000
--- a/netware/buildext.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-cd ..\ext\%1
-
-if "%2" == "clean" make -f %1.mak clean
-if "%2" == "/?" goto USAGE
-
-REM Build command
-make -f %1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildext extension_name [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\..\netware
diff --git a/netware/buildlib.bat b/netware/buildlib.bat
deleted file mode 100755
index 5abd71229..000000000
--- a/netware/buildlib.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-cd ..
-
-if "%1" == "clean" make -f netware\phplib.mak clean
-if "%1" == "/?" goto USAGE
-
-call netware\BisonExtStandard
-
-REM Build command
-make -f netware\phplib.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildlib [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd netware
-\ No newline at end of file
diff --git a/netware/buildsapi.bat b/netware/buildsapi.bat
deleted file mode 100755
index ddf299af2..000000000
--- a/netware/buildsapi.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-cd ..\sapi\%1
-
-if "%2" == "clean" make -f ..\..\netware\php5%1.mak clean
-if "%2" == "/?" goto USAGE
-
-REM Build command
-make -f ..\..\netware\php5%1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildsapi SAPI_Module_Name [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\..\netware
diff --git a/netware/common.mif b/netware/common.mif
deleted file mode 100644
index a2250e3b8..000000000
--- a/netware/common.mif
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Common include file for PHP build.
-# Include this in every make file.
-#
-
-
-# Set following directories based on your setting
-
-# Path to CodeWarrior installation
-CW_PATH = P:/APPS/SCRIPT/SW/CW71-4
-
-# LibC directory
-ifndef SDK_DIR
-SDK_DIR = P:/APPS/script/sw/libc
-endif
-
-# MPK related directory
-ifndef MPK_DIR
-MPK_DIR = p:/apps/script/mpk
-XDCTOOL = mpkxdc
-MPKTOOL = $(MPK_DIR)/$(XDCTOOL)
-XDCFLAGS = -n
-endif
-
-# Winsock stuff
-WINSOCK_DIR = P:/APPS/script/sw/Winsock2
-
-# LDAP stuff
-LDAP_DIR = P:/APPS/script/sw/cldapsdk
-
-# XML-EXPAT stuff
-EXPAT_DIR = P:/APPS/script/sw/expat
-
-
-# Web Server defaults to Apache 1.3.x
-ifndef APACHE_VER
-APACHE_VER = 1.3
-endif
-
-# Apache directory
-ifeq '$(APACHE_VER)' '1.3'
-APACHE_DIR = P:/APPS/script/sw/Apache1.3.xSource
-else
-APACHE_DIR = P:/APPS/script/sw/Apache2Source
-endif
-
-
-# CW includes, libraries and tools
-export MWCIncludes=$(CW_PATH)/include
-export MWLibraries=$(CW_PATH)/lib
-
-# Compiler and linker tools
-CC = mwccnlm
-LINK = mwldnlm
-
-# Build type defaults to 'release'
-ifndef BUILD
-BUILD = release
-endif
-
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-
-ifndef STACK_SIZE
-STACK_SIZE=65536
-endif
-
-ifndef COPYRIGHT
-COPYRIGHT = "Copyright (C) 2002-2003  Novell\, Inc. All Rights Reserved."
-endif
-
-
-# Compile flags
-ifeq '$(APACHE_VER)' '1.3'
-C_FLAGS  = -align 1
-C_FLAGS += -DCLIB_STAT_PATCH
-else
-C_FLAGS  = -align 4
-endif
-
-# Link flags
-LD_FLAGS  = -stacksize $(STACK_SIZE) -type generic -zerobss
-LD_FLAGS += -o $(BINARY) -map $(MAP_FILE) -nlmversion $(VMAJ),$(VMIN),$(VREV)
-
-# Module details
-LD_FLAGS += -desc $(MODULE_DESC)
-LD_FLAGS += -copy $(COPYRIGHT)
-LD_FLAGS += -screenname Default
-LD_FLAGS += -threadname $(MODULE_NAME)__p
diff --git a/netware/geterrnoptr.c b/netware/geterrnoptr.c
deleted file mode 100644
index 065d33e84..000000000
--- a/netware/geterrnoptr.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Moved into a separate source file -- can be eliminated later */
-
-#include <errno.h>
-
-int *__get_errno_ptr(void)
-{   
-    return ___errno();
-}
-
diff --git a/netware/grp.h b/netware/grp.h
deleted file mode 100644
index 48daec6fb..000000000
--- a/netware/grp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  pwd.h - Try to approximate UN*X's getuser...() functions under MS-DOS.
-   Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-   $Header: /repository/php-src/netware/grp.h,v 1.2 2003/01/03 11:46:15 hyanantha Exp $
- */
-
-/* This 'implementation' is conjectured from the use of this functions in
-   the RCS and BASH distributions.  Of course these functions don't do too
-   much useful things under MS-DOS, but using them avoids many "#ifdef
-   MSDOS" in ported UN*X code ...  */
-
-struct group {
-	char *gr_name;				/* group name */
-	char *gr_passwd;			/* group password */
-	int gr_gid;					/* group id */
-	char **gr_mem;				/* group members */
-};
diff --git a/netware/libpq-fe.h b/netware/libpq-fe.h
deleted file mode 100644
index 6d7a5fd15..000000000
--- a/netware/libpq-fe.h
+++ /dev/null
@@ -1,378 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * libpq-fe.h
- *	  This file contains definitions for structures and
- *	  externs for functions used by frontend postgres applications.
- *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id: libpq-fe.h,v 1.2 2003/01/03 11:40:52 hyanantha Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef LIBPQ_FE_H
-#define LIBPQ_FE_H
-
-#ifdef __cplusplus
-extern		"C"
-{
-#endif
-
-#include <stdio.h>
-
-/*
- * postgres_ext.h defines the backend's externally visible types,
- * such as Oid.
- */
-#include "postgres_ext.h"
-
-/* SSL type is needed here only to declare PQgetssl() */
-#ifdef USE_SSL
-#include <openssl/ssl.h>
-#endif
-
-/* Application-visible enum types */
-
-typedef enum
-{
-	/*
-	 * Although you may decide to change this list in some way, values
-	 * which become unused should never be removed, nor should constants
-	 * be redefined - that would break compatibility with existing code.
-	 */
-	CONNECTION_OK,
-	CONNECTION_BAD,
-	/* Non-blocking mode only below here */
-
-	/*
-	 * The existence of these should never be relied upon - they should
-	 * only be used for user feedback or similar purposes.
-	 */
-	CONNECTION_STARTED,			/* Waiting for connection to be made.  */
-	CONNECTION_MADE,			/* Connection OK; waiting to send.	   */
-	CONNECTION_AWAITING_RESPONSE,		/* Waiting for a response from the
-										 * postmaster.		  */
-	CONNECTION_AUTH_OK,			/* Received authentication; waiting for
-								 * backend startup. */
-	CONNECTION_SETENV			/* Negotiating environment.    */
-} ConnStatusType;
-
-typedef enum
-{
-	PGRES_POLLING_FAILED = 0,
-	PGRES_POLLING_READING,		/* These two indicate that one may	  */
-	PGRES_POLLING_WRITING,		/* use select before polling again.   */
-	PGRES_POLLING_OK,
-	PGRES_POLLING_ACTIVE		/* Can call poll function immediately. */
-} PostgresPollingStatusType;
-
-typedef enum
-{
-	PGRES_EMPTY_QUERY = 0,
-	PGRES_COMMAND_OK,			/* a query command that doesn't return
-								 * anything was executed properly by the
-								 * backend */
-	PGRES_TUPLES_OK,			/* a query command that returns tuples was
-								 * executed properly by the backend,
-								 * PGresult contains the result tuples */
-	PGRES_COPY_OUT,				/* Copy Out data transfer in progress */
-	PGRES_COPY_IN,				/* Copy In data transfer in progress */
-	PGRES_BAD_RESPONSE,			/* an unexpected response was recv'd from
-								 * the backend */
-	PGRES_NONFATAL_ERROR,
-	PGRES_FATAL_ERROR
-} ExecStatusType;
-
-/* PGconn encapsulates a connection to the backend.
- * The contents of this struct are not supposed to be known to applications.
- */
-typedef struct pg_conn PGconn;
-
-/* PGresult encapsulates the result of a query (or more precisely, of a single
- * SQL command --- a query string given to PQsendQuery can contain multiple
- * commands and thus return multiple PGresult objects).
- * The contents of this struct are not supposed to be known to applications.
- */
-typedef struct pg_result PGresult;
-
-/* PGnotify represents the occurrence of a NOTIFY message.
- * Ideally this would be an opaque typedef, but it's so simple that it's
- * unlikely to change.
- * NOTE: in Postgres 6.4 and later, the be_pid is the notifying backend's,
- * whereas in earlier versions it was always your own backend's PID.
- */
-typedef struct pgNotify
-{
-	char		relname[NAMEDATALEN];	/* name of relation containing
-										 * data */
-	int			be_pid;			/* process id of backend */
-} PGnotify;
-
-/* PQnoticeProcessor is the function type for the notice-message callback.
- */
-typedef void (*PQnoticeProcessor) (void *arg, const char *message);
-
-/* Print options for PQprint() */
-typedef char pqbool;
-
-typedef struct _PQprintOpt
-{
-	pqbool		header;			/* print output field headings and row
-								 * count */
-	pqbool		align;			/* fill align the fields */
-	pqbool		standard;		/* old brain dead format */
-	pqbool		html3;			/* output html tables */
-	pqbool		expanded;		/* expand tables */
-	pqbool		pager;			/* use pager for output if needed */
-	char	   *fieldSep;		/* field separator */
-	char	   *tableOpt;		/* insert to HTML <table ...> */
-	char	   *caption;		/* HTML <caption> */
-	char	  **fieldName;		/* null terminated array of repalcement
-								 * field names */
-} PQprintOpt;
-
-/* ----------------
- * Structure for the conninfo parameter definitions returned by PQconndefaults
- *
- * All fields except "val" point at static strings which must not be altered.
- * "val" is either NULL or a malloc'd current-value string.  PQconninfoFree()
- * will release both the val strings and the PQconninfoOption array itself.
- * ----------------
- */
-typedef struct _PQconninfoOption
-{
-	char	   *keyword;		/* The keyword of the option			*/
-	char	   *envvar;			/* Fallback environment variable name	*/
-	char	   *compiled;		/* Fallback compiled in default value	*/
-	char	   *val;			/* Option's current value, or NULL		 */
-	char	   *label;			/* Label for field in connect dialog	*/
-	char	   *dispchar;		/* Character to display for this field in
-								 * a connect dialog. Values are: ""
-								 * Display entered value as is "*"
-								 * Password field - hide value "D"	Debug
-								 * option - don't show by default */
-	int			dispsize;		/* Field size in characters for dialog	*/
-} PQconninfoOption;
-
-/* ----------------
- * PQArgBlock -- structure for PQfn() arguments
- * ----------------
- */
-typedef struct
-{
-	int			len;
-	int			isint;
-	union
-	{
-		int		   *ptr;		/* can't use void (dec compiler barfs)	 */
-		int			integer;
-	}			u;
-} PQArgBlock;
-
-/* ----------------
- * Exported functions of libpq
- * ----------------
- */
-
-/* ===	in fe-connect.c === */
-
-/* make a new client connection to the backend */
-/* Asynchronous (non-blocking) */
-extern PGconn *PQconnectStart(const char *conninfo);
-extern PostgresPollingStatusType PQconnectPoll(PGconn *conn);
-
-/* Synchronous (blocking) */
-extern PGconn *PQconnectdb(const char *conninfo);
-extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport,
-			 const char *pgoptions, const char *pgtty,
-			 const char *dbName,
-			 const char *login, const char *pwd);
-
-#define PQsetdb(M_PGHOST,M_PGPORT,M_PGOPT,M_PGTTY,M_DBNAME)  \
-	PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL)
-
-/* close the current connection and free the PGconn data structure */
-extern void PQfinish(PGconn *conn);
-
-/* get info about connection options known to PQconnectdb */
-extern PQconninfoOption *PQconndefaults(void);
-
-/* free the data structure returned by PQconndefaults() */
-extern void PQconninfoFree(PQconninfoOption *connOptions);
-
-/*
- * close the current connection and restablish a new one with the same
- * parameters
- */
-/* Asynchronous (non-blocking) */
-extern int	PQresetStart(PGconn *conn);
-extern PostgresPollingStatusType PQresetPoll(PGconn *conn);
-
-/* Synchronous (blocking) */
-extern void PQreset(PGconn *conn);
-
-/* issue a cancel request */
-extern int	PQrequestCancel(PGconn *conn);
-
-/* Accessor functions for PGconn objects */
-extern char *PQdb(const PGconn *conn);
-extern char *PQuser(const PGconn *conn);
-extern char *PQpass(const PGconn *conn);
-extern char *PQhost(const PGconn *conn);
-extern char *PQport(const PGconn *conn);
-extern char *PQtty(const PGconn *conn);
-extern char *PQoptions(const PGconn *conn);
-extern ConnStatusType PQstatus(const PGconn *conn);
-extern char *PQerrorMessage(const PGconn *conn);
-extern int	PQsocket(const PGconn *conn);
-extern int	PQbackendPID(const PGconn *conn);
-extern int	PQclientEncoding(const PGconn *conn);
-extern int	PQsetClientEncoding(PGconn *conn, const char *encoding);
-
-#ifdef USE_SSL
-/* Get the SSL structure associated with a connection */
-extern SSL *PQgetssl(PGconn *conn);
-#endif
-
-
-/* Enable/disable tracing */
-extern void PQtrace(PGconn *conn, FILE *debug_port);
-extern void PQuntrace(PGconn *conn);
-
-/* Override default notice processor */
-extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn,
-					 PQnoticeProcessor proc,
-					 void *arg);
-
-/* === in fe-exec.c === */
-
-/* Quoting strings before inclusion in queries. */
-extern size_t PQescapeString(char *to, const char *from, size_t length);
-extern unsigned char *PQescapeBytea(unsigned char *bintext, size_t binlen,
-			  size_t *bytealen);
-
-/* Simple synchronous query */
-extern PGresult *PQexec(PGconn *conn, const char *query);
-extern PGnotify *PQnotifies(PGconn *conn);
-extern void PQfreeNotify(PGnotify *notify);
-
-/* Interface for multiple-result or asynchronous queries */
-extern int	PQsendQuery(PGconn *conn, const char *query);
-extern PGresult *PQgetResult(PGconn *conn);
-
-/* Routines for managing an asychronous query */
-extern int	PQisBusy(PGconn *conn);
-extern int	PQconsumeInput(PGconn *conn);
-
-/* Routines for copy in/out */
-extern int	PQgetline(PGconn *conn, char *string, int length);
-extern int	PQputline(PGconn *conn, const char *string);
-extern int	PQgetlineAsync(PGconn *conn, char *buffer, int bufsize);
-extern int	PQputnbytes(PGconn *conn, const char *buffer, int nbytes);
-extern int	PQendcopy(PGconn *conn);
-
-/* Set blocking/nonblocking connection to the backend */
-extern int	PQsetnonblocking(PGconn *conn, int arg);
-extern int	PQisnonblocking(const PGconn *conn);
-
-/* Force the write buffer to be written (or at least try) */
-extern int	PQflush(PGconn *conn);
-
-/*
- * "Fast path" interface --- not really recommended for application
- * use
- */
-extern PGresult *PQfn(PGconn *conn,
-	 int fnid,
-	 int *result_buf,
-	 int *result_len,
-	 int result_is_int,
-	 const PQArgBlock *args,
-	 int nargs);
-
-/* Accessor functions for PGresult objects */
-extern ExecStatusType PQresultStatus(const PGresult *res);
-extern char *PQresStatus(ExecStatusType status);
-extern char *PQresultErrorMessage(const PGresult *res);
-extern int	PQntuples(const PGresult *res);
-extern int	PQnfields(const PGresult *res);
-extern int	PQbinaryTuples(const PGresult *res);
-extern char *PQfname(const PGresult *res, int field_num);
-extern int	PQfnumber(const PGresult *res, const char *field_name);
-extern Oid	PQftype(const PGresult *res, int field_num);
-extern int	PQfsize(const PGresult *res, int field_num);
-extern int	PQfmod(const PGresult *res, int field_num);
-extern char *PQcmdStatus(PGresult *res);
-extern char *PQoidStatus(const PGresult *res);	/* old and ugly */
-extern Oid	PQoidValue(const PGresult *res);	/* new and improved */
-extern char *PQcmdTuples(PGresult *res);
-extern char *PQgetvalue(const PGresult *res, int tup_num, int field_num);
-extern int	PQgetlength(const PGresult *res, int tup_num, int field_num);
-extern int	PQgetisnull(const PGresult *res, int tup_num, int field_num);
-
-/* Delete a PGresult */
-extern void PQclear(PGresult *res);
-
-/*
- * Make an empty PGresult with given status (some apps find this
- * useful). If conn is not NULL and status indicates an error, the
- * conn's errorMessage is copied.
- */
-extern PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status);
-
-/* === in fe-print.c === */
-
-extern void
-PQprint(FILE *fout,				/* output stream */
-		const PGresult *res,
-		const PQprintOpt *ps);	/* option structure */
-
-/*
- * really old printing routines
- */
-extern void
-PQdisplayTuples(const PGresult *res,
-				FILE *fp,		/* where to send the output */
-				int fillAlign,	/* pad the fields with spaces */
-				const char *fieldSep,	/* field separator */
-				int printHeader,	/* display headers? */
-				int quiet);
-
-extern void
-PQprintTuples(const PGresult *res,
-			  FILE *fout,		/* output stream */
-			  int printAttName, /* print attribute names */
-			  int terseOutput,	/* delimiter bars */
-			  int width);		/* width of column, if 0, use variable
-								 * width */
-
-
-/* === in fe-lobj.c === */
-
-/* Large-object access routines */
-extern int	lo_open(PGconn *conn, Oid lobjId, int mode);
-extern int	lo_close(PGconn *conn, int fd);
-extern int	lo_read(PGconn *conn, int fd, char *buf, size_t len);
-extern int	lo_write(PGconn *conn, int fd, char *buf, size_t len);
-extern int	lo_lseek(PGconn *conn, int fd, int offset, int whence);
-extern Oid	lo_creat(PGconn *conn, int mode);
-extern int	lo_tell(PGconn *conn, int fd);
-extern int	lo_unlink(PGconn *conn, Oid lobjId);
-extern Oid	lo_import(PGconn *conn, const char *filename);
-extern int	lo_export(PGconn *conn, Oid lobjId, const char *filename);
-
-/* === in fe-misc.c === */
-
-/* Determine length of multibyte encoded char at *s */
-extern int	PQmblen(const unsigned char *s, int encoding);
-
-/* Get encoding id from environment variable PGCLIENTENCODING */
-extern int	PQenv2encoding(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif   /* LIBPQ_FE_H */
diff --git a/netware/libpq.imp b/netware/libpq.imp
deleted file mode 100644
index 922679f07..000000000
--- a/netware/libpq.imp
+++ /dev/null
@@ -1,93 +0,0 @@
- lo_open,
- lo_close,
- lo_read,
- lo_write,
- lo_lseek,
- lo_creat,
- lo_tell,
- lo_unlink,
- lo_import,
- lo_export,
- PQconnectdb,
- PQconnectStart,
- PQconndefaults,
- PQsetdbLogin,
- PQconnectPoll,
- PQfinish,
- PQreset,
- PQresetStart,
- PQresetPoll,
- PQrequestCancel,
- PQconninfoFree,
- PQdb,
- PQuser,
- PQpass,
- PQhost,
- PQport,
- PQtty,
- PQoptions,
- PQstatus,
- PQerrorMessage,
- PQsocket,
- PQbackendPID,
- PQclientEncoding,
- PQsetClientEncoding,
- PQtrace,
- PQuntrace,
- PQsetNoticeProcessor,
- PQmakeEmptyPGresult,
- PQclear,
- PQsendQuery,
- PQconsumeInput,
- PQisBusy,
- PQgetResult,
- PQexec,
- PQnotifies,
- PQgetline,
- PQgetlineAsync,
- PQputline,
- PQputnbytes,
- PQendcopy,
- PQfn,
- PQresultStatus,
- PQresStatus,
- PQresultErrorMessage,
- PQntuples,
- PQnfields,
- PQbinaryTuples,
- PQfname,
- PQfnumber,
- PQftype,
- PQfsize,
- PQfmod,
- PQcmdStatus,
- PQoidStatus,
- PQoidValue,
- PQcmdTuples,
- PQgetvalue,
- PQgetlength,
- PQgetisnull,
- PQsetnonblocking,
- PQisnonblocking,
- PQflush,
- PQmblen,
- PQenv2encoding,
- PQprint,
- PQdisplayTuples,
- PQprintTuples,
- pg_valid_client_encoding,
- pg_valid_server_encoding,
- pg_char_to_encname_struct,
- pg_char_to_encoding,
- pg_encoding_to_char,
- createPQExpBuffer,
- initPQExpBuffer,
- destroyPQExpBuffer,
- termPQExpBuffer,
- resetPQExpBuffer,
- enlargePQExpBuffer,
- printfPQExpBuffer,
- appendPQExpBuffer,
- appendPQExpBufferStr,
- appendPQExpBufferChar,
- appendBinaryPQExpBuffer
diff --git a/netware/libpq/libpq-fs.h b/netware/libpq/libpq-fs.h
deleted file mode 100644
index d2458fa12..000000000
--- a/netware/libpq/libpq-fs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * libpq-fs.h
- *	  definitions for using Inversion file system routines (ie, large objects)
- *
- *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id: libpq-fs.h,v 1.1 2003/01/06 10:27:33 hyanantha Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef LIBPQ_FS_H
-#define LIBPQ_FS_H
-
-/*
- *	Read/write mode flags for inversion (large object) calls
- */
-
-#define INV_WRITE		0x00020000
-#define INV_READ		0x00040000
-
-#endif   /* LIBPQ_FS_H */
diff --git a/netware/mktemp.c b/netware/mktemp.c
deleted file mode 100644
index b6d8e9259..000000000
--- a/netware/mktemp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-
-/* Based on standard ANSI C mktemp() for NetWare */
-char* mktemp(char* templateStr)
-{
-	char* pXs = NULL;
-	char numBuf[50] = {'\0'};
-	int count = 0;
-	char* pPid = NULL;
-
-	char termChar = '\0';
-	char letter = 'a';
-	char letter1 = 'a';
-
-	if (templateStr && (pXs = strstr(templateStr, "XXXXXX")))
-	{
-		/* Generate temp name */
-		termChar = pXs[6];
-		ltoa(NXThreadGetId(), numBuf, 16);
-		numBuf[strlen(numBuf)-1] = '\0';
-
-        /*
-		Beware! thread IDs are 8 hex digits on NW 4.11 and only the
-		lower digits seem to change, whereas on NW 5 they are in the
-		range of < 1000 hex or 3 hex digits in length. So the following
-		logic ensures we use the least significant portion of the number.\
-		*/
-		if (strlen(numBuf) > 5)
-			pPid = &numBuf[strlen(numBuf)-5];
-		else
-			pPid = numBuf;
-
-		/*
-		Temporary files, as the name suggests, are temporarily used and then
-		cleaned up after usage. In the case of complex scripts, new temp files
-		may be created before the old ones are deleted. So, we need to have
-		a provision to create many temp files. It is found that provision for
-		26 files may not be enough in such cases. Hence the logic below.
-
-		The logic below allows 26 files (like, pla00015.tmp through plz00015.tmp)
-		plus 6x26=676 (like, plaa0015.tmp through plzz0015.tmp)
-		*/
-		letter = 'a';
-		do
-		{
-			sprintf(pXs, (char *)"%c%05.5s", letter, pPid);
-			pXs[6] = termChar;
-
-			if (access(templateStr, 0) != 0)
-				return templateStr;		/* File does not exist */
-
-			letter++;
-		} while (letter <= 'z');
-
-		letter1 = 'a';
-		do
-		{
-			letter = 'a';
-
-			do
-			{
-				sprintf(pXs, (char *)"%c%c%04.5s", letter1, letter, pPid);
-				pXs[6] = termChar;
-
-				if (access(templateStr, 0) != 0)
-					return templateStr;		/* File does not exist */
-
-				letter++;
-			} while (letter <= 'z');
-
-			letter1++;
-		} while (letter1 <= 'z');
-
-		errno = ENOENT;
-		return NULL;
-	}
-	else
-	{
-		errno = EINVAL;
-		return NULL;
-	}
-}
-
diff --git a/netware/mktemp.h b/netware/mktemp.h
deleted file mode 100644
index b37043824..000000000
--- a/netware/mktemp.h
+++ /dev/null
@@ -1 +0,0 @@
-char* mktemp(char* templateStr);
diff --git a/netware/param.h b/netware/param.h
deleted file mode 100644
index aa879d035..000000000
--- a/netware/param.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*****************************************************************************
- *                                                                           *
- * sys/param.c                                                               *
- *                                                                           *
- * Freely redistributable and modifiable.  Use at your own risk.             *
- *                                                                           *
- * Copyright 1994 The Downhill Project                                       *
- *                                                                           *
- *****************************************************************************/
-#ifndef MAXPATHLEN
-/*#define MAXPATHLEN     _MAX_PATH*/
-#define MAXPATHLEN     260  /* _MAX_PATH defined in STDLIB.H for Windows; picked up the value from there */
-#define _MAX_PATH     260  /* Defined since it is used in os.c while compiling apache */
-#endif
-#define MAXHOSTNAMELEN 64
-#define howmany(x,y)   (((x)+((y)-1))/(y))
-#define roundup(x,y)   ((((x)+((y)-1))/(y))*(y))
-
-#define _MAX_VOLUME 31  /* Defined since it is used in os.c while compiling apache. The value picked up from LibC */
diff --git a/netware/php-nw.bat b/netware/php-nw.bat
deleted file mode 100755
index 3d2b59d8a..000000000
--- a/netware/php-nw.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-
-REM CodeWarrior stuff
-set path=%path%;P:\APPS\SCRIPT\SW\CW71-4\BIN
-
-REM Tools for building Zend
-set path=%path%;P:\APPS\SCRIPT\SW\GNUWIN32\BIN
-
-REM Build options
-setbuild r 1
diff --git a/netware/php5apache.mak b/netware/php5apache.mak
deleted file mode 100644
index d7d9342b1..000000000
--- a/netware/php5apache.mak
+++ /dev/null
@@ -1,165 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = mod_php
-MODULE_DESC = "PHP 5 - Apache 1.3 Module"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = mod_php5.c \
-        php_apache.c \
-        sapi_apache.c \
-        libpre.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -DNETWARE
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include		# ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I$(APACHE_DIR)/include -I$(APACHE_DIR)/os/netware
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-	C_FLAGS += -r -DZEND_DEBUG=1
-	C_FLAGS += -exc cw
-	LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-        LD_FLAGS += -msgstyle std
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-	C_FLAGS += -opt intrinsics
-	C_FLAGS += -opt level=4
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp            \
-         @$(PROJECT_ROOT)/netware/apachecore.imp \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php5_module
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-	@echo Import $(API) >> $(basename $@).def
-endif
-	@echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-	@echo Export $(EXPORT) >> $(basename $@).def
-endif
-	@echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-	@echo Debug >> $(basename $@).def
-endif
-	@echo Flag_On 0x00000008 >> $(basename $@).def
-	@echo Start _lib_start >> $(basename $@).def
-	@echo Exit _lib_stop >> $(basename $@).def
-
-	$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-	@echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-	@echo Linking $@...
-	@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-	@echo $(LIBRARY) >> $(basename $@).link
-endif
-	@echo $(OBJECTS) >> $(basename $@).link
-
-	@$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-	@echo Deleting MAP, DEF files, etc....
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-	-@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/php5apache2filter.mak b/netware/php5apache2filter.mak
deleted file mode 100644
index 7cc1a2919..000000000
--- a/netware/php5apache2filter.mak
+++ /dev/null
@@ -1,166 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = mod_php
-MODULE_DESC = "PHP 5 - Apache 2.0 Module"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = apache_config.c \
-        php_functions.c \
-        sapi_apache2.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -DNETWARE
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include		# ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(SDK_DIR)/include/winsock	# For Apache 2.0 headers
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I$(APACHE_DIR)/include
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-	C_FLAGS += -r -DZEND_DEBUG=1
-	C_FLAGS += -exc cw
-	LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-        LD_FLAGS += -msgstyle std
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-	C_FLAGS += -opt intrinsics
-	C_FLAGS += -opt level=4
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp          \
-         @$(APACHE_DIR)/lib/httpd.imp   \
-         @$(APACHE_DIR)/lib/aprlib.imp  \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php5_module
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-	@echo Import $(API) >> $(basename $@).def
-endif
-	@echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-	@echo Export $(EXPORT) >> $(basename $@).def
-endif
-	@echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-	@echo Debug >> $(basename $@).def
-endif
-	@echo Flag_On 0x00000008 >> $(basename $@).def
-	@echo Start _lib_start >> $(basename $@).def
-	@echo Exit _lib_stop >> $(basename $@).def
-
-	$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-	@echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-	@echo Linking $@...
-	@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-	@echo $(LIBRARY) >> $(basename $@).link
-endif
-	@echo $(OBJECTS) $(APACHE_DIR)/lib/libpre.obj >> $(basename $@).link
-
-	@$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-	@echo Deleting MAP, DEF files, etc....
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-	-@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/php5cli.mak b/netware/php5cli.mak
deleted file mode 100644
index 30a1896f2..000000000
--- a/netware/php5cli.mak
+++ /dev/null
@@ -1,163 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = php
-MODULE_DESC = "PHP 5 - Command Line Interface"
-VMAJ = 2
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = getopt.c \
-        php_cli.c
-
-# Library files
-LIBRARY =
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -DNETWARE -DTHREAD_SWITCH
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include		# ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-	C_FLAGS += -r -DZEND_DEBUG=1
-	C_FLAGS += -exc cw
-	LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-	C_FLAGS += -opt intrinsics
-	C_FLAGS += -opt level=4
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Dependencies
-MODULE = LibC   \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp        \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = 
-API    =
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-	@echo Import $(API) >> $(basename $@).def
-endif
-	@echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-	@echo Export $(EXPORT) >> $(basename $@).def
-endif
-	@echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-	@echo Debug >> $(basename $@).def
-endif
-	@echo Flag_On 0x00000008 >> $(basename $@).def
-	@echo Start _LibCPrelude >> $(basename $@).def
-	@echo Exit _LibCPostlude >> $(basename $@).def
-
-	$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-	@echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-	@echo Linking $@...
-	@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-	@echo $(LIBRARY) >> $(basename $@).link
-endif
-	@echo $(OBJECTS) >> $(basename $@).link
-
-	@$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-	@echo Deleting MAP, DEF files, etc....
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-	-@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/phplib.imp b/netware/phplib.imp
deleted file mode 100644
index d1ecedc98..000000000
--- a/netware/phplib.imp
+++ /dev/null
@@ -1,177 +0,0 @@
-_array_init,
-_convert_to_string,
-_ecalloc,
-_efree,
-_emalloc,
-_erealloc,
-_estrdup,
-_estrndup,
-_object_and_properties_init,
-_object_init,
-_object_init_ex,
-_php_stream_cast,
-_php_stream_free,
-_php_stream_open_wrapper_ex,
-_zend_get_parameters_array,
-_zend_get_parameters_array_ex,
-_zend_list_addref,
-_zend_list_delete,
-_zend_list_find,
-_zval_copy_ctor,
-_zval_dtor,
-_zval_ptr_dtor,
-add_assoc_bool_ex,
-add_assoc_long_ex,
-add_assoc_zval_ex,
-add_index_null,
-add_index_long,
-add_index_zval,
-add_assoc_string_ex,
-add_assoc_stringl_ex,
-add_assoc_null_ex,
-add_index_string,
-add_index_stringl,
-add_next_index_bool,
-add_next_index_long,
-add_next_index_string,
-add_next_index_stringl,
-add_next_index_zval,
-add_property_long_ex,
-add_property_string_ex,
-call_user_function,
-compiler_globals_id,
-convert_to_boolean,
-convert_to_array,
-convert_to_double,
-convert_to_long,
-core_globals_id,
-display_ini_entries,
-display_link_numbers,
-empty_string,
-executor_globals_id,
-expand_filepath,
-get_zend_version,
-get_active_function_name,
-highlight_file,
-le_index_ptr,
-module_registry,
-multi_convert_to_long_ex,
-open_file_for_scanning,
-php_addslashes,
-php_check_open_basedir,
-php_checkuid,
-php_execute_script,
-php_fopen_primary_script,
-php_handle_aborted_connection,
-php_handle_special_queries,
-php_body_write,
-php_end_ob_buffers,
-php_error_docref0,
-php_get_current_user,
-php_get_highlight_struct,
-php_handle_auth_data,
-php_header,
-php_header_write,
-php_import_environment_variables,
-php_info_print_table_end,
-php_info_print_table_colspan_header,
-php_info_print_table_header,
-php_info_print_table_row,
-php_info_print_table_start,
-php_lint_script,
-php_log_err,
-php_module_shutdown,
-php_module_shutdown_for_exec,
-php_module_shutdown_wrapper,
-php_module_startup,
-php_ob_set_internal_handler,
-php_output_activate,
-php_output_set_status,
-php_output_startup,
-php_print_info,
-php_printf,
-php_regcomp,
-php_regexec,
-php_regfree,
-php_register_variable,
-php_request_shutdown,
-php_request_shutdown_for_exec,
-php_request_startup,
-php_sig_gif,
-php_sig_jpg,
-php_sig_png,
-php_start_ob_buffer,
-php_strip_tags,
-php_strip_url_passwd,
-php_stripslashes,
-php_strlcpy,
-php_strtolower,
-php_strtoupper,
-php_write,
-sapi_add_header_ex,
-sapi_free_header,
-sapi_get_default_content_type,
-sapi_globals_id,
-sapi_shutdown,
-sapi_startup,
-second_arg_force_ref,
-ts_allocate_id,
-ts_resource_ex,
-tsrm_shutdown,
-tsrm_startup,
-virtual_filepath,
-virtual_fopen,
-zend_alter_ini_entry,
-zend_error,
-zend_eval_string,
-zend_execute_scripts,
-zend_extensions,
-zend_fetch_resource,
-zend_get_parameters_ex,
-zend_hash_add_or_update,
-zend_hash_apply,
-zend_hash_apply_with_argument,
-zend_hash_clean,
-zend_hash_del_key_or_index,
-zend_hash_destroy,
-zend_hash_exists,
-zend_hash_find,
-zend_hash_get_current_key_ex,
-zend_hash_get_current_data_ex,
-zend_hash_index_find,
-zend_hash_index_update_or_next_insert,
-zend_hash_init,
-zend_hash_init_ex,
-zend_hash_internal_pointer_reset_ex
-zend_hash_merge_ex,
-zend_hash_move_forward_ex,
-zend_hash_num_elements,
-zend_highlight,
-zend_ini_deactivate,
-zend_ini_boolean_displayer_cb,
-zend_ini_string,
-zend_list_insert,
-zend_llist_add_element,
-zend_llist_apply,
-zend_llist_apply_with_argument,
-zend_llist_destroy,
-zend_llist_init,
-zend_load_extension,
-zend_parse_parameters,
-zend_parse_parameters_ex,
-zend_printf,
-zend_register_ini_entries,
-zend_register_internal_class,
-zend_register_list_destructors_ex,
-zend_register_long_constant,
-zend_register_resource,
-zend_startup_module,
-zend_standard_class_def,
-zend_strip,
-zend_unregister_ini_entries,
-zend_wrong_param_count,
-zval_add_ref,
-OnUpdateBool,
-OnUpdateLong,
-OnUpdateString,
-OnUpdateStringUnempty
diff --git a/netware/phplib.mak b/netware/phplib.mak
deleted file mode 100644
index 90b6e6742..000000000
--- a/netware/phplib.mak
+++ /dev/null
@@ -1,404 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = .
-
-# Module details
-MODULE_NAME = phplib
-MODULE_DESC = "PHP 5 - Script Interpreter and Library"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = ext/bcmath/bcmath.c \
-        ext/bcmath/libbcmath/src/add.c \
-        ext/bcmath/libbcmath/src/compare.c \
-        ext/bcmath/libbcmath/src/debug.c \
-        ext/bcmath/libbcmath/src/div.c \
-        ext/bcmath/libbcmath/src/divmod.c \
-        ext/bcmath/libbcmath/src/doaddsub.c \
-        ext/bcmath/libbcmath/src/init.c \
-        ext/bcmath/libbcmath/src/int2num.c \
-        ext/bcmath/libbcmath/src/nearzero.c \
-        ext/bcmath/libbcmath/src/neg.c \
-        ext/bcmath/libbcmath/src/num2long.c \
-        ext/bcmath/libbcmath/src/num2str.c \
-        ext/bcmath/libbcmath/src/outofmem.c \
-        ext/bcmath/libbcmath/src/output.c \
-        ext/bcmath/libbcmath/src/raise.c \
-        ext/bcmath/libbcmath/src/raisemod.c \
-        ext/bcmath/libbcmath/src/recmul.c \
-        ext/bcmath/libbcmath/src/rmzero.c \
-        ext/bcmath/libbcmath/src/rt.c \
-        ext/bcmath/libbcmath/src/sqrt.c \
-        ext/bcmath/libbcmath/src/str2num.c \
-        ext/bcmath/libbcmath/src/sub.c \
-        ext/bcmath/libbcmath/src/zero.c \
-        ext/calendar/cal_unix.c \
-        ext/calendar/calendar.c \
-        ext/calendar/dow.c \
-        ext/calendar/easter.c \
-        ext/calendar/french.c \
-        ext/calendar/gregor.c \
-        ext/calendar/jewish.c \
-        ext/calendar/julian.c \
-        ext/ftp/ftp.c \
-        ext/ftp/php_ftp.c \
-        ext/mcal/php_mcal.c \
-        ext/pcre/php_pcre.c \
-        ext/pcre/pcrelib/chartables.c \
-        ext/pcre/pcrelib/get.c \
-        ext/pcre/pcrelib/maketables.c \
-        ext/pcre/pcrelib/pcre.c \
-        ext/pcre/pcrelib/pcreposix.c \
-        ext/pcre/pcrelib/study.c \
-        ext/session/mod_files.c \
-        ext/session/mod_mm.c \
-        ext/session/mod_user.c \
-        ext/session/session.c \
-        ext/snmp/snmp.c \
-        ext/standard/aggregation.c \
-        ext/standard/array.c \
-        ext/standard/assert.c \
-        ext/standard/base64.c \
-        ext/standard/basic_functions.c \
-        ext/standard/browscap.c \
-        ext/standard/crc32.c \
-        ext/standard/credits.c \
-        ext/standard/css.c \
-        ext/standard/cyr_convert.c \
-        ext/standard/datetime.c \
-        ext/standard/dir.c \
-        ext/standard/dl.c \
-        ext/standard/dns.c \
-        ext/standard/exec.c \
-        ext/standard/file.c \
-        ext/standard/filestat.c \
-        ext/standard/filters.c \
-        ext/standard/flock_compat.c \
-        ext/standard/formatted_print.c \
-        ext/standard/fsock.c \
-        ext/standard/ftok.c \
-        ext/standard/ftp_fopen_wrapper.c \
-        ext/standard/head.c \
-        ext/standard/html.c \
-        ext/standard/http_fopen_wrapper.c \
-        ext/standard/image.c \
-        ext/standard/incomplete_class.c \
-        ext/standard/info.c \
-        ext/standard/iptc.c \
-        ext/standard/lcg.c \
-        ext/standard/levenshtein.c \
-        ext/standard/link.c \
-        ext/standard/mail.c \
-        ext/standard/math.c \
-        ext/standard/md5.c \
-        ext/standard/metaphone.c \
-        ext/standard/microtime.c \
-        ext/standard/pack.c \
-        ext/standard/pageinfo.c \
-        ext/standard/parsedate.c \
-        ext/standard/php_fopen_wrapper.c \
-        ext/standard/quot_print.c \
-        ext/standard/rand.c \
-        ext/standard/reg.c \
-        ext/standard/scanf.c \
-        ext/standard/sha1.c \
-        ext/standard/soundex.c \
-        ext/standard/string.c \
-        ext/standard/strnatcmp.c \
-        ext/standard/type.c \
-        ext/standard/uniqid.c \
-        ext/standard/url.c \
-        ext/standard/url_scanner.c \
-        ext/standard/url_scanner_ex.c \
-        ext/standard/user_filters.c \
-        ext/standard/var.c \
-        ext/standard/var_unserializer.c \
-        ext/standard/versioning.c \
-        main/fopen_wrappers.c \
-        main/internal_functions_nw.c \
-        main/main.c \
-        main/memory_streams.c \
-        main/mergesort.c \
-        main/network.c \
-        main/output.c \
-        main/php_content_types.c \
-        main/php_ini.c \
-        main/php_logos.c \
-        main/php_open_temporary_file.c \
-        main/php_sprintf.c \
-        main/php_ticks.c \
-        main/php_variables.c \
-        main/reentrancy.c \
-        main/rfc1867.c \
-        main/safe_mode.c \
-        main/SAPI.c \
-        main/snprintf.c \
-        main/spprintf.c \
-        main/streams.c \
-        main/strlcat.c \
-        main/strlcpy.c \
-        main/user_streams.c \
-        netware/geterrnoptr.c \
-        netware/mktemp.c \
-        netware/pipe.c \
-        netware/pwd.c \
-        netware/start.c \
-        netware/time_nw.c \
-        netware/wfile.c \
-        regex/regcomp.c \
-        regex/regerror.c \
-        regex/regexec.c \
-        regex/regfree.c \
-#        ext/standard/crypt.c \
-#        ext/com/COM.c \
-#        ext/com/conversion.c \
-#        ext/odbc/php_odbc.c \
-#        ext/snmp/winsnmp.c \
-#        netware/winutil.c \
-#        netware/registry.c \
-#        main/alloca.c \
-#        ext/wddx/wddx.c \
-#        netware/readdir.c \
-
-WIN32_C_SRC = sendmail.c \
-
-
-CPP_SRC_NODIR = $(notdir $(CPP_SRC))
-C_SRC_NODIR = $(notdir $(C_SRC))
-SRC_DIR = $(dir $(CPP_SRC) $(C_SRC))
-
-# Library files
-LIBRARY  = $(PROJECT_ROOT)/Zend/$(BUILD)/Zend.lib $(PROJECT_ROOT)/TSRM/$(BUILD)/TSRM.lib
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS  = $(join $(SRC_DIR), $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.obj) $(C_SRC_NODIR:.c=.obj)))
-WIN32_OBJECTS  = $(addprefix $(OBJ_DIR)/,$(WIN32_C_SRC:.c=.obj))
-DEPDS  = $(join $(SRC_DIR), $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.d) $(C_SRC_NODIR:.c=.d)))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc -nosyspath
-C_FLAGS  += -DNETWARE -D__BIT_TYPES_DEFINED__ -DZTS
-C_FLAGS  += -DPHP5DLLTS_EXPORTS -DPHP_EXPORTS -DLIBZEND_EXPORTS -DTSRM_EXPORTS -DSAPI_EXPORTS
-C_FLAGS  += -DHAVE_SYS_TIME_H -DHAVE_STRUCT_FLOCK -DVIRTUAL_DIR -DHAVE_TZNAME
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-C_FLAGS  += -DCLIB_STAT_PATCH		# stat patch
-C_FLAGS  += -DNEW_LIBC -DHAVE_ARPA_INET_H=1 -DHAVE_NETINET_IN_H=1 -DHAVE_INET_ATON=1
-
-C_FLAGS  += -DLINK_SIZE=2		# Added for the new definition in ext\pcre\pcrelib\internal.h
-# Below added for the file ext\pcre\pcrelib\pcreposix.c and
-# the default value is what is defined in the changelog file
-C_FLAGS  += -DPOSIX_MALLOC_THRESHOLD=5
-
-C_FLAGS  += -I. -Imain -Inetware -Iregex -IZend -ITSRM
-C_FLAGS  += -Iext/standard -Iext/mcal -Iext/pcre -Iext/pcre/pcrelib
-C_FLAGS  += -Iext/bcmath -Iext/bcmath/libbcmath/src
-C_FLAGS  += -Iext/odbc -Iext/session -Iext/ftp -Iext/wddx -Iext/calendar -Iext/snmp
-C_FLAGS  += -I- -Inetware -I$(SDK_DIR)/include -I$(MWCIncludes)	# netware added for special SYS/STAT.H : Venkat(6/2/02)
-C_FLAGS  += -Iwin32
-C_FLAGS  += -I$(SDK_DIR)/include/winsock	# Added for socket calls
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics 
-	C_FLAGS += -D_DEBUG -DZEND_DEBUG=1
-	LD_FLAGS += -sym codeview4 -sym internal -osym $(SYM_FILE) 
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline auto -sym off -DZEND_DEBUG=0
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC
-IMPORT = @$(SDK_DIR)/imports/libc.imp   \
-         @$(SDK_DIR)/imports/ws2nlm.imp \
-         @$(MPK_DIR)/import/mpkOrg.imp
-EXPORT = @$(PROJECT_ROOT)/netware/phplib.imp
-API = NXGetEnvCount \
-      NXCopyEnv \
-      OutputToScreen \
-      bsd_fd_set
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c . win32
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist main\$(OBJ_DIR)                     md main\$(OBJ_DIR)
-	@if not exist regex\$(OBJ_DIR)                    md regex\$(OBJ_DIR)
-	@if not exist netware\$(OBJ_DIR)                  md netware\$(OBJ_DIR)
-	@if not exist ext\standard\$(OBJ_DIR)             md ext\standard\$(OBJ_DIR)
-	@if not exist ext\bcmath\$(OBJ_DIR)               md ext\bcmath\$(OBJ_DIR)
-	@if not exist ext\bcmath\libbcmath\src\$(OBJ_DIR) md ext\bcmath\libbcmath\src\$(OBJ_DIR)
-	@if not exist ext\mcal\$(OBJ_DIR)                 md ext\mcal\$(OBJ_DIR)
-	@if not exist ext\pcre\$(OBJ_DIR)                 md ext\pcre\$(OBJ_DIR)
-	@if not exist ext\pcre\pcrelib\$(OBJ_DIR)         md ext\pcre\pcrelib\$(OBJ_DIR)
-	@if not exist ext\odbc\$(OBJ_DIR)                 md ext\odbc\$(OBJ_DIR)
-	@if not exist ext\session\$(OBJ_DIR)              md ext\session\$(OBJ_DIR)
-	@if not exist ext\ftp\$(OBJ_DIR)                  md ext\ftp\$(OBJ_DIR)
-	@if not exist ext\wddx\$(OBJ_DIR)                 md ext\wddx\$(OBJ_DIR)
-	@if not exist ext\calendar\$(OBJ_DIR)             md ext\calendar\$(OBJ_DIR)
-	@if not exist ext\snmp\$(OBJ_DIR)                 md ext\snmp\$(OBJ_DIR)
-	@if not exist $(FINAL_DIR)                        md $(FINAL_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-%.d: ../%.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-	
-%.obj: ../%.c
-	@echo Compiling $?...
-# writing the flags to a file. Otherwise fails on win95 due too many characters in command line.
-	@echo $(wordlist 1, 20, $(C_FLAGS)) > $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-	@echo $(wordlist 21, 40, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-	@echo $(wordlist 41, 60, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-	@echo $(wordlist 61, 80, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-	@$(CC) $< @$(basename $(OBJ_DIR)\$(notdir $@)).cfg -o $@ 
-	@del $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-
-
-$(BINARY): $(OBJECTS) $(WIN32_OBJECTS) $(LIBRARY)
-	@echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-	@echo Import $(API) >> $(basename $@).def
-endif
-	@echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-	@echo Export $(EXPORT) >> $(basename $@).def
-endif
-	@echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-	@echo Debug >> $(basename $@).def
-endif
-	@echo Flag_On 0x00000008 >> $(basename $@).def
-	@echo Start _LibCPrelude >> $(basename $@).def
-	@echo Exit _LibCPostlude >> $(basename $@).def
-
-	$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-	@echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-	@echo Linking $@...
-	@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-	@echo $(LIBRARY) >> $(basename $@).link
-endif
-	@echo $(wordlist   1,  10, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  11,  20, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  21,  30, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  31,  40, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  41,  50, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  51,  60, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist  61, 70, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 71, 80, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 81, 85, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 86, 90, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 91, 95, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 96, 100, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 101, 105, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 106, 110, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 111, 115, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 116, 120, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 121, 125, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 126, 130, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 131, 135, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 136, 140, $(OBJECTS)) >> $(basename $@).link
-	@echo $(wordlist 141, 141, $(OBJECTS)) >> $(basename $@).link
-
-	@echo $(wordlist 1, 2, $(WIN32_OBJECTS)) >> $(basename $@).link
-
-	@$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "main\$(OBJ_DIR)\*.d"
-	-@del "regex\$(OBJ_DIR)\*.d"
-	-@del "netware\$(OBJ_DIR)\*.d"
-	-@del "ext\standard\$(OBJ_DIR)\*.d"
-	-@del "ext\bcmath\$(OBJ_DIR)\*.d"
-	-@del "ext\bcmath\libbcmath\src\$(OBJ_DIR)\*.d"
-	-@del "ext\mcal\$(OBJ_DIR)\*.d"
-	-@del "ext\pcre\$(OBJ_DIR)\*.d"
-	-@del "ext\pcre\pcrelib\$(OBJ_DIR)\*.d"
-	-@del "ext\odbc\$(OBJ_DIR)\*.d"
-	-@del "ext\session\$(OBJ_DIR)\*.d"
-	-@del "ext\ftp\$(OBJ_DIR)\*.d"
-	-@del "ext\wddx\$(OBJ_DIR)\*.d"
-	-@del "ext\calendar\$(OBJ_DIR)\*.d"
-	-@del "ext\snmp\$(OBJ_DIR)\*.d"
-
-.PHONY: cleansrc
-cleansrc:
-	@echo Deleting all generated source files...
-	-@del "ext\standard\parsedate.c"
-	-@del "ext\standard\parsedate.h"
-	-@del "ext\standard\parsedate.output"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "main\$(OBJ_DIR)\*.obj"
-	-@del "regex\$(OBJ_DIR)\*.obj"
-	-@del "netware\$(OBJ_DIR)\*.obj"
-	-@del "ext\standard\$(OBJ_DIR)\*.obj"
-	-@del "ext\bcmath\$(OBJ_DIR)\*.obj"
-	-@del "ext\bcmath\libbcmath\src\$(OBJ_DIR)\*.obj"
-	-@del "ext\mcal\$(OBJ_DIR)\*.obj"
-	-@del "ext\pcre\$(OBJ_DIR)\*.obj"
-	-@del "ext\pcre\pcrelib\$(OBJ_DIR)\*.obj"
-	-@del "ext\odbc\$(OBJ_DIR)\*.obj"
-	-@del "ext\session\$(OBJ_DIR)\*.obj"
-	-@del "ext\ftp\$(OBJ_DIR)\*.obj"
-	-@del "ext\wddx\$(OBJ_DIR)\*.obj"
-	-@del "ext\calendar\$(OBJ_DIR)\*.obj"
-	-@del "ext\snmp\$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-	@echo Deleting MAP, DEF files, etc....
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-	-@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/phptest.ncf b/netware/phptest.ncf
deleted file mode 100644
index 9cb599e19..000000000
--- a/netware/phptest.ncf
+++ /dev/null
@@ -1 +0,0 @@
-php -q run-tests.php > results.txt
-\ No newline at end of file
diff --git a/netware/pipe.c b/netware/pipe.c
deleted file mode 100644
index c302fdf3e..000000000
--- a/netware/pipe.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * FILENAME		:	pipe.c
- * DESCRIPTION	:	Functions to implement pipes on NetWare.
- * Author		:	Anantha Kesari H Y, Venkat Raghavan S, Srivathsa M
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "netware/pipe.h"
-#include "netware/mktemp.h"
-
-
-/* Following definitions unavailable in LibC, hence borrowed from CLib */
-#define P_WAIT      0
-#define P_NOWAIT    1
-
-#define WHITESPACE  " \t"
-#define MAX_ARGS    10
-
-
-FILE* popen(const char* commandline, const char* mode)
-{
-	int               err, count;
-	char              pszPipestr[32] = {'\0'};
-	char *command = NULL, *argv[MAX_ARGS] = {'\0'};
-	int fd = -1;
-	fd_set myfds;
-	wiring_t wiring;
-	pid_t pid=0;
-	FILE *fp=NULL;
-	char *ptr = NULL;
-	int ptrLen = 0, argc = 0, i = 0;
-
-
-	/* Get a temporary name */
-	(void) tmpnam(strecpy(pszPipestr,  "PHP/php$pipe/"));
-
-	wiring.infd=FD_UNUSED;
-	wiring.outfd=FD_UNUSED;
-	wiring.errfd=FD_UNUSED;
-
-	/* Open a pipe */
-	if ( *mode=='r') {
-		fd = pipe_open (pszPipestr, O_RDONLY);
-		if (fd == -1)
-			return NULL;
-
-		wiring.outfd=fd;
-	} else if (*mode=='w') {
-		fd = pipe_open (pszPipestr, O_WRONLY);
-		if (fd == -1)
-			return NULL;
-
-		wiring.infd=fd;
-	} else {
-		consoleprintf ("Unsupported pipe open mode \n");
-		return NULL;
-	}
-
-	/* Get the file pointer */
-	fp = fdopen(fd, mode);
-	if (fp == NULL) {
-		consoleprintf ("Failure in fdopen \n");
-		close (fd);
-		return NULL;
-	}
-
-	/* Separate commandline string into words */
-	ptr = strtok((char*)commandline, WHITESPACE);
-	ptrLen = strlen(ptr);
-
-	/* Get the command */
-	command = (char*)malloc(ptrLen + 1);
-	if(command == NULL) {
-		consoleprintf ("Failure in memory allocation \n");
-		close (fd);
-		fclose (fp);
-		return NULL;
-	}
-	strcpy (command, ptr);
-
-	/* Command as the first argument into prcessve */
-	argv[argc] = (char*)malloc(ptrLen + 1);
-	if(argv[argc] == NULL) {
-		consoleprintf ("Failure in memory allocation \n");
-		close (fd);
-		fclose (fp);
-		if(command) {
-			free(command);
-			command = NULL;
-		}
-		return NULL;
-	}
-	strcpy (argv[argc], ptr);
-	argc++;
-
-	/* Get more arguments if any to be passed to prcessve */
-	ptr = strtok(NULL, WHITESPACE);
-	while (ptr && (argc < MAX_ARGS))
-	{
-		ptrLen = strlen(ptr);
-
-		argv[argc] = (char*)malloc(ptrLen + 1);
-		if(argv[argc] == NULL) {
-			consoleprintf ("Failure in memory allocation \n");
-			close (fd);
-			fclose (fp);
-			if(command) {
-				free(command);
-				command = NULL;
-			}
-			return NULL;
-		}
-		strcpy (argv[argc], ptr);
-		argc++;
-
-		ptr = strtok(NULL, WHITESPACE);
-	}
-	argv[argc] = NULL;
-
-	FD_ZERO(&myfds);
-	FD_SET(fd, &myfds);
-
-	pid = processve(command, PROC_CURRENT_SPACE, NULL, &wiring,
-					&myfds, NULL, (const char **)argv );
-	if (pid == -1) {
-		consoleprintf ("Failure in processve call \n");
-		close (fd);
-		fclose(fp);
-		if(command) {
-			free(command);
-			command = NULL;
-		}
-		for(i=0; i<argc; i++) {
-			if(argv[i]) {
-				free(argv[i]);
-				argv[i] = NULL;
-			}
-		}
-		return NULL;
-	}
-
-	close (fd);
-	if(command) {
-		free(command);
-		command = NULL;
-	}
-	for(i=0; i<argc; i++) {
-		if(argv[i]) {
-			free(argv[i]);
-			argv[i] = NULL;
-		}
-	}
-
-	return fp;
-}
-
-
-int pclose(FILE* stream)
-{
-	fclose(stream);
-	return 0;
-}
-
-
-
-#if 0
-
-FILE* popen2(const char* commandline, const char* mode)
-{
-    int               err, count, var, replaced;
-    char              **env, pszPipestr[32];
-    NXVmId_t          newVM;
-    NXExecEnvSpec_t   envSpec;
-    char *command = NULL, *argv[MAX_ARGS] = {"\0"};
-    NXHandle_t fd;
-    
-    fd = (NXHandle_t) -1;
-    
-    count = NXGetEnvCount() + 1;  // (add one for NULL)
-    env   = (char **) NXMemAlloc(sizeof(char *) * count, 0);
-    
-    if (!env)
-        return 0;
-    
-    err = NXCopyEnv(env, count);  // ensure NULL added at end
-    if ( *mode='r'){
-        (void) tmpnam(strecpy(pszPipestr,  "PHPPIPE/stdin/"));
-        err = NXFifoOpen(0, pszPipestr, NX_O_RDONLY, 0, &fd);
-        if (err)
-            return 0;
-        
-        envSpec.esStdin.ssType     = NX_OBJ_CONSOLE;
-        envSpec.esStdout.ssType    = NX_OBJ_FIFO;
-        envSpec.esStdout.ssPath    = pszPipestr;
-    }
-    else if (*mode='w') then{
-        (void) tmpnam(strecpy(pszPipestr, "PHPPIPE/stdout/"));
-        err = NXFifoOpen(0, instr, NX_O_WRONLY, 0, &fd);
-        if (err)
-            return 0;
-        envSpec.esStdin.ssType     = NX_OBJ_FIFO;
-        envSpec.esStdout.ssType    = NX_OBJ_CONSOLE;
-		envSpec.esStdin.ssPath     =  pszPipestr;
-    }
-    else
-        consoleprintf ("Unsupported pipe open mode \n");
-    
-    
-    /* Separate commandline string into words */
-    
-    ptr = strtok((char*)commandline, WHITESPACE);
-    ptrLen = strlen(ptr);
-    
-    command = (char*)malloc(ptrLen + 1);
-    strcpy (command, ptr);
-    
-    ptr = strtok(NULL, WHITESPACE);
-    while (ptr && (argc < MAX_ARGS))
-    {
-        ptrLen = strlen(ptr);
-        
-        argv[argc] = (char*)malloc(ptrLen + 1);
-        strcpy (argv[argc], ptr);
-        
-        argc++;
-        
-        ptr = strtok(NULL, WHITESPACE);
-    }
-/*    consoleprintf ("PHP | popen: command = %s\n", command); */
-    
-	//
-
-    envSpec.esArgc             = argc;
-    envSpec.esArgv             = argv;
-    envSpec.esEnv              = env;
-    
-    envSpec.esStderr.ssType    = NX_OBJ_CONSOLE;
-    
-    envSpec.esStdin.ssHandle   =
-        envSpec.esStdout.ssHandle  =
-        envSpec.esStderr.ssHandle  = -1;
-    
-    envSpec.esStdin.ssPathCtx  =
-        envSpec.esStdout.ssPathCtx =
-        envSpec.esStderr.ssPathCtx = NULL;
-    
-    envSpec.esStderr.ssPath    = NULL;
-    
-    err = NXVmSpawn(NULL, command, &envSpec, NX_VM_CREATE_DETACHED, &newVM);
-    return fd;
-    
-}
-
-int pclose2(FILE* stream)
-{
-	NXClose(*(NXHandle_t *)stream);
-    return 0;
-}
-
-FILE* popen1(const char* commandline, const char* mode)
-{
-    char *command = NULL, *argv[MAX_ARGS] = {"\0"};
-	char *tempName = "phpXXXXXX.tmp";
-    char *filePath = NULL;
-    FILE *fp = NULL;
-    char *ptr = NULL;
-    int ptrLen = 0, argc = 0, i = 0;
-
-    /* Check for validity of input parameters */
-    if (!commandline || !mode)
-        return NULL;
-
-    /* Get temporary file name */
-    filePath = mktemp(tempName);
-	if (!filePath)
-		return NULL;
-
-    /* Separate commandline string into words */
-
-    ptr = strtok((char*)commandline, WHITESPACE);
-    ptrLen = strlen(ptr);
-
-    command = (char*)malloc(ptrLen + 1);
-    strcpy (command, ptr);
-
-    ptr = strtok(NULL, WHITESPACE);
-    while (ptr && (argc < MAX_ARGS))
-    {
-        ptrLen = strlen(ptr);
-
-        argv[argc] = (char*)malloc(ptrLen + 1);
-        strcpy (argv[argc], ptr);
-
-        argc++;
-
-        ptr = strtok(NULL, WHITESPACE);
-    }
-/*consoleprintf ("PHP | popen: command = %s\n", command);*/
-    if(strchr(mode,'r') != 0)
-    {
-        /*spawnvp(P_WAIT, command, argv);*/
-
-        fp = fopen(filePath, "r"); /* Get the file handle of the pipe */
-    }
-	else if(strchr(mode,'w') != 0)
-        fp = fopen(filePath, "w"); /* Get the file handle of the pipe */
-
-    /* Free resources */
-    free (command);
-    for (i = 0; i < argc; i++)
-    {
-/*consoleprintf ("%s\t", argv[i]);*/
-        free (argv[i]);
-    }
-/*consoleprintf ("\n");*/
-
-	return fp;  /* Return the file handle.*/
-}
-
-int pclose1(FILE* stream)
-{
-    return (fclose(stream));
-}
-
-# endif
diff --git a/netware/pipe.h b/netware/pipe.h
deleted file mode 100644
index a54c8bf91..000000000
--- a/netware/pipe.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/* pipe related function declarations */
-
-/*#include <unistd.h>*/
-#include <proc.h>
-#include <fcntl.h>
-#include <sys/select.h>
-
-
-FILE* popen(const char* command, const char* mode);
-int pclose(FILE* stream);
diff --git a/netware/postgres_ext.h b/netware/postgres_ext.h
deleted file mode 100644
index d9f526415..000000000
--- a/netware/postgres_ext.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * postgres_ext.h
- *
- *	   This file contains declarations of things that are visible everywhere
- *	in PostgreSQL *and* are visible to clients of frontend interface libraries.
- *	For example, the Oid type is part of the API of libpq and other libraries.
- *
- *	   Declarations which are specific to a particular interface should
- *	go in the header file for that interface (such as libpq-fe.h).	This
- *	file is only for fundamental Postgres declarations.
- *
- *	   User-written C functions don't count as "external to Postgres."
- *	Those function much as local modifications to the backend itself, and
- *	use header files that are otherwise internal to Postgres to interface
- *	with the backend.
- *
- * $Id: postgres_ext.h,v 1.2 2003/01/03 11:46:20 hyanantha Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef POSTGRES_EXT_H
-#define POSTGRES_EXT_H
-
-/*
- * Object ID is a fundamental type in Postgres.
- */
-typedef unsigned int Oid;
-
-#define InvalidOid		((Oid) 0)
-
-#define OID_MAX  UINT_MAX
-/* you will need to include <limits.h> to use the above #define */
-
-
-/*
- * NAMEDATALEN is the max length for system identifiers (e.g. table names,
- * attribute names, function names, etc.)
- *
- * NOTE that databases with different NAMEDATALEN's cannot interoperate!
- */
-#define NAMEDATALEN 32
-
-#endif
diff --git a/netware/pwd.c b/netware/pwd.c
deleted file mode 100644
index 359e51553..000000000
--- a/netware/pwd.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  pwd.c - Try to approximate UN*X's getuser...() functions under MS-DOS.
-   Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-   $Header: /repository/php-src/netware/pwd.c,v 1.2 2003/01/03 11:46:20 hyanantha Exp $
- */
-
-/* This 'implementation' is conjectured from the use of this functions in
-   the RCS and BASH distributions.  Of course these functions don't do too
-   much useful things under MS-DOS, but using them avoids many "#ifdef
-   MSDOS" in ported UN*X code ...  */
-
-#include "php.h"				/*php specific */
-/* Need to take care of all the commented stuff later for NetWare */
-/*
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>  
-#include <lmaccess.h>
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-/*#include <lmapibuf.h>*/
-#include "pwd.h"
-#include "grp.h"
-
-#ifndef THREAD_SAFE
-static struct passwd pw;		/* should we return a malloc()'d structure   */
-#endif
-static char *home_dir = ".";	/* we feel (no|every)where at home */
-static char *login_shell = "not command.com!";
-
-struct passwd *getpwnam(char *name)
-{
-	return (struct passwd *) 0;
-}
-
-
-char *getlogin()
-{
-/*
-	static char name[256];
-	DWORD dw = 256;
-	GetUserName(name, &dw);
-	return name;
-*/
-    return NULL;    /* For now */
-}
-
-struct passwd *
- getpwuid(int uid)
-{
-	pw.pw_name = getlogin();
-	pw.pw_dir = home_dir;
-	pw.pw_shell = login_shell;
-	pw.pw_uid = 0;
-
-	return &pw;
-}
-
-/* Implementation for now */
-int getpid()
-{
-    return -1;
-}
-
-/*
- * Local Variables:
- * mode:C
- * ChangeLog:ChangeLog
- * compile-command:make
- * End:
- */
diff --git a/netware/pwd.h b/netware/pwd.h
deleted file mode 100644
index 646d5f33a..000000000
--- a/netware/pwd.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  pwd.h - Try to approximate UN*X's getuser...() functions under MS-DOS.
-   Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- */
-
-/* This 'implementation' is conjectured from the use of this functions in
-   the RCS and BASH distributions.  Of course these functions don't do too
-   much useful things under MS-DOS, but using them avoids many "#ifdef
-   MSDOS" in ported UN*X code ...
- */
-
-
-#ifndef PWD_H
-#define PWD_H
-
-/* Not available in LibC / SDK header or CodeWarrior header files.
- * So taking from Winsock definitions, which should be OK
- */
-typedef unsigned int DWORD;
-
-struct passwd {
-	char *pw_name;				/* user name */
-	char *pw_passwd;			/* encrypted password */
-	int pw_uid;					/* user uid */
-	int pw_gid;					/* user gid */
-	char *pw_comment;			/* comment */
-	char *pw_gecos;				/* Honeywell login info */
-	char *pw_dir;				/* home directory */
-	char *pw_shell;				/* default shell */
-};
-
-extern struct passwd *getpwuid(int);
-extern struct passwd *getpwnam(char *name);
-extern char *getlogin(void);
-
-#ifndef NEW_LIBC
-int getpid();
-#endif
-
-#endif
diff --git a/netware/sendmail_nw.h b/netware/sendmail_nw.h
index d1601fba0..b88f8e12a 100644
--- a/netware/sendmail_nw.h
+++ b/netware/sendmail_nw.h
@@ -1,12 +1,14 @@
 
+#define closesocket close
+#define LPCSTR char *
+#define LPSTR char*
+#define FAR
 #ifdef USE_WINSOCK
-/*#include <ws2nlm.h>*/
 #include <novsock2.h>
 #else
 #include <sys/socket.h>	/* For struct sockaddr, 'PF_INET' and 'AF_INET' */
 #include <netinet/in.h>	/* For struct sockaddr_in */
 #include <netdb.h>		/* For struct hostent */
-/*#include <ws2name.h>*/
 #endif	/* USE_WINSOCK */
 
 typedef int SOCKET;	/* Borrowed from winsock\novsock2.h */
diff --git a/netware/setbuild.bat b/netware/setbuild.bat
deleted file mode 100755
index a1685624e..000000000
--- a/netware/setbuild.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-
-if "%1" == "/?" goto USAGE
-
-if "%1" == "d" set BUILD=debug
-if "%1" == "r" set BUILD=release
-
-if "%2" == "1" set APACHE_VER=1.3
-if "%2" == "2" set APACHE_VER=2
-
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: setbuild d|r 1|2
- @echo set build type as 'debug' or 'release'
- @echo set Web Server as Apache 1.3.x or Apache 2.0.x
-
-:EXIT
-\ No newline at end of file
diff --git a/netware/sys/stat.h b/netware/sys/stat.h
deleted file mode 100644
index e6f741cc5..000000000
--- a/netware/sys/stat.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Novell, Inc.                                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef __sys_stat_h__
-#define __sys_stat_h__
-
-
-#include <time.h>
-#include <stddef.h>
-#include <sys/mode.h>
-#include <sys/time.h>
-
-#include <pshpack1.h>
-
-
-#ifdef CLIB_STAT_PATCH
-
-/***************** stat structure taken from CLib and modified ***************/
-struct stat 
-{
-   long           st_dev;        /* volume number                         */    /* dev_t replaced by long */
-   MACHINE_WORD   st_ino;        /* directory entry number of the st_name */    /* ino_t replaced by MACHINE_WORD */
-   unsigned short st_mode;       /* emulated file mode                    */
-   unsigned short st_pad1;       /* reserved for alignment                */
-   unsigned long  st_nlink;      /* count of hard links (always 1)        */
-   unsigned long  st_uid;        /* object id of owner                    */
-   unsigned long  st_gid;        /* group-id (always 0)                   */
-   long           st_rdev;       /* device type (always 0)                */    /* dev_t replaced by long */
-   off_t          st_size;       /* total file size--files only           */
-   time_t         st_atime;      /* last access date--files only          */
-   time_t         st_mtime;      /* last modify date and time             */
-   time_t         st_ctime;      /* POSIX: last status change time...     */
-                                 /* ...NetWare: creation date/time        */
-   time_t         st_btime;      /* last archived date and time           */
-   unsigned long  st_attr;       /* file attributes                       */
-   unsigned long  st_archivedID; /* user/object ID of last archive        */
-   unsigned long  st_updatedID;  /* user/object ID of last update         */
-   unsigned short st_inheritedRightsMask;  /* inherited rights mask       */
-   unsigned short st_pad2;       /* reserved for alignment                */
-   unsigned int   st_originatingNameSpace; /* namespace of creation       */
-   size_t         st_blksize;    /* block size for allocation--files only */
-   size_t         st_blocks;     /* count of blocks allocated to file     */
-   unsigned int   st_flags;      /* user-defined flags                    */
-   unsigned long  st_spare[4];   /* for future use                        */
-   unsigned char  st_name[255+1];/* TARGET_NAMESPACE name                 */
-};
-/***************** stat structure taken from CLib and modified ***************/
-
-struct stat_libc
-{
-   uint32_t   st_userspec; /* untouched by stat()                   */
-   uint32_t   st_flags;    /* flags for this entry                  */
-   mode_t     st_mode;     /* emulated file mode                    */
-   uint32_t   st_spare1;
-   uint64_t   st_gen;      /* generation number of inode            */
-   ino_t      st_ino;      /* directory entry number                */
-   dev_t      st_dev;      /* volume number                         */
-   dev_t      st_rdev;     /* device type (always 0)                */
-   off64_t    st_size;     /* total file size                       */
-   uint64_t   st_spare2;
-   blkcnt_t   st_blocks;   /* count of blocks allocated to file     */
-   blksize_t  st_blksize;  /* block size for allocation--files only */
-   nlink_t    st_nlink;    /* count of hard links (always 1)        */
-   uint32_t   st_spare3[3];
-   uid_t      st_uid;      /* owner (object) identity               */
-   gid_t      st_gid;      /* group-id (always 0)                   */
-   uid_t      st_bid;      /* identity of last archiver             */
-   uid_t      st_mid;      /* identity of last updator              */
-   timespec_t st_atime;    /* last access date--files only          */
-   timespec_t st_mtime;    /* last modify date and time             */
-   timespec_t st_ctime;    /* last file attributes modification     */
-   timespec_t st_btime;    /* last archived date and time           */
-   uint64_t   st_spare4[44];
-};                         /* sizeof(struct dirent) == 0x200 (512.) */
-
-#else	/* CLIB_STAT_PATCH */
-
-struct stat
-{
-   uint32_t   st_userspec; /* untouched by stat()                   */
-   uint32_t   st_flags;    /* flags for this entry                  */
-   mode_t     st_mode;     /* emulated file mode                    */
-   uint32_t   st_spare1;
-   uint64_t   st_gen;      /* generation number of inode            */
-   ino_t      st_ino;      /* directory entry number                */
-   dev_t      st_dev;      /* volume number                         */
-   dev_t      st_rdev;     /* device type (always 0)                */
-   off64_t    st_size;     /* total file size                       */
-   uint64_t   st_spare2;
-   blkcnt_t   st_blocks;   /* count of blocks allocated to file     */
-   blksize_t  st_blksize;  /* block size for allocation--files only */
-   nlink_t    st_nlink;    /* count of hard links (always 1)        */
-   uint32_t   st_spare3[3];
-   uid_t      st_uid;      /* owner (object) identity               */
-   gid_t      st_gid;      /* group-id (always 0)                   */
-   uid_t      st_bid;      /* identity of last archiver             */
-   uid_t      st_mid;      /* identity of last updator              */
-   timespec_t st_atime;    /* last access date--files only          */
-   timespec_t st_mtime;    /* last modify date and time             */
-   timespec_t st_ctime;    /* last file attributes modification     */
-   timespec_t st_btime;    /* last archived date and time           */
-   uint64_t   st_spare4[44];
-};                         /* sizeof(struct dirent) == 0x200 (512.) */
-
-#endif	/* CLIB_STAT_PATCH */
-
-
-#include <poppack.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-int    chmod ( const char *path,     mode_t mode        );
-int    fchmod( int fildes,           mode_t mode        );
-int    fstat ( int fildes,           struct stat *buf );
-int    mkdir ( const char *pathname, mode_t mode        );
-int    mkfifo( const char *pathname, mode_t mode        );
-int    stat  ( const char *path,     struct stat *buf );
-mode_t umask (                       mode_t cmask       );
-
-#ifdef __cplusplus
-}
-#endif
-
-#define stat64  stat       /* same structure and function do both   */
-#define fstat64 fstat      /* same function does both               */
-
-
-#endif	/* __sys_stat_h__ */
diff --git a/netware/sysexits.h b/netware/sysexits.h
deleted file mode 100644
index 37246b6e7..000000000
--- a/netware/sysexits.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sysexits.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_SYSEXITS_H
-#define	_SYSEXITS_H 1
-
-/*
- *  SYSEXITS.H -- Exit status codes for system programs.
- *
- *	This include file attempts to categorize possible error
- *	exit statuses for system programs, notably delivermail
- *	and the Berkeley network.
- *
- *	Error numbers begin at EX__BASE to reduce the possibility of
- *	clashing with other exit statuses that random programs may
- *	already return.  The meaning of the codes is approximately
- *	as follows:
- *
- *	EX_USAGE -- The command was used incorrectly, e.g., with
- *		the wrong number of arguments, a bad flag, a bad
- *		syntax in a parameter, or whatever.
- *	EX_DATAERR -- The input data was incorrect in some way.
- *		This should only be used for user's data & not
- *		system files.
- *	EX_NOINPUT -- An input file (not a system file) did not
- *		exist or was not readable.  This could also include
- *		errors like "No message" to a mailer (if it cared
- *		to catch it).
- *	EX_NOUSER -- The user specified did not exist.  This might
- *		be used for mail addresses or remote logins.
- *	EX_NOHOST -- The host specified did not exist.  This is used
- *		in mail addresses or network requests.
- *	EX_UNAVAILABLE -- A service is unavailable.  This can occur
- *		if a support program or file does not exist.  This
- *		can also be used as a catchall message when something
- *		you wanted to do doesn't work, but you don't know
- *		why.
- *	EX_SOFTWARE -- An internal software error has been detected.
- *		This should be limited to non-operating system related
- *		errors as possible.
- *	EX_OSERR -- An operating system error has been detected.
- *		This is intended to be used for such things as "cannot
- *		fork", "cannot create pipe", or the like.  It includes
- *		things like getuid returning a user that does not
- *		exist in the passwd file.
- *	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
- *		etc.) does not exist, cannot be opened, or has some
- *		sort of error (e.g., syntax error).
- *	EX_CANTCREAT -- A (user specified) output file cannot be
- *		created.
- *	EX_IOERR -- An error occurred while doing I/O on some file.
- *	EX_TEMPFAIL -- temporary failure, indicating something that
- *		is not really an error.  In sendmail, this means
- *		that a mailer (e.g.) could not create a connection,
- *		and the request should be reattempted later.
- *	EX_PROTOCOL -- the remote system returned something that
- *		was "not possible" during a protocol exchange.
- *	EX_NOPERM -- You did not have sufficient permission to
- *		perform the operation.  This is not intended for
- *		file system problems, which should use NOINPUT or
- *		CANTCREAT, but rather for higher level permissions.
- */
-
-#define EX_OK		0	/* successful termination */
-
-#define EX__BASE	64	/* base value for error messages */
-
-#define EX_USAGE	64	/* command line usage error */
-#define EX_DATAERR	65	/* data format error */
-#define EX_NOINPUT	66	/* cannot open input */
-#define EX_NOUSER	67	/* addressee unknown */
-#define EX_NOHOST	68	/* host name unknown */
-#define EX_UNAVAILABLE	69	/* service unavailable */
-#define EX_SOFTWARE	70	/* internal software error */
-#define EX_OSERR	71	/* system error (e.g., can't fork) */
-#define EX_OSFILE	72	/* critical OS file missing */
-#define EX_CANTCREAT	73	/* can't create (user) output file */
-#define EX_IOERR	74	/* input/output error */
-#define EX_TEMPFAIL	75	/* temp failure; user is invited to retry */
-#define EX_PROTOCOL	76	/* remote error in protocol */
-#define EX_NOPERM	77	/* permission denied */
-#define EX_CONFIG	78	/* configuration error */
-
-#define EX__MAX	78	/* maximum listed value */
-
-#endif /* sysexits.h */
diff --git a/netware/time_nw.c b/netware/time_nw.c
deleted file mode 100644
index d4d8c7b78..000000000
--- a/netware/time_nw.c
+++ /dev/null
@@ -1,246 +0,0 @@
-
-/*****************************************************************************
- *                                                                           *
- * DH_TIME.C                                                                 *
- *                                                                           *
- * Freely redistributable and modifiable.  Use at your own risk.             *
- *                                                                           *
- * Copyright 1994 The Downhill Project                                       *
- * 
- * Modified by Shane Caraveo for use with PHP
- *
- *****************************************************************************/
-
-/* $Id: time_nw.c,v 1.2 2003/01/03 11:46:20 hyanantha Exp $ */
-
- /**
-  *
-  * 04-Feb-2001
-  *   - Added patch by "Vanhanen, Reijo" <Reijo.Vanhanen@helsoft.fi>
-  *     Improves accuracy of msec
-  */
-
-/* Include stuff ************************************************************ */
-
-#include "time_nw.h"
-#include "unistd.h"
-#include "signal.h"
-/*#include <winbase.h>
-#include <mmsystem.h>*/
-#include <errno.h>
-/*
-int getfilesystemtime(struct timeval *time_Info) 
-{
-FILETIME ft;
-__int64 ff;
-
-    GetSystemTimeAsFileTime(&ft);   *//* 100 ns blocks since 01-Jan-1641 *//*
-                                    *//* resolution seems to be 0.01 sec *//*
-    ff = *(__int64*)(&ft);
-    time_Info->tv_sec = (int)(ff/(__int64)10000000-(__int64)11644473600);
-    time_Info->tv_usec = (int)(ff % 10000000)/10;
-    return 0;
-}
-*/
- 
-
-int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Info)
-{
-#ifdef NETWARE
-    return 0;
-#else
-	static struct timeval starttime = {0, 0};
-	static __int64 lasttime = 0;
-	static __int64 freq = 0;
-	__int64 timer;
-	LARGE_INTEGER li;
-	BOOL b;
-	double dt;
-
-	/* Get the time, if they want it */
-	if (time_Info != NULL) {
-		if (starttime.tv_sec == 0) {
-            b = QueryPerformanceFrequency(&li);
-            if (!b) {
-                starttime.tv_sec = -1;
-            }
-            else {
-                freq = li.QuadPart;
-                b = QueryPerformanceCounter(&li);
-                if (!b) {
-                    starttime.tv_sec = -1;
-                }
-                else {
-                    getfilesystemtime(&starttime);
-                    timer = li.QuadPart;
-                    dt = (double)timer/freq;
-                    starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
-                    if (starttime.tv_usec < 0) {
-                        starttime.tv_usec += 1000000;
-                        --starttime.tv_sec;
-                    }
-                    starttime.tv_sec -= (int)dt;
-                }
-            }
-        }
-        if (starttime.tv_sec > 0) {
-            b = QueryPerformanceCounter(&li);
-            if (!b) {
-                starttime.tv_sec = -1;
-            }
-            else {
-                timer = li.QuadPart;
-                if (timer < lasttime) {
-                    getfilesystemtime(time_Info);
-                    dt = (double)timer/freq;
-                    starttime = *time_Info;
-                    starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
-                    if (starttime.tv_usec < 0) {
-                        starttime.tv_usec += 1000000;
-                        --starttime.tv_sec;
-                    }
-                    starttime.tv_sec -= (int)dt;
-                }
-                else {
-                    lasttime = timer;
-                    dt = (double)timer/freq;
-                    time_Info->tv_sec = starttime.tv_sec + (int)dt;
-                    time_Info->tv_usec = starttime.tv_usec + (int)((dt-(int)dt)*1000000);
-                    if (time_Info->tv_usec > 1000000) {
-                        time_Info->tv_usec -= 1000000;
-                        ++time_Info->tv_sec;
-                    }
-                }
-            }
-        }
-        if (starttime.tv_sec < 0) {
-            getfilesystemtime(time_Info);
-        }
-
-	}
-	/* Get the timezone, if they want it */
-	if (timezone_Info != NULL) {
-		_tzset();
-		timezone_Info->tz_minuteswest = _timezone;
-		timezone_Info->tz_dsttime = _daylight;
-	}
-	/* And return */
-	return 0;
-#endif
-}
-
-
-/* this usleep isnt exactly accurate but should do ok */
-/*
-void usleep(unsigned int useconds)
-{
-struct timeval tnow, tthen, t0;
-
-	gettimeofday(&tthen, NULL);
-    t0 = tthen;
-    tthen.tv_usec += useconds;
-    while (tthen.tv_usec > 1000000) {
-        tthen.tv_usec -= 1000000;
-        tthen.tv_sec++;
-    }
-    
-	if (useconds > 10000) {
-        useconds -= 10000;
-        Sleep(useconds/1000);
-    }
-    
-	while (1) {
-        gettimeofday(&tnow, NULL);
-        if (tnow.tv_sec > tthen.tv_sec) {
-            break;
-        }
-        if (tnow.tv_sec == tthen.tv_sec) {
-            if (tnow.tv_usec > tthen.tv_usec) {
-                break;
-            }
-        }
-    }
-}
-*/
-
-#ifdef HAVE_SETITIMER
-
-/*
-#ifndef THREAD_SAFE
-unsigned int proftimer, virttimer, realtimer;
-extern LPMSG phpmsg;
-#endif
-
-struct timer_msg {
-	int signal;
-	unsigned int threadid;
-};
-
-
-LPTIMECALLBACK setitimer_timeout(UINT uTimerID, UINT info, DWORD dwUser, DWORD dw1, DWORD dw2)
-{
-	struct timer_msg *msg = (struct timer_msg *) info;
-
-	if (msg) {
-		raise((int) msg->signal);
-		PostThreadMessage(msg->threadid,
-						  WM_NOTIFY, msg->signal, 0);
-		free(msg);
-	}
-	return 0;
-}
-
-int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue)
-{
-	int timeout = value->it_value.tv_sec * 1000 + value->it_value.tv_usec;
-	int repeat = TIME_ONESHOT;
-*/
-	/*make sure the message queue is initialized *//*
-	PeekMessage(phpmsg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
-	if (timeout > 0) {
-		struct timer_msg *msg = malloc(sizeof(struct timer_msg));
-		msg->threadid = GetCurrentThreadId();
-		if (!ovalue) {
-			repeat = TIME_PERIODIC;
-		}
-		switch (which) {
-			case ITIMER_REAL:
-				msg->signal = SIGALRM;
-				realtimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-				break;
-			case ITIMER_VIRT:
-				msg->signal = SIGVTALRM;
-				virttimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-				break;
-			case ITIMER_PROF:
-				msg->signal = SIGPROF;
-				proftimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-				break;
-			default:
-				errno = EINVAL;
-				return -1;
-				break;
-		}
-	} else {
-		switch (which) {
-			case ITIMER_REAL:
-				timeKillEvent(realtimer);
-				break;
-			case ITIMER_VIRT:
-				timeKillEvent(virttimer);
-				break;
-			case ITIMER_PROF:
-				timeKillEvent(proftimer);
-				break;
-			default:
-				errno = EINVAL;
-				return -1;
-				break;
-		}
-	}
-
-
-	return 0;
-}
-*/
-#endif
diff --git a/netware/time_nw.h b/netware/time_nw.h
deleted file mode 100644
index c67065fdf..000000000
--- a/netware/time_nw.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- *                                                                           *
- * sys/time.h                                                                *
- *                                                                           *
- * Freely redistributable and modifiable.  Use at your own risk.             *
- *                                                                           *
- * Copyright 1994 The Downhill Project                                       *
- *
- * Modified by Shane Caraveo for PHP
- *
- *****************************************************************************/
-#ifndef TIME_H
-#define TIME_H
-
-/* Include stuff ************************************************************ */
-#ifdef USE_WINSOCK
-/*#include <ws2nlm.h>*/
-#include <novsock2.h>
-#else
-#include <sys/socket.h>
-#endif
-#include <time.h>
-
-/*
-Commented out most of the stuff for now, since we dunno the utility right now 
-*/
-
-/* Struct stuff ************************************************************* */
-/*
-struct {
-	int tz_minuteswest;
-	int tz_dsttime;
-} timezone;
-*/
-/*
-struct {
-	struct timeval it_interval;	*//* next value *//*
-	struct timeval it_value;	*//* current value *//*
-} itimerval;
-*/
-#define ITIMER_REAL    0		/*generates sigalrm */
-#define ITIMER_VIRTUAL 1		/*generates sigvtalrm */
-#define ITIMER_VIRT    1		/*generates sigvtalrm */
-#define ITIMER_PROF    2		/*generates sigprof */
-
-/* Prototype stuff ********************************************************** */
-/*
-extern int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Info);
-*/
-
-/* setitimer operates at 100 millisecond resolution */
-/*
-extern int setitimer(int which, const struct itimerval *value,
-					 struct itimerval *ovalue);
-*/
-
-#endif
diff --git a/netware/tsrm.mak b/netware/tsrm.mak
deleted file mode 100644
index d0088ecb4..000000000
--- a/netware/tsrm.mak
+++ /dev/null
@@ -1,109 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = TSRM
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-CPP_SRC = 
-C_SRC = TSRM.c \
-        tsrm_nw.c \
-        tsrm_strtok_r.c \
-        tsrm_virtual_cwd.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS  += -DZTS -DNETWARE -DHAVE_DIRENT_H=1
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS  += -DUSE_MKFIFO
-C_FLAGS  += -DCLIB_STAT_PATCH
-#C_FLAGS  += -DUSE_MPK		# To use the LibC recursive mutex locking
-C_FLAGS  += -I. -I- -I../netware -I$(SDK_DIR)/include	# ../netware added for special SYS/STAT.H
-C_FLAGS  += -I$(MPK_DIR)/include1
-C_FLAGS  += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics -DTSRM_DEBUG=1
-	LD_FLAGS += -sym codeview4 -sym internal
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline smart -inline auto -sym off -DTSRM_DEBUG=0
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-	
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-$(BINARY): $(OBJECTS)
-	@echo Linking $@...
-	@$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
diff --git a/netware/wfile.c b/netware/wfile.c
deleted file mode 100644
index a887ee93d..000000000
--- a/netware/wfile.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* Function borrowed from the Downhill Project */
-#include "wfile.h"
-/*#include "direct.h"*/ /* Can't find this file */
-
-int readlink(char *file_Name, char *buf_Mem, int buf_Size)
-{
-	/* See if the file exists */
-	if (access(file_Name, X_OK) == -1) {
-		errno = ENOENT;
-	} else {
-		errno = EINVAL;
-	}
-
-	/* Either way, it's not a link */
-	return -1;
-}
diff --git a/netware/wfile.h b/netware/wfile.h
deleted file mode 100644
index 7a9614c2c..000000000
--- a/netware/wfile.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*#include  <io.h> */
-#include  <stdio.h>
-#include  <stdlib.h>
-#include  <errno.h>
-
-#define access _access
-#define X_OK	0
-#ifndef ENOENT
-#define ENOENT	136
-#endif
-#ifndef EINVAL
-#define EINVAL	131
-#endif
-
-int readlink(char *, char *, int);
-int checkroot(char *path);
diff --git a/netware/zend.mak b/netware/zend.mak
deleted file mode 100644
index 77b107480..000000000
--- a/netware/zend.mak
+++ /dev/null
@@ -1,158 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = ZEND
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-C_SRC = zend.c \
-        zend_alloc.c \
-        zend_API.c \
-        zend_builtin_functions.c \
-        zend_compile.c \
-        zend_constants.c \
-        zend_dynamic_array.c \
-        zend_execute.c \
-        zend_execute_API.c \
-        zend_extensions.c \
-        zend_hash.c \
-        zend_highlight.c \
-        zend_indent.c \
-        zend_ini.c \
-        zend_ini_parser.c \
-        zend_ini_scanner.c \
-        zend_language_parser.c \
-        zend_language_scanner.c \
-        zend_list.c \
-        zend_llist.c \
-        zend_multibyte.c \
-        zend_opcode.c \
-        zend_operators.c \
-        zend_ptr_stack.c \
-        zend_qsort.c \
-        zend_sprintf.c \
-        zend_stack.c \
-        zend_static_allocator.c \
-        zend_variables.c
-
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle std
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED
-C_FLAGS += -DNETWARE -DZTS
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DTHREAD_SWITCH
-
-# These are required to use dlclose so that the PHP extensions are automatically unloaded
-# when apache is unloaded
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-
-C_FLAGS += -I. -I- -I../netware -I$(SDK_DIR)/include	# ../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	C_FLAGS  += -DZEND_DEBUG=1
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics
-	LD_FLAGS += -sym codeview4 -sym internal
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline auto -sym off
-	C_FLAGS  += -DZEND_DEBUG=0
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-	@echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-	
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Linking $@...
-	@$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleansrc
-cleansrc:
-	@echo Deleting all generated source files...
-	-@del "zend_ini_parser.c"
-	-@del "zend_ini_parser.h"
-	-@del "zend_ini_scanner.c"
-	-@del "zend_language_parser.c"
-	-@del "zend_language_parser.h"
-	-@del "zend_language_scanner.c"
-	-@del "zend_ini_parser.output"
-	-@del "zend_language_parser.output"
-
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
-