From 71e5a590e49f6a81380573aff3396baf9e7f386d Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 27 Nov 2004 08:18:10 +0000
Subject: [PATCH] * vms_make.com: Include ftbbox.c. Fix `ccopt'. Handle
 `otvalid' module. Update `vmslib.dat' default values. Fixes to `libs.opt'.

---
 ChangeLog        |  8 ++++++++
 devel/ftoption.h |  2 +-
 vms_make.com     | 52 ++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4eeb01cb..32c42bd9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-26  Jouk Jansen  <joukj@hrem.stm.tudelft.nl>
+
+	* vms_make.com: Include ftbbox.c.
+	Fix `ccopt'.
+	Handle `otvalid' module.
+	Update `vmslib.dat' default values.
+	Fixes to `libs.opt'.
+
 2004-11-23  Anders Kaseorg  <anders@kaseorg.com>
 
 	* src/base/ftoutln.c (FT_OrientationExtremumRec,
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 177e40a6e..9aef01379 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -448,7 +448,7 @@ FT_BEGIN_HEADER
   /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
   /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated.               */
   /*                                                                       */
-#define TT_CONFIG_OPTION_UNPATENTED_HINTING
+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
 
 
   /*************************************************************************/
diff --git a/vms_make.com b/vms_make.com
index da5e0b1f6..26d31b995 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -37,7 +37,7 @@ $!
 $! Setup variables holding "config" information
 $!
 $ Make    = ""
-$ ccopt   = ""
+$ ccopt   = "/name=as_is/float=ieee"
 $ lopts   = ""
 $ dnsrl   = ""
 $ aconf_in_file = "config.hin"
@@ -68,6 +68,7 @@ $!
 $! Pull in external libraries
 $!
 $ create libs.opt
+$ open/write libsf libs.opt
 $ gosub check_create_vmslib
 $!
 $! Create objects
@@ -198,6 +199,8 @@ all :
         $(MMS)$(MMSQUALIFIERS)
         set default [-.lzw]
         $(MMS)$(MMSQUALIFIERS)
+        set default [-.otvalid]
+        $(MMS)$(MMSQUALIFIERS)
         set default [-.pcf]
         $(MMS)$(MMSQUALIFIERS)
         set default [-.pfr]
@@ -343,7 +346,7 @@ $ deck
 CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
 
 OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,\
-     fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj
+     fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj
 
 all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
@@ -571,6 +574,36 @@ all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
 
 
+# EOF
+$ eod
+$ close out
+$ write sys$output "... [.src.otvalid] directory"
+$ create [.src.otvalid]descrip.mms
+$ open/append out [.src.otvalid]descrip.mms
+$ copy sys$input: out
+$ deck
+#
+# FreeType 2 OpenType validation module compilation rules for VMS
+#
+
+
+# Copyright 2004 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.otvalid])
+
+OBJS=otvalid.obj
+
+all : $(OBJS)
+        library [--.lib]freetype.olb $(OBJS)
+
 # EOF
 $ eod
 $ close out
@@ -1042,7 +1075,7 @@ $   type/out=vmslib.dat sys$input
 !      5.) CPP define to pass to the build to indicate availability of 
 !          the library
 !
-! Example: The following  lines show how definitions  
+! Example: The following lines show how definitions  
 !          might look like. They are site specific and the locations of the 
 !          library and include files need almost certainly to be changed.
 ! 
@@ -1050,7 +1083,7 @@ $   type/out=vmslib.dat sys$input
 !
 !   ZLIB:     http://zinser.no-ip.info/vms/sw/zlib.htmlx
 !
-!ZLIB # pubbin:libzshr.exe # public$root:[util.libs.zlib] # zlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
+ZLIB # sys$library:libz.olb # sys$library: # zlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
 $   write sys$output "New driver file vmslib.dat created."
 $   write sys$output "Please customize libary locations for your site"
 $   write sys$output "and afterwards re-execute ''myproc'"
@@ -1184,6 +1217,12 @@ $ then
 $   write sys$output "ANAL_SKP_SHR-i-skipshare, ''line'"
 $   goto loop
 $ endif
+$ if f$locate("/LIB",f$edit(line,"upcase")) .lt. f$length(line)
+$ then
+$   write libsf line
+$   write sys$output "ANAL_SKP_LIB-i-skiplib, ''line'"
+$   goto loop
+$ endif
 $ f= f$search(line)
 $ if f .eqs. ""
 $ then
@@ -1215,7 +1254,7 @@ $ search c.tmp "symbol:"/out=d.tmp
 $ def/user sys$output nl:
 $ edito/edt/command=sys$input d.tmp
 sub/symbol: "/symbol_vector=(/whole
-sub/"/=procedure)/whole
+sub/"/=PROCEDURE)/whole
 exit
 $ ! all data
 $ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
@@ -1223,13 +1262,14 @@ $ search e.tmp "symbol:"/out=f.tmp
 $ def/user sys$output nl:
 $ edito/edt/command=sys$input f.tmp
 sub/symbol: "/symbol_vector=(/whole
-sub/"/=data)/whole
+sub/"/=DATA)/whole
 exit
 $ sort/nodupl d.tmp,f.tmp 'p2'
 $ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*
 $ if f$search("x.tmp") .nes. "" -
 	then $ delete x.tmp;*
 $!
+$ close libsf
 $ EXIT_AA:
 $ if V then set verify
 $ endsubroutine