- Add LICENSE

- Switch to USES=autoreconf
- Clean the port up

5 files changed, 27 insertions, 47 deletions

diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 80a47fe600c7..8d71e2b2e6eb 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -10,23 +10,15 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to interface with the Rio600, Rio800, and psa[play devices
 
-USES=		gmake libtool
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		autoreconf gmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-EXTRA_PATCHES=  ${FILESDIR}/extra-patch-configure.ac
-USE_AUTOTOOLS=	autoconf
-
 post-extract:
-#	@${RM} -f ${WRKSRC}/src/getopt*
-# Fix for GCC 4.2
-	@${REINPLACE_CMD} -e 's,read_buffer = .*),(&),' \
-		${WRKSRC}/librioutil/rio.c
+	@${RM} -f ${WRKSRC}/src/getopt*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/rioutil/files/extra-patch-configure.ac b/audio/rioutil/files/patch-configure.ac
index 34d3d9d06a68..34d3d9d06a68 100644
--- a/audio/rioutil/files/extra-patch-configure.ac
+++ b/audio/rioutil/files/patch-configure.ac
diff --git a/audio/rioutil/files/patch-src_Makefile.am b/audio/rioutil/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..7996ff142fa7
--- /dev/null
+++ b/audio/rioutil/files/patch-src_Makefile.am
@@ -0,0 +1,20 @@
+--- src/Makefile.am.orig	2006-08-07 15:47:28 UTC
++++ src/Makefile.am
+@@ -1,14 +1,14 @@
+ bin_PROGRAMS = rioutil
+ 
+-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
++INCLUDES = -I$(top_srcdir)/include
+ 
+-rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
++rioutil_SOURCES = main.c main.h
+ 
+ if MACOSX
+ rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
+ PREBIND_FLAGS = -prebind
+ else
+-rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
++rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la
+ endif
+ 
+ rioutil_LDFLAGS = $(PREBIND_FLAGS)
diff --git a/audio/rioutil/files/patch-src__Makefile.in b/audio/rioutil/files/patch-src__Makefile.in
deleted file mode 100644
index e697fd437268..000000000000
--- a/audio/rioutil/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/Makefile.in.orig	Fri Feb 15 20:49:03 2008
-+++ src/Makefile.in	Fri Feb 15 20:49:33 2008
-@@ -51,7 +51,7 @@
- am__installdirs = "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
--am_rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
-+am_rioutil_OBJECTS = main.$(OBJEXT)
- rioutil_OBJECTS = $(am_rioutil_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -172,9 +172,9 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
--rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
--@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
-+INCLUDES = -I$(top_srcdir)/include
-+rioutil_SOURCES = main.c main.h
-+@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la
- @MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
- @MACOSX_TRUE@PREBIND_FLAGS = -prebind
- rioutil_LDFLAGS = $(PREBIND_FLAGS)
-@@ -250,8 +250,6 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
- 
- .c.o:
diff --git a/audio/rioutil/pkg-plist b/audio/rioutil/pkg-plist
index 5834d11203bc..fa70ecb50fd9 100644
--- a/audio/rioutil/pkg-plist
+++ b/audio/rioutil/pkg-plist
@@ -2,5 +2,6 @@ bin/rioutil
 include/rio.h
 lib/librioutil.a
 lib/librioutil.so
+lib/librioutil.so.1
 lib/librioutil.so.1.5.0
 man/man1/rioutil.1.gz