Changes to make timidity package work a bit better:

+ sync entries in PLIST with reality, and delete the extra directories
that were created.

+ use normal LIB_DEPENDS in Makefile for specifying a dependency on
ncurses lib.

+ organise the patch files, so that each file is only patched once.

+ rework the Makefile patches so that "make reinstall" can be called,
that -lossaudio is referenced, and we look in the correct directory
for ncurses.h.

4 files changed, 158 insertions, 257 deletions

diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 347e4dc156f..33086e3cdc0 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -4,7 +4,7 @@
 # Date created:         17 Nov 1996
 # Whom:                 ache
 #
-# $NetBSD: Makefile,v 1.3 1998/01/19 01:11:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/01/26 17:44:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/09/07 22:08:13 ache Exp 
 #
 
@@ -19,7 +19,7 @@ DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
 MAINTAINER=     ache@FreeBSD.ORG
 
 BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses
+LIB_DEPENDS=	ncurses\\.3:${PORTSDIR}/devel/ncurses
 
 NO_CDROM=       "Uses copyrighted patches"
 
diff --git a/audio/timidity/patches/patch-aa b/audio/timidity/patches/patch-aa
index 3f12b08b1ce..61ede5e056d 100644
--- a/audio/timidity/patches/patch-aa
+++ b/audio/timidity/patches/patch-aa
@@ -1,56 +1,3 @@
-*** config.h.orig	Sat Jun  1 16:54:49 1996
---- config.h	Sun Nov 17 10:00:29 1996
-***************
-*** 217,222 ****
---- 217,238 ----
-  # endif
-  #endif /* linux */
-  
-+ #ifdef __FreeBSD__
-+ #include <errno.h>
-+ #include <machine/endian.h>
-+ #if BYTE_ORDER == LITTLE_ENDIAN
-+ #undef BIG_ENDIAN
-+ #undef PDP_ENDIAN
-+ #elif BYTE_ORDER == BIG_ENDIAN
-+ #undef LITTLE_ENDIAN
-+ #undef PDP_ENDIAN
-+ #else
-+ # error No valid byte sex defined
-+ #endif
-+ #define USE_LDEXP
-+ #define PI M_PI
-+ #endif
-+ 
-  /* Win32 on Intel machines */
-  #ifdef __WIN32__
-  #  define LITTLE_ENDIAN
-***************
-*** 254,266 ****
---- 270,292 ----
-  #ifdef LITTLE_ENDIAN
-  #define LE_SHORT(x) x
-  #define LE_LONG(x) x
-+ #ifdef __FreeBSD__
-+ #define BE_SHORT(x) __byte_swap_word(x)
-+ #define BE_LONG(x) __byte_swap_long(x)
-+ #else
-  #define BE_SHORT(x) XCHG_SHORT(x)
-  #define BE_LONG(x) XCHG_LONG(x)
-+ #endif
-  #else
-  #define BE_SHORT(x) x
-  #define BE_LONG(x) x
-+ #ifdef __FreeBSD__
-+ #define LE_SHORT(x) __byte_swap_word(x)
-+ #define LE_LONG(x) __byte_swap_long(x)
-+ #else
-  #define LE_SHORT(x) XCHG_SHORT(x)
-  #define LE_LONG(x) XCHG_LONG(x)
-+ #endif
-  #endif
-  
-  #define MAX_AMPLIFICATION 800
 *** mix.c.orig	Mon May 20 17:09:46 1996
 --- mix.c	Sun Nov 17 10:01:36 1996
 ***************
@@ -59,7 +6,7 @@
   
   #include <math.h>
   #include <stdio.h>
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__NetBSD__)
 + #include <stdlib.h>
 + #else
   #include <malloc.h>
@@ -75,7 +22,7 @@
   
   #include <math.h>
   #include <stdio.h>
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__NetBSD__)
 + #include <stdlib.h>
 + #else
   #include <malloc.h>
@@ -83,3 +30,64 @@
   
   #include "config.h"
   #include "common.h"
+--- config.h.orig	Sat Jun  1 13:54:49 1996
++++ config.h	Mon Jan 26 13:52:44 1998
+@@ -185,6 +185,11 @@
+    fragments under the VoxWare (Linux & FreeBSD) audio driver */
+ #define AUDIO_BUFFER_SIZE (1<<AUDIO_BUFFER_BITS)
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#undef FSCALE
++#endif
++
+ /* Byte order, defined in <machine/endian.h> for FreeBSD and DEC OSF/1 */
+ #ifdef DEC
+ #include <machine/endian.h>
+@@ -217,6 +222,22 @@
+ # endif
+ #endif /* linux */
+ 
++#if (defined(BSD) && BSD >= 199306)
++#include <errno.h>
++#include <machine/endian.h>
++#if BYTE_ORDER == LITTLE_ENDIAN
++#undef BIG_ENDIAN
++#undef PDP_ENDIAN
++#elif BYTE_ORDER == BIG_ENDIAN
++#undef LITTLE_ENDIAN
++#undef PDP_ENDIAN
++#else
++# error No valid byte sex defined
++#endif
++#define USE_LDEXP
++#define PI M_PI
++#endif
++
+ /* Win32 on Intel machines */
+ #ifdef __WIN32__
+ #  define LITTLE_ENDIAN
+@@ -254,13 +275,23 @@
+ #ifdef LITTLE_ENDIAN
+ #define LE_SHORT(x) x
+ #define LE_LONG(x) x
++#ifdef __FreeBSD__
++#define BE_SHORT(x) __byte_swap_word(x)
++#define BE_LONG(x) __byte_swap_long(x)
++#else
+ #define BE_SHORT(x) XCHG_SHORT(x)
+ #define BE_LONG(x) XCHG_LONG(x)
++#endif
+ #else
+ #define BE_SHORT(x) x
+ #define BE_LONG(x) x
++#ifdef __FreeBSD__
++#define LE_SHORT(x) __byte_swap_word(x)
++#define LE_LONG(x) __byte_swap_long(x)
++#else
+ #define LE_SHORT(x) XCHG_SHORT(x)
+ #define LE_LONG(x) XCHG_LONG(x)
++#endif
+ #endif
+ 
+ #define MAX_AMPLIFICATION 800
diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab
index 34e8d69c27a..2be41b82d9e 100644
--- a/audio/timidity/patches/patch-ab
+++ b/audio/timidity/patches/patch-ab
@@ -1,150 +1,92 @@
-*** Makefile.orig	Sun May 26 13:26:46 1996
---- Makefile	Sun Nov 17 13:09:19 1996
-***************
-*** 24,45 ****
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! CC = gcc
-! DEBUGFLAGS = -Wall -O2
-  
-  ########### Install.
-! INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = /usr/local/bin
-  
-  # Where to install the manual pages
-! MAN_DIR = /usr/local/man/man1
-  
-  # Where to install the patches, config files, and MIDI files.
-  # If you change this, it's a good idea to recompile the binary,
-  # or you'll need to invoke timidity with the -L option.
-! TIMID_DIR = /usr/local/lib/timidity
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
---- 24,45 ----
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! #CC = gcc
-! DEBUGFLAGS = -Wall
-  
-  ########### Install.
-! #INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = ${PREFIX}/bin
-  
-  # Where to install the manual pages
-! MAN_DIR = ${PREFIX}/man/man1
-  
-  # Where to install the patches, config files, and MIDI files.
-  # If you change this, it's a good idea to recompile the binary,
-  # or you'll need to invoke timidity with the -L option.
-! TIMID_DIR = ${PREFIX}/lib/timidity
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
-***************
-*** 93,100 ****
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
---- 93,100 ----
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! #EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses -lmytinfo
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
-***************
-*** 112,120 ****
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! SYSEXTRAS += tk_c.c
-! INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
---- 112,120 ----
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! #SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! #SYSEXTRAS += tk_c.c
-! #INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
-***************
-*** 136,142 ****
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
---- 136,142 ----
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
-***************
-*** 228,237 ****
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! depends depend dep:
-! 	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! 
-! include depends
-  
-  ########### Installation targets
-  
---- 228,237 ----
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! #depends depend dep:
-! #        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! #
-! #include depends
-  
-  ########### Installation targets
-  
-***************
-*** 262,270 ****
-  	mkdir -p $(TIMID_DIR)
-  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
-  
-! install.patch: $(PATCHF)
-  	mkdir -p $(TIMID_DIR)/patch
-! 	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
-  
-  install.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
---- 262,270 ----
-  	mkdir -p $(TIMID_DIR)
-  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
-  
-! install.patch: #$(PATCHF)
-  	mkdir -p $(TIMID_DIR)/patch
-! #        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
-  
-  install.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
+--- Makefile.orig	Sun May 26 10:26:46 1996
++++ Makefile	Mon Jan 26 16:54:39 1998
+@@ -24,22 +24,23 @@
+ # But where to change without revealing my secret identity?
+ 
+ ########### Compiler and flags.
+-CC = gcc
+-DEBUGFLAGS = -Wall -O2
++#CC = gcc
++DEBUGFLAGS = -Wall
+ 
+ ########### Install.
+-INSTALL = /usr/bin/install
++#INSTALL = /usr/bin/install
++INSTALL= install -c
+ 
+ # Where to install the executable
+-BIN_DIR = /usr/local/bin
++BIN_DIR = ${PREFIX}/bin
+ 
+ # Where to install the manual pages
+-MAN_DIR = /usr/local/man/man1
++MAN_DIR = ${PREFIX}/man/man1
+ 
+ # Where to install the patches, config files, and MIDI files.
+ # If you change this, it's a good idea to recompile the binary,
+ # or you'll need to invoke timidity with the -L option.
+-TIMID_DIR = /usr/local/lib/timidity
++TIMID_DIR = ${PREFIX}/lib/timidity
+ 
+ # Where to install the Tcl code, if you use the Tcl code that is.
+ TCL_DIR = $(TIMID_DIR)
+@@ -93,8 +94,8 @@
+ # Select the ncurses full-screen interface
+ SYSTEM += -DIA_NCURSES
+ SYSEXTRAS += ncurs_c.c
+-EXTRAINCS += -I/usr/include/ncurses
+-EXTRALIBS += -lncurses
++EXTRAINCS += -I${PREFIX}/include
++EXTRALIBS += -L${PREFIX}/lib -lncurses -lossaudio
+ 
+ ## Select the S-Lang full-screen interface
+ #SYSTEM += -DIA_SLANG
+@@ -112,9 +113,9 @@
+ #EXTRALIBS += -lgen
+ 
+ # Select the Tcl/Tk interface
+-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+-SYSEXTRAS += tk_c.c
+-INST_TK = install.tk
++#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
++#SYSEXTRAS += tk_c.c
++#INST_TK = install.tk
+ #EXTRAINCS +=
+ #EXTRALIBS +=
+ 
+@@ -136,7 +137,7 @@
+ SDIST = timidity-lib-$(SUPPVERSION).tar.gz
+ SDISTZIP = tilib$(FNSUPPVERSION).zip
+ 
+-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
++CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+ 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
+ 
+ ########### All relevant files.. Anybody know autoconf?
+@@ -228,10 +229,10 @@
+ wav2pat: wav2pat.c
+ 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
+ 
+-depends depend dep:
+-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+-
+-include depends
++#depends depend dep:
++#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
++#
++#include depends
+ 
+ ########### Installation targets
+ 
+@@ -262,9 +263,9 @@
+ 	mkdir -p $(TIMID_DIR)
+ 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+ 
+-install.patch: $(PATCHF)
++install.patch: #$(PATCHF)
+ 	mkdir -p $(TIMID_DIR)/patch
+-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
++#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+ 
+ install.tk: $(ALLTCLF)
+ 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
diff --git a/audio/timidity/patches/patch-ae b/audio/timidity/patches/patch-ae
index ec43ba135c4..58bd081d4ed 100644
--- a/audio/timidity/patches/patch-ae
+++ b/audio/timidity/patches/patch-ae
@@ -1,53 +1,4 @@
-diff -u ../../work/timidity-0.2i/Makefile ./Makefile
---- ../../work/timidity-0.2i/Makefile	Wed Oct 29 01:16:48 1997
-+++ ./Makefile	Tue Oct 28 09:10:22 1997
-@@ -56,8 +56,8 @@
- # Select the Linux/FreeBSD audio driver
- SYSTEM += -DAU_LINUX
- SYSEXTRAS += linux_a.c
--#EXTRAINCS +=
--#EXTRALIBS += 
-+EXTRAINCS += -I${PREFIX}/include
-+EXTRALIBS += -L${PREFIX}/lib -lossaudio
- 
- ## Select the HP-UX network audio server
- #SYSTEM += -DHPUX -DAU_HPUX
-@@ -94,7 +94,7 @@
- SYSTEM += -DIA_NCURSES
- SYSEXTRAS += ncurs_c.c
- #EXTRAINCS += -I/usr/include/ncurses
--EXTRALIBS += -lncurses -lmytinfo
-+EXTRALIBS += -lncurses
- 
- ## Select the S-Lang full-screen interface
- #SYSTEM += -DIA_SLANG
-diff -u ../../work/timidity-0.2i/config.h ./config.h
---- ../../work/timidity-0.2i/config.h	Wed Oct 29 01:16:48 1997
-+++ ./config.h	Sun Oct 26 13:55:33 1997
-@@ -185,6 +185,12 @@
-    fragments under the VoxWare (Linux & FreeBSD) audio driver */
- #define AUDIO_BUFFER_SIZE (1<<AUDIO_BUFFER_BITS)
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#undef FSCALE
-+#endif
-+
-+
- /* Byte order, defined in <machine/endian.h> for FreeBSD and DEC OSF/1 */
- #ifdef DEC
- #include <machine/endian.h>
-@@ -217,7 +223,7 @@
- # endif
- #endif /* linux */
- 
--#ifdef __FreeBSD__
-+#if (defined(BSD) && (BSD >= 199306))
- #include <errno.h>
- #include <machine/endian.h>
- #if BYTE_ORDER == LITTLE_ENDIAN
-diff -u ../../work/timidity-0.2i/linux_a.c ./linux_a.c
---- ../../work/timidity-0.2i/linux_a.c	Mon May 20 15:09:46 1996
+--- linux_a.c	Mon May 20 15:09:46 1996
 +++ ./linux_a.c	Wed Oct 29 01:09:19 1997
 @@ -32,6 +32,16 @@
  #include <linux/soundcard.h>