Rename templates to match names in makefiles/Makefile.* and include/port.

Read templates after compiler is detected. Convert all templates to real
shell scripts. Rename bsd->openbsd, alpha->osf.

53 files changed, 174 insertions, 342 deletions

diff --git a/src/include/port/bsd.h b/src/include/port/openbsd.h
index dc019303250..dc019303250 100644
--- a/src/include/port/bsd.h
+++ b/src/include/port/openbsd.h
diff --git a/src/include/port/alpha.h b/src/include/port/osf.h
index 90c5a8af6cf..90c5a8af6cf 100644
--- a/src/include/port/alpha.h
+++ b/src/include/port/osf.h
diff --git a/src/makefiles/Makefile.bsd b/src/makefiles/Makefile.openbsd
index 14ebbfecf33..14ebbfecf33 100644
--- a/src/makefiles/Makefile.bsd
+++ b/src/makefiles/Makefile.openbsd
diff --git a/src/makefiles/Makefile.alpha b/src/makefiles/Makefile.osf
index a9e8e948ec6..a9e8e948ec6 100644
--- a/src/makefiles/Makefile.alpha
+++ b/src/makefiles/Makefile.osf
diff --git a/src/template/.similar b/src/template/.similar
deleted file mode 100644
index f19ce14d034..00000000000
--- a/src/template/.similar
+++ /dev/null
@@ -1,34 +0,0 @@
-# Format of this file is expr-style-regular-expression=templatefilename
-alpha[a-z0-9]*-unknown-linux-gnu=linux_alpha
-alpha[a-z0-9]*-dec-osf=alpha_cc
-arm-unknown-linux-gnu=linux_arm
-hppa[0-9.]*-hp-hpux=hpux_cc
-hppa1.1-stratus-sysv4=svr4
-i.86-next-nextstep3=nextstep
-i.86-pc-bsdi2.0=bsdi_2.0
-i.86-pc-bsdi2.1=bsdi_2.1
-i.86-pc-bsdi3=bsdi_2.1
-i.86-pc-bsdi4=bsdi_4.0
-i.86-pc-cygwin=cygwin32
-i.86-pc-linux-gnu=linux_i386
-i.86-pc-sco3.2v=sco
-i.86-pc-solaris=solaris_i386_gcc
-i.86-pc-sunos5=solaris_i386_gcc
-i.86-unknown-freebsd=freebsd
-i.86-unknown-netbsd=netbsd
-m68k-unknown-linux=linux_m68k
-mips-pc-linux-gnu=linux_mips
-mips-sgi-irix=irix5
-mipsel-unknown-linux-gnu=linux_mips
-powerpc-ibm-aix3.2.5=aix_325
-powerpc-ibm-aix4.1=aix_41
-powerpc-ibm-aix4.2=aix_42
-powerpc-ibm-aix4.3=aix_42
-powerpc-unknown-linux-gnu=linux_ppc
-rs6000-ibm-aix4.2=aix_42
-rs6000-ibm-aix4.3=aix_42
-sparc-sun-solaris=solaris_sparc_gcc
-sparc-sun-sunos4=sunos4_gcc
-sparc-sun-sunos5=solaris_sparc_gcc
-sparc-unknown-bsdi4=bsdi_4.0_sparc
-sparc-unknown-linux-gnu=linux_sparc
diff --git a/src/template/aix b/src/template/aix
new file mode 100644
index 00000000000..8b81c6e1549
--- /dev/null
+++ b/src/template/aix
@@ -0,0 +1,23 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=-pipe
+  CXXFLAGS=-pipe
+  SHARED_LIB=-lc
+else # not GCC
+  case $host_os in
+    aix3.2.5)
+      CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg'
+      SHARED_LIB='-e _nostart -lc'
+      ;;
+    aix4.1)
+      CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero'
+      SHARED_LIB='-bnoentry -lc'
+      ;;
+    aix4.2 | aix4.3)
+      CFLAGS='-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong'
+      SHARED_LIB='-lc'
+      ;;
+  esac
+fi # not GCC
diff --git a/src/template/aix_325 b/src/template/aix_325
deleted file mode 100644
index 36c468b2b59..00000000000
--- a/src/template/aix_325
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg
-SHARED_LIB:-e _nostart -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_41 b/src/template/aix_41
deleted file mode 100644
index 54f0dd09929..00000000000
--- a/src/template/aix_41
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero
-SHARED_LIB:-bnoentry -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_42 b/src/template/aix_42
deleted file mode 100644
index ff4ad9a689c..00000000000
--- a/src/template/aix_42
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_gcc b/src/template/aix_gcc
deleted file mode 100644
index 3a771721337..00000000000
--- a/src/template/aix_gcc
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-pipe
-CXXFLAGS:-pipe
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/alpha_gcc b/src/template/alpha_gcc
deleted file mode 100644
index 5f53298f71e..00000000000
--- a/src/template/alpha_gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-AROPT:crs
-# NOFIXADE disallows unaligned access.
-#   on Ultrix and OSF/1 it invokes an explicit syscall.
-#   on HP-UX it turns off certain compiler options.
-# This is defined here because a bunch of clients include tmp/c.h,
-# which is where the work is done on HP-UX.  It only affects the
-# backend on Ultrix and OSF/1.
-CC:gcc
-CFLAGS:-D__alpha__ -DNOFIXADE
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/bsdi b/src/template/bsdi
new file mode 100644
index 00000000000..f57663ddb08
--- /dev/null
+++ b/src/template/bsdi
@@ -0,0 +1,22 @@
+AROPT=cq
+CFLAGS='-O2 -pipe'
+
+case $host_cpu in
+  i?86)  CFLAGS="$CFLAGS -m486";;
+esac
+
+case $host_os in
+  bsdi2.0) CFLAGS="$CFLAGS -DPRE_BSDI_2_1";;
+esac
+
+case $host_os in
+  bsdi2.0 | bsdi2.1 | bsdi3)
+    SHARED_LIB=
+    DLSUFFIX=.o
+    CC=gcc2
+    ;;
+  bsdi4)
+    SHARED_LIB=-fpic
+    DLSUFFIX=.so
+    ;;
+esac
diff --git a/src/template/bsdi_2.0 b/src/template/bsdi_2.0
deleted file mode 100644
index bcef190cf6e..00000000000
--- a/src/template/bsdi_2.0
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe -DPRE_BSDI_2_1
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2
diff --git a/src/template/bsdi_2.1 b/src/template/bsdi_2.1
deleted file mode 100644
index 8a15d25aacb..00000000000
--- a/src/template/bsdi_2.1
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2
diff --git a/src/template/bsdi_4.0 b/src/template/bsdi_4.0
deleted file mode 100644
index 5621715ef46..00000000000
--- a/src/template/bsdi_4.0
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/bsdi_4.0_sparc b/src/template/bsdi_4.0_sparc
deleted file mode 100644
index 2c861be120c..00000000000
--- a/src/template/bsdi_4.0_sparc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/cygwin32 b/src/template/cygwin32
deleted file mode 100644
index be6e4c28cfe..00000000000
--- a/src/template/cygwin32
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:
-ALL:
-SRCH_INC:/usr/local/include
-SRCH_LIB:/usr/local/lib
-DLSUFFIX:.dll
-LIBS:-lcygipc
diff --git a/src/template/dgux b/src/template/dgux
index a35179872d3..c0864198416 100644
--- a/src/template/dgux
+++ b/src/template/dgux
@@ -1,8 +1,4 @@
-AROPT:crs
-CFLAGS:
-LIBS:-lsocket -lnsl
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=-fpic
+DLSUFFIX=.so
diff --git a/src/template/freebsd b/src/template/freebsd
index fd8ae769cdd..ba10deb6b25 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -m486 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -m486 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/generic b/src/template/generic
deleted file mode 100644
index 5f8e51d3133..00000000000
--- a/src/template/generic
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/hpux b/src/template/hpux
new file mode 100644
index 00000000000..bc3ac1ced86
--- /dev/null
+++ b/src/template/hpux
@@ -0,0 +1,14 @@
+AROPT=crs
+DLSUFFIX=.sl
+
+if test "$GCC" = yes ; then
+  CFLAGS=-O2
+  SHARED_LIB=-fPIC
+  DL_LIB=/usr/lib/libdld.sl
+  CCC=g++
+else
+  CFLAGS='-Wl,-E -Ae'
+  SHARED_LIB=+z
+  CPP='cc -E -Ae'
+  CCC=aCC
+fi
diff --git a/src/template/hpux_cc b/src/template/hpux_cc
deleted file mode 100644
index f1f5eaa07ac..00000000000
--- a/src/template/hpux_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-AROPT:crs
-CFLAGS:-Wl,-E -Ae 
-SHARED_LIB:+z
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.sl
-CC:cc
-CPP:cc -E -Ae
-# Make aCC be first C++ compiler name tried...
-CCC:aCC
diff --git a/src/template/hpux_gcc b/src/template/hpux_gcc
deleted file mode 100644
index 4e78d420e7e..00000000000
--- a/src/template/hpux_gcc
+++ /dev/null
@@ -1,10 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DL_LIB:/usr/lib/libdld.sl
-DLSUFFIX:.sl
-CC:gcc
-CCC:g++
diff --git a/src/template/irix5 b/src/template/irix5
index 5f8e51d3133..c1652186c4d 100644
--- a/src/template/irix5
+++ b/src/template/irix5
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so
diff --git a/src/template/linux b/src/template/linux
new file mode 100644
index 00000000000..2c823be7e5b
--- /dev/null
+++ b/src/template/linux
@@ -0,0 +1,9 @@
+AROPT=crs
+CFLAGS=-O2
+SHARED_LIB=-fpic
+DLSUFFIX=.so
+
+case $host_cpu in
+  mips*)   CFLAGS="$CFLAGS -mips2";;
+  alpha*)  CPU=alpha;;
+esac
diff --git a/src/template/linux_alpha b/src/template/linux_alpha
deleted file mode 100644
index 93e9be371d4..00000000000
--- a/src/template/linux_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CPU:alpha
-
diff --git a/src/template/linux_arm b/src/template/linux_arm
deleted file mode 100644
index 5abf05c96b1..00000000000
--- a/src/template/linux_arm
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_i386 b/src/template/linux_i386
deleted file mode 100644
index 5abf05c96b1..00000000000
--- a/src/template/linux_i386
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_m68k b/src/template/linux_m68k
deleted file mode 100644
index 5abf05c96b1..00000000000
--- a/src/template/linux_m68k
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_mips b/src/template/linux_mips
deleted file mode 100644
index 73e1d73a1ff..00000000000
--- a/src/template/linux_mips
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2 -mips2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_ppc b/src/template/linux_ppc
deleted file mode 100755
index 5abf05c96b1..00000000000
--- a/src/template/linux_ppc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_sparc b/src/template/linux_sparc
deleted file mode 100644
index 5abf05c96b1..00000000000
--- a/src/template/linux_sparc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/netbsd b/src/template/netbsd
index ded2d63231d..38fa1df7956 100644
--- a/src/template/netbsd
+++ b/src/template/netbsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/nextstep b/src/template/nextstep
index c3269f27447..c8b14f4d8b7 100644
--- a/src/template/nextstep
+++ b/src/template/nextstep
@@ -1,7 +1,4 @@
-AROPT:rc
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
+AROPT=rc
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.o
diff --git a/src/template/openbsd b/src/template/openbsd
index ded2d63231d..38fa1df7956 100644
--- a/src/template/openbsd
+++ b/src/template/openbsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/alpha_cc b/src/template/osf
index 3ddf1133a08..aa1a84317b5 100644
--- a/src/template/alpha_cc
+++ b/src/template/osf
@@ -1,17 +1,21 @@
-AROPT:crs
+AROPT=crs
+
 # NOFIXADE disallows unaligned access.
 #   on Ultrix and OSF/1 it invokes an explicit syscall.
 #   on HP-UX it turns off certain compiler options.
 # This is defined here because a bunch of clients include tmp/c.h,
 # which is where the work is done on HP-UX.  It only affects the
 # backend on Ultrix and OSF/1.
-CC:cc
-CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000
-LDFLAGS='-rpath $(LIBDIR)'
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CCC:cxx
-CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
+
+if test "$GCC" = yes ; then
+  CFLAGS='-D__alpha__ -DNOFIXADE'
+  CCC=g++
+else
+  CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000'
+  LDFLAGS='-rpath $(libdir)'
+  CCC=cxx
+  CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000'
+fi
+
+DLSUFFIX=.so
+SHARED_LIB=
diff --git a/src/template/qnx b/src/template/qnx
deleted file mode 100644
index ad3ad163f62..00000000000
--- a/src/template/qnx
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:cr
-CFLAGS:
-LIBS:-lunix
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/qnx4 b/src/template/qnx4
new file mode 100644
index 00000000000..001f1715c9f
--- /dev/null
+++ b/src/template/qnx4
@@ -0,0 +1,6 @@
+AROPT=cr
+CFLAGS=
+LIBS=-lunix
+SHARED_LIB=
+DLSUFFIX=.so
+CXXFLAGS=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/sco b/src/template/sco
index b2c8751b2c0..8de1c8c2715 100644
--- a/src/template/sco
+++ b/src/template/sco
@@ -1,8 +1,5 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-K PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc -b elf
+AROPT=cq
+CFLAGS=
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+CC="$CC -b elf"
diff --git a/src/template/solaris_i386 b/src/template/solaris_i386
new file mode 100644
index 00000000000..c9e70260c15
--- /dev/null
+++ b/src/template/solaris_i386
@@ -0,0 +1,11 @@
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  AROPT=crs
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  AROPT=cq
+  CFLAGS=
+  SHARED_LIB=-KPIC
+fi
diff --git a/src/template/solaris_i386_cc b/src/template/solaris_i386_cc
deleted file mode 100644
index a6651580688..00000000000
--- a/src/template/solaris_i386_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/solaris_i386_gcc b/src/template/solaris_i386_gcc
deleted file mode 100644
index 43f3f06ffb3..00000000000
--- a/src/template/solaris_i386_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/solaris_sparc b/src/template/solaris_sparc
new file mode 100644
index 00000000000..1863d97c816
--- /dev/null
+++ b/src/template/solaris_sparc
@@ -0,0 +1,10 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  CFLAGS='-Xa -v -D__sparc__ -D__sun__'
+  SHARED_LIB=-KPIC
+fi
diff --git a/src/template/solaris_sparc_cc b/src/template/solaris_sparc_cc
deleted file mode 100644
index da7d77379bf..00000000000
--- a/src/template/solaris_sparc_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-Xa -v -D__sparc__ -D__sun__
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/solaris_sparc_gcc b/src/template/solaris_sparc_gcc
deleted file mode 100644
index 43f3f06ffb3..00000000000
--- a/src/template/solaris_sparc_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/sunos4 b/src/template/sunos4
new file mode 100644
index 00000000000..6c26fabf298
--- /dev/null
+++ b/src/template/sunos4
@@ -0,0 +1,10 @@
+AROPT=cr
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+  CFLAGS=
+  SHARED_LIB=-fPIC
+else
+  CFLAGS=
+  SHARED_LIB=-PIC
+fi
diff --git a/src/template/sunos4_cc b/src/template/sunos4_cc
deleted file mode 100644
index dc2580bca80..00000000000
--- a/src/template/sunos4_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/sunos4_gcc b/src/template/sunos4_gcc
deleted file mode 100644
index 73ae40585d6..00000000000
--- a/src/template/sunos4_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/svr4 b/src/template/svr4
index 26d5c0ca394..c1652186c4d 100644
--- a/src/template/svr4
+++ b/src/template/svr4
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:+W0
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so
diff --git a/src/template/ultrix4 b/src/template/ultrix4
index 6b87bc3106e..d708414ec4d 100644
--- a/src/template/ultrix4
+++ b/src/template/ultrix4
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:-DNOFIXADE
-SHARED_LIB:-G 0
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=-DNOFIXADE
+SHARED_LIB='-G 0'
+DLSUFFIX=.so
diff --git a/src/template/univel b/src/template/univel
index 680d3bd9b68..8bc70f1ae9c 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,8 +1,5 @@
-AROPT:crs
-CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
-LIBS:-lc89 
+AROPT=crs
+CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+LIBS=-lc89 
diff --git a/src/template/unixware b/src/template/unixware
index 976b5b9541a..bf9c4b5d74a 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -1,7 +1,6 @@
-AROPT:crs
-CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:/opt/include
-SRCH_LIB:/opt/lib
-DLSUFFIX:.so
-CC:cc
+AROPT=crs
+CFLAGS='-O -K i486,host,inline,loop_unroll,alloca -Dsvr4'
+SHARED_LIB='-K PIC'
+SRCH_INC='/opt/include'
+SRCH_LIB='/opt/lib'
+DLSUFFIX=.so
diff --git a/src/template/win b/src/template/win
new file mode 100644
index 00000000000..d5734c0a8a4
--- /dev/null
+++ b/src/template/win
@@ -0,0 +1,6 @@
+AROPT=crs
+CFLAGS=-O2
+SRCH_INC=/usr/local/include
+SRCH_LIB=/usr/local/lib
+DLSUFFIX=.dll
+LIBS=-lcygipc