Update to 1.0.6 and nolonger depends on id3lib

6 files changed, 15 insertions, 45 deletions

diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index ace8fe104472..0b8f29e2b7c3 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=       rioutil
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.6
 CATEGORIES=     audio
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo
index f52d99ddf63f..ea89f5361832 100644
--- a/audio/rioutil/distinfo
+++ b/audio/rioutil/distinfo
@@ -1 +1 @@
-MD5 (rioutil-1.0.0.tar.gz) = 757e5f1e95ce43dd53affbe37d9f6dd3
+MD5 (rioutil-1.0.6.tar.gz) = e729d33b3299280832b810ec282c422c
diff --git a/audio/rioutil/files/patch-aa b/audio/rioutil/files/patch-aa
index 95657d8c0988..d4eb5985b4dc 100644
--- a/audio/rioutil/files/patch-aa
+++ b/audio/rioutil/files/patch-aa
@@ -1,24 +1,15 @@
---- configure.orig	Wed Aug 29 13:56:29 2001
-+++ configure	Wed Aug 29 14:04:16 2001
-@@ -1785,7 +1785,7 @@
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp -I${prefix}/include conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-@@ -1820,7 +1820,7 @@
+--- configure.orig	Fri Dec 14 08:34:33 2001
++++ configure	Sat Dec 15 01:42:47 2001
+@@ -1672,7 +1672,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lgnugetopt  $LIBS"
 +LIBS="-L${prefix}/lib -lgnugetopt  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1826 "configure"
+ #line 1678 "configure"
  #include "confdefs.h"
-@@ -1854,7 +1854,7 @@
+@@ -1706,7 +1706,7 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -27,12 +18,3 @@
  
  else
    echo "$ac_t""no" 1>&6
-@@ -3350,7 +3350,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lid3  $LIBS"
-+LIBS="-L${prefix}/lib -lid3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3356 "configure"
- #include "confdefs.h"
diff --git a/audio/rioutil/files/patch-ab b/audio/rioutil/files/patch-ab
deleted file mode 100644
index 2f916df14670..000000000000
--- a/audio/rioutil/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- include/rio.h.orig	Wed Aug 29 13:59:41 2001
-+++ include/rio.h	Wed Aug 29 13:59:55 2001
-@@ -318,4 +318,5 @@
- /* startup graphic seems to be changeable. this function will change it whenever it is figured out */
- u_int32_t       set_gid_rio          (rio_instance_t *rio, char *file_name);
- 
-+#define ID3_4ARGS 1
- #endif /* _RIO_H */
diff --git a/audio/rioutil/files/patch-src::Makefile.in b/audio/rioutil/files/patch-src::Makefile.in
index a7738f4cb68d..39ec4af41cdf 100644
--- a/audio/rioutil/files/patch-src::Makefile.in
+++ b/audio/rioutil/files/patch-src::Makefile.in
@@ -1,17 +1,14 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Mon Sep 17 21:41:29 2001
-+++ src/Makefile.in	Thu Oct 11 15:04:39 2001
+--- src/Makefile.in.orig	Fri Dec 14 09:11:53 2001
++++ src/Makefile.in	Sat Dec 15 01:46:11 2001
 @@ -204,7 +204,7 @@
  INCLUDES =  -I$(top_srcdir)/include -I/usr/local/include
  
  riofck_SOURCES = fckrio.c
 -rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
 +rioutil_SOURCES = main.c main.h
- @MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit -lstdc++
- @MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lstdc++
- @MACOSX_TRUE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit -lstdc++
+ @MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
+ @MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
+ @MACOSX_TRUE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit /System/Library/Frameworks/CoreFoundation.framework/Versions/Current/CoreFoundation
 @@ -223,7 +223,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -21,7 +18,7 @@ $FreeBSD$
  rioutil_LDFLAGS = 
  riofck_OBJECTS =  fckrio.$(OBJEXT)
  @MACOSX_TRUE@riofck_DEPENDENCIES =  \
-@@ -382,7 +382,7 @@
+@@ -383,7 +383,7 @@
  	../include/usbdevfs.h ../include/usbdrv.h ../include/rio_usb.h
  getopt.o: getopt.c ../include/config.h
  getopt1.o: getopt1.c ../include/config.h
diff --git a/audio/rioutil/pkg-plist b/audio/rioutil/pkg-plist
index 57fceb022881..e036521a29a5 100644
--- a/audio/rioutil/pkg-plist
+++ b/audio/rioutil/pkg-plist
@@ -3,4 +3,4 @@ bin/rioutil
 include/rio.h
 lib/librioutil.a
 lib/librioutil.so
-lib/librioutil.so.0
+lib/librioutil.so.1