8 files changed, 98 insertions, 120 deletions

diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile
index d5d4d28f7976..ea4be044d1d0 100644
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@@ -17,16 +17,24 @@ MAINTAINER=	ports@FreeBSD.org
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-MAN3=d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
-     d_dbget.3 d_dbset.3 d_delete.3 d_fillnew.3 d_getsequence.3 d_keyfind.3 \
-     d_keyfrst.3 d_keylast.3 d_keynext.3 d_keyprev.3 d_keyread.3 d_open.3 \
-     d_recfrst.3 d_reclast.3 d_recnext.3 d_recprev.3 d_recread.3 \
-     d_recwrite.3 d_setfiles.3
-MAN1=ddlp.1
+MAN1=	ddlp.1
+MAN3=	d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
+     	d_dbget.3 d_dbset.3 d_delete.3 d_fillnew.3 d_getsequence.3 \
+	d_keyfind.3 d_keyfrst.3 d_keylast.3 d_keynext.3 d_keyprev.3 \
+	d_keyread.3 d_open.3 d_recfrst.3 d_reclast.3 d_recnext.3 d_recprev.3 \
+	d_recread.3 d_recwrite.3 d_setfiles.3
 
 post-install:
+.for file in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man1
+.endfor
+.for file in ${MAN3}
+	${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man3
+.endfor
 	@${MKDIR} ${PREFIX}/share/typhoon
-	@${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon
-	@${INSTALL_DATA} ${WRKSRC}/include/environ.h ${WRKSRC}/include/typhoon.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon
+.for file in environ.h typhoon.h
+	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/typhoon/files/patch-aa b/databases/typhoon/files/patch-aa
index 5e68d5556904..8f349cd1c23b 100644
--- a/databases/typhoon/files/patch-aa
+++ b/databases/typhoon/files/patch-aa
@@ -1,48 +1,27 @@
---- configure~	Wed Dec 11 15:21:16 1996
-+++ configure	Wed Dec 11 15:22:18 1996
-@@ -1,6 +1,7 @@
+--- configure.orig	Mon May 22 01:47:06 1995
++++ configure	Sat Nov 18 02:56:37 2000
+@@ -1,7 +1,7 @@
  #
  # configure script
  #
+-CC=cc
 +alias type=which
- CC=cc
  
  compile='$CC -o conftest conftest.c >/dev/null 2>&1'
-@@ -152,10 +153,10 @@
+ compiled_ok='test -s conftest && (./conftest) >/dev/null 2>/dev/null;'
+@@ -151,11 +151,11 @@
+ #
  echo Checking for cc
  if test -z "$CC" && type cc >/dev/null 2>/dev/null ; then
- 	CC=cc
+-	CC=cc
 -	CFLAGS="-g $(DEFINES)"
-+	CFLAGS="-O2 $(DEFINES)"
++	CC="$CC"
++	CFLAGS="$CFLAGS $(DEFINES)"
  else
- 	CC=gcc
+-	CC=gcc
 -	CFLAGS="-g -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)"
-+	CFLAGS="-O2 -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)"
++	CC="$CC"
++	CFLAGS="$CFLAGS -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)"
  fi
  
  #
---- Makefile.orig	Sun May 21 11:47:05 1995
-+++ Makefile	Wed Dec 11 16:33:44 1996
-@@ -1,11 +1,10 @@
- # Makefile for:  typhoon - top level makefile
- 
- MANEXT		= l
--PREFIX		= /usr/local
- DESTMAN		= $(PREFIX)/man/man$(MANEXT)
- DESTCAT		= $(PREFIX)/man/cat$(MANEXT)
--DESTOWN		= root
--DESTGRP		= local
-+DESTOWN		= bin
-+DESTGRP		= bin
- SHELL		= /bin/sh
- MAKE		= make
- 
-@@ -14,8 +13,6 @@
- all install uninstall: include/ansi.h include/environ.h
- 		cd src; $(MAKE) $@
- 		cd util; $(MAKE) $@
--		cd examples; $(MAKE) $@
--		cd man; $(MAKE) $@
- 
- include/ansi.h include/environ.h:
- 		configure
diff --git a/databases/typhoon/files/patch-ac b/databases/typhoon/files/patch-ac
index cb677b06108c..c6006807b587 100644
--- a/databases/typhoon/files/patch-ac
+++ b/databases/typhoon/files/patch-ac
@@ -1,16 +1,5 @@
---- examples/Makefile.in~	Wed Dec 11 15:42:53 1996
-+++ examples/Makefile.in	Wed Dec 11 15:41:41 1996
-@@ -28,7 +28,7 @@
- 		$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
- 
- demo.h demo.dbd: demo.ddl
--		../util/ddlp -a4 -f demo
-+		env LD_LIBRARY_PATH=../src ../util/ddlp -a4 -f demo
- 
- lint:
- 		lint -u $(DEFINES) $(SRCS)
---- util/Makefile.in~	Sun May 21 11:47:41 1995
-+++ util/Makefile.in	Thu Oct 15 17:09:03 1998
+--- util/Makefile.in.orig	Mon May 22 01:47:41 1995
++++ util/Makefile.in	Sat Nov 18 03:18:42 2000
 @@ -8,11 +8,10 @@
  CC		= @cc@
  CFLAGS		= @cflags@
@@ -25,7 +14,7 @@
  SHELL		= /bin/sh
  PROGRAMS	= ddlp dbdview tyexport tyimport # tybackup tyrestore
  MADESRCS	= ddl.c exp.c imp.c
-@@ -74,11 +73,11 @@
+@@ -74,7 +73,6 @@
  
  install:	$(PROGRAMS)
  		cp $(PROGRAMS) $(DESTBIN)
@@ -33,8 +22,3 @@
  		cd $(DESTBIN) && strip $(PROGRAMS)
  		cd $(DESTBIN) && chmod 755 $(PROGRAMS)
  		cd $(DESTBIN) && chown $(DESTOWN) $(PROGRAMS)
- 		cd $(DESTBIN) && chgrp $(DESTGRP) $(PROGRAMS)
-+		install -c -m 644 ../man/ddlp.1 ${PREFIX}/man/man1
- 
- uninstall:
- 		cd $(DESTBIN) && rm -f $(PROGRAMS)
diff --git a/databases/typhoon/files/patch-ad b/databases/typhoon/files/patch-ad
new file mode 100644
index 000000000000..e157aec1a07a
--- /dev/null
+++ b/databases/typhoon/files/patch-ad
@@ -0,0 +1,25 @@
+--- Makefile.orig	Mon May 22 01:47:05 1995
++++ Makefile	Sat Nov 18 02:11:18 2000
+@@ -1,11 +1,10 @@
+ # Makefile for:  typhoon - top level makefile
+ 
+ MANEXT		= l
+-PREFIX		= /usr/local
+ DESTMAN		= $(PREFIX)/man/man$(MANEXT)
+ DESTCAT		= $(PREFIX)/man/cat$(MANEXT)
+-DESTOWN		= root
+-DESTGRP		= local
++DESTOWN		= bin
++DESTGRP		= bin
+ SHELL		= /bin/sh
+ MAKE		= make
+ 
+@@ -14,8 +13,6 @@
+ all install uninstall: include/ansi.h include/environ.h
+ 		cd src; $(MAKE) $@
+ 		cd util; $(MAKE) $@
+-		cd examples; $(MAKE) $@
+-		cd man; $(MAKE) $@
+ 
+ include/ansi.h include/environ.h:
+ 		configure
diff --git a/databases/typhoon/files/patch-ae b/databases/typhoon/files/patch-ae
new file mode 100644
index 000000000000..e6077e72ca79
--- /dev/null
+++ b/databases/typhoon/files/patch-ae
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	Mon May 22 01:47:11 1995
++++ examples/Makefile.in	Sat Nov 18 02:11:19 2000
+@@ -28,7 +28,7 @@
+ 		$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
+ 
+ demo.h demo.dbd: demo.ddl
+-		../util/ddlp -a4 -f demo
++		env LD_LIBRARY_PATH=../src ../util/ddlp -a4 -f demo
+ 
+ lint:
+ 		lint -u $(DEFINES) $(SRCS)
diff --git a/databases/typhoon/files/patch-ab b/databases/typhoon/files/patch-af
index 1da0a4c28533..7c251ee8f485 100644
--- a/databases/typhoon/files/patch-ab
+++ b/databases/typhoon/files/patch-af
@@ -1,43 +1,17 @@
---- src/os.c~	Wed Dec 11 15:24:29 1996
-+++ src/os.c	Wed Dec 11 15:25:06 1996
-@@ -42,7 +42,7 @@
- #  include <sys/stat.h>
- #  include <unistd.h>
- #endif
--#ifdef __linux__
-+#if defined( __linux__ ) || defined( __FreeBSD__ )
- #	include <sys/file.h>
- #	define F_TLOCK	LOCK_NB
- #	define F_LOCK	LOCK_EX
---- src/unix.c~	Wed Dec 11 15:26:04 1996
-+++ src/unix.c	Wed Dec 11 15:26:20 1996
-@@ -50,7 +50,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <typhoon.h>
--#ifdef __linux__
-+#if defined( __linux__ ) || defined( __FreeBSD__ )
- #	include <sys/file.h>
- #	define F_TLOCK	LOCK_NB
- #	define F_LOCK	LOCK_EX
---- src/Makefile.in.orig	Sun May 21 11:47:27 1995
-+++ src/Makefile.in	Wed Dec 11 16:09:00 1996
-@@ -6,15 +6,20 @@
+--- src/Makefile.in.orig	Mon May 22 01:47:27 1995
++++ src/Makefile.in	Sat Nov 18 03:21:22 2000
+@@ -6,15 +6,15 @@
  CC		= @cc@
  CFLAGS		= @cflags@
  RANLIB		= @ranlib@
 -PREFIX		= /usr/local
 -DESTLIB		= $(PREFIX)/lib
+-DESTHDR		= $(PREFIX)/include
+-DESTOWN		= root
+-DESTGRP		= local
 +SHLIB_MAJOR	= 1
 +SHLIB_MINOR	= 10
-+DESTDIR		= 
 +LIBDIR		= $(PREFIX)/lib
-+MANDIR		= ${PREFIX}/man/man
-+NOMANCOMPRESS=	yup
- DESTHDR		= $(PREFIX)/include
--DESTOWN		= root
--DESTGRP		= local
-+DESTHDR		= $(PREFIX)/include
 +LIBOWN		= bin
 +LIBGRP		= bin
  SHELL		= /bin/sh
@@ -49,7 +23,7 @@
  SRCS		= bt_del.c bt_funcs.c bt_io.c bt_open.c cmpfuncs.c os.c \
  		  readdbd.c record.c ty_auxfn.c ty_find.c ty_ins.c \
  		  ty_io.c ty_log.c ty_open.c ty_refin.c ty_repl.c \
-@@ -27,67 +31,30 @@
+@@ -27,67 +27,4 @@
  		  ty_repl.o ty_util.o unix.o vlr.o ansi.o sequence.o
  UNUSED		= dos.c os2.c ty_lock.c
  
@@ -96,32 +70,7 @@
 -		-rcsclean -u
 -		-rm -f $(LIBRARY) $(OBJS)
 -		-rm -f Makefile lib.a tags made *.o
-+MAN3=../man/d_close.3 \
-+	  ../man/d_crget.3 \
-+	  ../man/d_crread.3 \
-+	  ../man/d_crset.3 \
-+	  ../man/d_dbdpath.3 \
-+	  ../man/d_dbfpath.3 \
-+	  ../man/d_dbget.3 \
-+	  ../man/d_dbset.3 \
-+	  ../man/d_delete.3 \
-+	  ../man/d_fillnew.3 \
-+	  ../man/d_getsequence.3 \
-+	  ../man/d_keyfind.3 \
-+	  ../man/d_keyfrst.3 \
-+	  ../man/d_keylast.3 \
-+	  ../man/d_keynext.3 \
-+	  ../man/d_keyprev.3 \
-+	  ../man/d_keyread.3 \
-+	  ../man/d_open.3 \
-+	  ../man/d_recfrst.3 \
-+	  ../man/d_reclast.3 \
-+	  ../man/d_recnext.3 \
-+	  ../man/d_recprev.3 \
-+	  ../man/d_recread.3 \
-+	  ../man/d_recwrite.3 \
-+	  ../man/d_setfiles.3
- 
+-
 -### Do NOT edit this or the following lines.
 -bt_del.o:	ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h
 -bt_funcs.o:	ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h
diff --git a/databases/typhoon/files/patch-ag b/databases/typhoon/files/patch-ag
new file mode 100644
index 000000000000..91b339fdf528
--- /dev/null
+++ b/databases/typhoon/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/os.c.orig	Mon May 22 01:47:31 1995
++++ src/os.c	Sat Nov 18 02:11:18 2000
+@@ -42,7 +42,7 @@
+ #  include <sys/stat.h>
+ #  include <unistd.h>
+ #endif
+-#ifdef __linux__
++#if defined( __linux__ ) || defined( __FreeBSD__ )
+ #	include <sys/file.h>
+ #	define F_TLOCK	LOCK_NB
+ #	define F_LOCK	LOCK_EX
diff --git a/databases/typhoon/files/patch-ah b/databases/typhoon/files/patch-ah
new file mode 100644
index 000000000000..5e222da8aa5c
--- /dev/null
+++ b/databases/typhoon/files/patch-ah
@@ -0,0 +1,11 @@
+--- src/unix.c.orig	Mon May 22 01:47:40 1995
++++ src/unix.c	Sat Nov 18 02:11:18 2000
+@@ -50,7 +50,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <typhoon.h>
+-#ifdef __linux__
++#if defined( __linux__ ) || defined( __FreeBSD__ )
+ #	include <sys/file.h>
+ #	define F_TLOCK	LOCK_NB
+ #	define F_LOCK	LOCK_EX