updates for build on OpenVMS

sys/vms/Makefile_src.vms

@@ -114,10 +114,10 @@ HACK_H = $(addsuffix .h, $(addprefix $(INCL), $(CONFIGBASEH) $(HACKBASEH)))
 # all .c that are part of the main NetHack program and are not
 # operating-system or windowing-system specific.
 # Do not include date.c in this list.
-HACKFILES := allmain alloc apply artifact attrib ball bones \
-	   botl calendar cmd coloratt dbridge decl detect dig display dlb do \
-	   do_name do_wear dog dogmove dokick dothrow drawing \
-	   dungeon eat end engrave exper explode extralev \
+HACKFILES := allmain alloc apply artifact attrib ball bones botl \
+	   calendar cfgfiles cmd coloratt dbridge decl detect \
+	   dig display dlb do do_name do_wear dog dogmove dokick \
+           dothrow drawing dungeon eat end engrave exper explode extralev \
 	   files fountain getpos glyphs hack hacklib insight invent isaac64 \
 	   light lock mail makemon mcastu mdlib mhitm mhitu minion mklev \
 	   mkmap mkmaze mkobj mkroom mon \

sys/vms/Makefile_utl.vms

@@ -113,7 +113,7 @@ ODATE = $(OBJDIR)date.obj
 MAKEOBJS = []makedefs.obj $(OMONOBJ) $(ODATE) $(OALLOC) $(OPANIC)
 
 # object files for recovery utility
-RECOVOBJS = $(TARGETPFX)recover.obj
+RECOVOBJS = $(TARGETPFX)recover.obj $(TARGETPFX)recover_ver.obj
 
 # object files for the data librarian
 DLBOBJS = dlb_main.obj $(OBJDIR)dlb.obj $(OALLOC) $(OPANIC)
@@ -140,9 +140,9 @@ $(HACKLIB): $(HACKLIBOBJS) [-.util]panic.obj
 #	dependencies for makedefs
 #
 
-makedefs.exe:	$(HACKLIB) $(MAKEOBJS) placeholder.obj mdgrep.h
+makedefs.exe:	$(HACKLIB) $(MAKEOBJS) uplaceholder.obj mdgrep.h
 	$(CLINK) $(LFLAGS) /EXE=$@ \
-		$(addsuffix $(comma),$(MAKEOBJS)) placeholder.obj, \
+		$(addsuffix $(comma),$(MAKEOBJS)) uplaceholder.obj, \
 		$(HACKLIB)/lib
 
 # note: the headers listed here are maintained manually rather than via
@@ -158,10 +158,10 @@ makedefs.obj: makedefs.c $(SRC)mdlib.c $(CONFIG_H) \
 		$(INCL)dlb.h $(INCL)patchlevel.h mdgrep.h
 	$(CC) $(CFLAGS) $(CSTD) makedefs.c /OBJ=$@
 
-placeholder.c:
-	echo int makedefs_placeholder = 1; >$@
+uplaceholder.c:
+	echo int uplaceholder = 1; >$@
 
-placeholder.obj: placeholder.c
+uplaceholder.obj: uplaceholder.c
 
 
 # Don't require perl to build; that is why mdgrep.h is spelled wrong below.
@@ -193,13 +193,18 @@ panic.obj:     panic.c $(CONFIG_H)
 #
 #	dependencies for recover
 #
-$(TARGETPFX)recover.exe: $(HACKLIB) $(RECOVOBJS)
+$(TARGETPFX)recover.exe: $(HACKLIB) $(RECOVOBJS) uplaceholder.obj
 	$(TARGET_CLINK) $(TARGET_LFLAGS) /EXE=$@ \
-	$(RECOVOBJS),$(HACKLIB)/lib $(LIBS)
+	$(addsuffix $(comma),$(RECOVOBJS)) uplaceholder.obj, \
+	$(HACKLIB)/lib $(LIBS)
 
 $(TARGETPFX)recover.obj: recover.c $(CONFIG_H)
 	$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) recover.c /OBJ=$@
 
+$(TARGETPFX)recover_ver.obj: [-.src]version.c $(HACK_H)
+	$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) \
+		/DEFINE=(MINIMAL_FOR_RECOVER) \
+		[-.src]version.c /OBJ=$@
 
 #	dependencies for dlb
 #

sys/vms/vmsmain.c

@@ -81,7 +81,7 @@ main(int argc, char *argv[])
 
         if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
             gd.deferred_showpaths = TRUE;
-            return;
+            return 0;
         }
         if (argcheck(argc, argv, ARG_DEBUG) == 1) {
             argc--;

sys/vms/vmstty.c

@@ -459,7 +459,7 @@ void
 settty(const char *s)
 {
     if (!bombing)
-        end_screen();
+        term_end_screen();
     if (s)
         raw_print(s);
     if (settty_needed) {