- Correct pkg-plist - don't use absolute pathnames there;

- don't install useless .la file;
- use libgnugetopt in rioutil(1).

4 files changed, 57 insertions, 9 deletions

diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 1047c2f9df5e..ace8fe104472 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		rioutil.1
-INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/rioutil/files/patch-ltmain.sh b/audio/rioutil/files/patch-ltmain.sh
new file mode 100644
index 000000000000..a17a6f53ac1c
--- /dev/null
+++ b/audio/rioutil/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/10/11 11:48:44	1.1
++++ ltmain.sh	2001/10/11 11:49:30
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/rioutil/files/patch-src::Makefile.in b/audio/rioutil/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..a7738f4cb68d
--- /dev/null
+++ b/audio/rioutil/files/patch-src::Makefile.in
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Mon Sep 17 21:41:29 2001
++++ src/Makefile.in	Thu Oct 11 15:04:39 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++
+@@ -223,7 +223,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-rioutil_OBJECTS =  main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
++rioutil_OBJECTS =  main.$(OBJEXT)
+ rioutil_LDFLAGS = 
+ riofck_OBJECTS =  fckrio.$(OBJEXT)
+ @MACOSX_TRUE@riofck_DEPENDENCIES =  \
+@@ -382,7 +382,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
+-main.o: main.c ../include/config.h ../include/rio.h main.h getopt.h
++main.o: main.c ../include/config.h ../include/rio.h main.h
+ 
+ info-am:
+ info: info-am
diff --git a/audio/rioutil/pkg-plist b/audio/rioutil/pkg-plist
index c4438fb6186d..57fceb022881 100644
--- a/audio/rioutil/pkg-plist
+++ b/audio/rioutil/pkg-plist
@@ -1,8 +1,6 @@
-/usr/local/bin/rioutil
-/usr/local/bin/riofck
-/usr/local/man/man1/rioutil.1.gz
-/usr/local/include/rio.h
-/usr/local/lib/librioutil.so.0
-/usr/local/lib/librioutil.so
-/usr/local/lib/librioutil.la
-/usr/local/lib/librioutil.a
+bin/riofck
+bin/rioutil
+include/rio.h
+lib/librioutil.a
+lib/librioutil.so
+lib/librioutil.so.0