From ab7e1e5f4431018a14f317195c924f08c38c2623 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Mon, 13 Jan 2003 12:23:28 +0000
Subject: [PATCH] Update to to version 1.10.4.  Makefile patches and gcc3
 patches have been integrated.  From Nick Nauwelaerts <nick@nauwelaerts.net>.

---
 audio/id3ed/Makefile                  |  4 +--
 audio/id3ed/distinfo                  |  6 ++---
 audio/id3ed/patches/patch-Makefile_in | 35 ---------------------------
 audio/id3ed/patches/patch-misc_cc     | 19 +++++----------
 4 files changed, 11 insertions(+), 53 deletions(-)
 delete mode 100644 audio/id3ed/patches/patch-Makefile_in

diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 71276ae4b34..77d8872bdf6 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2003/01/04 19:09:52 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.7 2003/01/13 12:23:28 naddy Exp $
 
 COMMENT=		"interactive console id3 tag editor"
 
-DISTNAME=		id3ed-1.10.3
+DISTNAME=		id3ed-1.10.4
 CATEGORIES=     	audio
 
 HOMEPAGE=		http://www.azstarnet.com/~donut/programs/id3ed.html
diff --git a/audio/id3ed/distinfo b/audio/id3ed/distinfo
index 07c51d3c068..3ba9883967f 100644
--- a/audio/id3ed/distinfo
+++ b/audio/id3ed/distinfo
@@ -1,3 +1,3 @@
-MD5 (id3ed-1.10.3.tar.gz) = 44ada411e25c47c8df294bdf18c4f95b
-RMD160 (id3ed-1.10.3.tar.gz) = 9828548e845286fea7a9a9d2e725b639696215eb
-SHA1 (id3ed-1.10.3.tar.gz) = 7015acc55f35f487edfcb21c8a95f83411e52ba4
+MD5 (id3ed-1.10.4.tar.gz) = fc0df31ef4ad90b83ee133929afbcc83
+RMD160 (id3ed-1.10.4.tar.gz) = c01388bcde85c271ea1a9f1f07a2769913c40e18
+SHA1 (id3ed-1.10.4.tar.gz) = b699e645fcea2fa42658886621eb10531d24008a
diff --git a/audio/id3ed/patches/patch-Makefile_in b/audio/id3ed/patches/patch-Makefile_in
deleted file mode 100644
index 55041a73dab..00000000000
--- a/audio/id3ed/patches/patch-Makefile_in
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2001/12/06 13:17:42 naddy Exp $
---- Makefile.in.orig	Thu Dec  6 13:54:45 2001
-+++ Makefile.in	Thu Dec  6 13:56:49 2001
-@@ -14,6 +14,8 @@ exec_prefix=@exec_prefix@
- bindir=@bindir@
- mandir=@mandir@
- install=@INSTALL@
-+install_program=@INSTALL_PROGRAM@
-+install_data=@INSTALL_DATA@
- 
- DESTDIR=
- 
-@@ -28,8 +30,8 @@ dep depend .depend:
- 	$(CXX) -MM *.cc > .depend
- 
- install: all
--	$(install) -s -m 0755 id3ed $(DESTDIR)$(bindir)
--	$(install) -m 0644 id3ed.1 $(DESTDIR)$(mandir)/man1
-+	$(install_program) id3ed $(DESTDIR)$(bindir)
-+	$(install_data) id3ed.1 $(DESTDIR)$(mandir)/man1
- 
- uninstall:
- 	-rm $(DESTDIR)$(bindir)/id3ed
-@@ -61,8 +63,8 @@ distclean: clean
- 	-touch .depend
- 		 
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+#ifeq (.depend,$(wildcard .depend))
-+#include .depend
-+#endif
- 
- .PHONY: clean distclean dep depend all install
diff --git a/audio/id3ed/patches/patch-misc_cc b/audio/id3ed/patches/patch-misc_cc
index ba5b7fd81f2..ca79cdd8e79 100644
--- a/audio/id3ed/patches/patch-misc_cc
+++ b/audio/id3ed/patches/patch-misc_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-misc_cc,v 1.2 2002/09/28 20:25:23 naddy Exp $
---- misc.cc.orig	Fri Jun 11 02:25:30 1999
-+++ misc.cc	Sat Sep 28 21:31:03 2002
-@@ -8,20 +8,20 @@
+$OpenBSD: patch-misc_cc,v 1.3 2003/01/13 12:23:28 naddy Exp $
+--- misc.cc.orig	Fri Jan 10 03:52:38 2003
++++ misc.cc	Fri Jan 10 08:34:30 2003
+@@ -8,7 +8,7 @@
  int doread(int handle,void * buf,ssize_t len, const char * name){
     ssize_t i;
     if ((i=read(handle,buf,len))!=len){
@@ -10,9 +10,8 @@ $OpenBSD: patch-misc_cc,v 1.2 2002/09/28 20:25:23 naddy Exp $
        return -1;
     }
     return 0;
- }
--int dowrite(int handle, const void * buf, ssize_t len,const char *name,const char *name2=""){
-+int dowrite(int handle, const void * buf, ssize_t len,const char *name,const char *name2){
+@@ -16,7 +16,7 @@ int doread(int handle,void * buf,ssize_t
+ int dowrite(int handle, const void * buf, ssize_t len,const char *name,const char *name2){
     ssize_t i;
     if ((i=write(handle,buf,len))!=len){
 -      fprintf(stderr,"Error writing %s %s (%i/%i): %s\n",name,name2,i,len,strerror(errno));
@@ -20,9 +19,3 @@ $OpenBSD: patch-misc_cc,v 1.2 2002/09/28 20:25:23 naddy Exp $
        return -1;
     }
     else return 0;
- }
--int doopen(int &handle,const char * name,int access,int mode=0) {
-+int doopen(int &handle,const char * name,int access,int mode) {
-    if ((handle=open(name,access,mode))==-1){
-       fprintf(stderr,"Error opening %s: %s\n",name,strerror(errno));
-       return -1;