6 files changed, 78 insertions, 37 deletions

diff --git a/audio/id3ren/Makefile b/audio/id3ren/Makefile
index 978e608c9168..2a1b861e478f 100644
--- a/audio/id3ren/Makefile
+++ b/audio/id3ren/Makefile
@@ -6,21 +6,31 @@
 #
 
 PORTNAME=	id3ren
-PORTVERSION=	0.97a
+PORTVERSION=	1.1b0
 CATEGORIES=	audio
 MASTER_SITES=	http://cbothamy.free.fr/projects/id3ren/
-DISTNAME=	id3ren97a
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jonny@jonny.eng.br
+MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Mpeg Audio Layer 3 util: rename files, edit tags, search, etc
 
 PLIST_FILES=	bin/id3ren
-USE_ZIP=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/id3ren/src
+MAN1=		id3ren.1
+MANCOMPRESSED=	yes
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/id3ren.c ${WRKSRC}/misc.c
+		${WRKSRC}/src/id3ren.c ${WRKSRC}/src/id3misc.c
+	${RM} ${WRKSRC}/src/id3ren
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS ChangeLog FEATURES FEEDBACK INSTALL PORTS \
+		README THANKS TODO USAGE
+
+post-install:
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/id3ren/distinfo b/audio/id3ren/distinfo
index fa060b9a5e70..04fbef438c76 100644
--- a/audio/id3ren/distinfo
+++ b/audio/id3ren/distinfo
@@ -1,2 +1,2 @@
-MD5 (id3ren97a.zip) = 4cb10259b1b523c0f9cd064034fcfaaa
-SIZE (id3ren97a.zip) = 47619
+MD5 (id3ren-1.1b0.tgz) = dbfe38e5c45d23f6d83a085a0cab7641
+SIZE (id3ren-1.1b0.tgz) = 42108
diff --git a/audio/id3ren/files/patch-Makefile b/audio/id3ren/files/patch-Makefile
new file mode 100644
index 000000000000..951d41b7ace6
--- /dev/null
+++ b/audio/id3ren/files/patch-Makefile
@@ -0,0 +1,18 @@
+--- Makefile.orig	Tue Mar  6 02:59:34 2001
++++ Makefile	Fri Jan  7 09:56:53 2005
+@@ -1,12 +1,12 @@
+ all:
+-	make -C src all
++	cd src && ${MAKE} all
+ 
+ debug:
+ 	make -C src debug
+ 
+ install: 
+-	make -C src install
+-	make -C man install
++	cd src && ${MAKE} install
++	cd man && ${MAKE} install
+ 
+ clean:
+ 	make -C src clean
diff --git a/audio/id3ren/files/patch-aa b/audio/id3ren/files/patch-aa
index 951974bdf03d..759ef05df597 100644
--- a/audio/id3ren/files/patch-aa
+++ b/audio/id3ren/files/patch-aa
@@ -1,26 +1,27 @@
---- Makefile.old	Wed Mar 18 04:28:44 1998
-+++ Makefile	Sun Feb 28 16:04:16 1999
-@@ -1,16 +1,17 @@
--CFLAGS = -O2 -s -Wall
-+CFLAGS += -s -Wall
+--- src/Makefile.orig	Fri Jan  7 10:08:02 2005
++++ src/Makefile	Fri Jan  7 10:08:30 2005
+@@ -1,9 +1,10 @@
+ CFLAGSDEBUG = -g -O2 -Wall -DDEBUG
+-CFLAGS = -s -O2 -Wall
 -CC = gcc
- RM = rm -f
+-RM = rm -f
 -INSTALL = install -s -m 755
--INSTALL_DIR = ..
-+INSTALL = install -cs -m 755 -o root -g wheel
+-INSTALL_DIR = /usr/bin
++CFLAGS ?= -O2 -Wall
++STRIP ?= -s
++CC ?= gcc
++RM ?= rm -f
++INSTALL = ${BSD_INSTALL_PROGRAM}
 +INSTALL_DIR = ${PREFIX}/bin
  INSTALL_NAME = id3ren
  
- SOURCES = id3ren.c id3tag.c file.c misc.c
+ SOURCES = id3ren.c id3tag.c id3file.c id3misc.c
+@@ -12,7 +13,7 @@
+ all:	${INSTALL_NAME}
  
--all:
-+all:	${INSTALL_NAME}
-+
-+${INSTALL_NAME}:
- 	${CC} ${CFLAGS} -o ${INSTALL_NAME} ${SOURCES}
+ ${INSTALL_NAME}: ${SOURCES} ${INCLUDES}
+-	${CC} ${CFLAGS} -o ${INSTALL_NAME} ${SOURCES}
++	${CC} ${CFLAGS} ${STRIP} -o ${INSTALL_NAME} ${SOURCES}
  
--install: all
-+install: ${INSTALL_NAME}
- 	${INSTALL} ${INSTALL_NAME} ${INSTALL_DIR}/${INSTALL_NAME}
- 
- clean:
+ debug:
+ 	${CC} ${CFLAGSDEBUG} -o ${INSTALL_NAME} ${SOURCES}
diff --git a/audio/id3ren/files/patch-ab b/audio/id3ren/files/patch-ab
index 5cdd47156820..961ae28dbda6 100644
--- a/audio/id3ren/files/patch-ab
+++ b/audio/id3ren/files/patch-ab
@@ -1,10 +1,10 @@
---- id3tag.c.orig	Wed Mar 18 17:18:34 1998
-+++ id3tag.c	Sun Dec 26 15:11:42 1999
-@@ -365,6 +365,7 @@
-     return TRUE;

-   }

- 

-+  memset(string, 0, size);

-   fgets(string, size, stdin);

- 

-   if (string[strlen(string)-1] == '\n')

+--- src/id3tag.c.orig	Fri Jan  7 09:32:59 2005
++++ src/id3tag.c	Fri Jan  7 09:33:14 2005
+@@ -369,6 +369,7 @@
+     return TRUE;
+   }
+ 
++  memset(string, 0, size);
+   fgets(string, size, stdin);
+ 
+   if (string[strlen(string)-1] == '\n')
diff --git a/audio/id3ren/files/patch-man::Makefile b/audio/id3ren/files/patch-man::Makefile
new file mode 100644
index 000000000000..bb347724c046
--- /dev/null
+++ b/audio/id3ren/files/patch-man::Makefile
@@ -0,0 +1,12 @@
+--- man/Makefile.orig	Fri Jan  7 09:53:38 2005
++++ man/Makefile	Fri Jan  7 09:53:54 2005
+@@ -1,6 +1,6 @@
+-RM = rm -f
+-INSTALL = install -m 755
+-INSTALL_DIR = /usr/man/man1
++RM ?= rm -f
++INSTALL = ${BSD_INSTALL_PROGRAM}
++INSTALL_DIR = ${PREFIX}/man/man1
+ INSTALL_NAME = id3ren.1.gz
+ 
+ all: