- Update to 0.7.1 pre2

  This uses libusb for accesing a device, kernel module is no longer needed.

PR:		ports/67410
Submitted by:	Sergey Akifyev <asa@gascom.ru> (maintainer)

8 files changed, 28 insertions, 95 deletions

diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index f89c08da84a2..647a882eae9a 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	mpiosh
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1.p2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mpio
-DISTNAME=	mpio-${PORTVERSION}
+DISTNAME=	mpio-${PORTVERSION:S|.p|_pre|}
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Digit@lway MPIO MP3 player tool
 
-RUN_DEPENDS=	${MODULES}/mpio.ko:${PORTSDIR}/audio/mpio-driver
-
-MODULES?=	/modules
+LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb
 
 USE_ICONV=	yes
 USE_LIBTOOL_VER=	13
@@ -28,10 +26,4 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-IGNORE=		This port only works for FreeBSD 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mpiosh/distinfo b/audio/mpiosh/distinfo
index 801709b98018..9b2003483db4 100644
--- a/audio/mpiosh/distinfo
+++ b/audio/mpiosh/distinfo
@@ -1,2 +1,2 @@
-MD5 (mpio-0.7.0.tar.gz) = 09790dd74be6d9dcfffe7090713a7387
-SIZE (mpio-0.7.0.tar.gz) = 290415
+MD5 (mpio-0.7.1_pre2.tar.gz) = c15e771455c4f4a883df78e2c83b128b
+SIZE (mpio-0.7.1_pre2.tar.gz) = 404509
diff --git a/audio/mpiosh/files/patch-Makefile.in b/audio/mpiosh/files/patch-Makefile.in
index 71948adfe65c..a8f9bb892916 100644
--- a/audio/mpiosh/files/patch-Makefile.in
+++ b/audio/mpiosh/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Dec  7 14:52:24 2003
-+++ Makefile.in	Sun Dec  7 14:54:36 2003
-@@ -93,7 +93,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
--SUBDIRS = kernel libmpio mpiosh etc tools 
-+SUBDIRS = libmpio mpiosh etc tools 
+--- Makefile.in.orig	Mon May 31 09:13:58 2004
++++ Makefile.in	Mon May 31 09:14:08 2004
+@@ -184,7 +184,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = @MPIO_KERNEL@ libmpio mpiosh etc tools hotplug
++SUBDIRS = @MPIO_KERNEL@ libmpio mpiosh etc tools
+ EXTRA_DIST = mpio.spec
+ all: all-recursive
  
- sbin_SCRIPTS = mkmpiodev
- EXTRA_DIST = mpio.spec mkmpiodev
diff --git a/audio/mpiosh/files/patch-configure b/audio/mpiosh/files/patch-configure
deleted file mode 100644
index 43289a349eb9..000000000000
--- a/audio/mpiosh/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Sun Dec  7 15:00:37 2003
-+++ configure	Sun Dec  7 15:03:44 2003
-@@ -7797,6 +7797,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8118,26 +8118,6 @@
-
-
- KERNEL_INCLUDE=
--if test -d "/lib/modules/${kernel_version}/build/include"; then
--    KERNEL_INCLUDE="/lib/modules/${kernel_version}/build/include"
--elif test -d "/usr/src/linux-2.4/include"; then
--    KERNEL_INCLUDE="/usr/src/linux-2.4/include"
--elif test -d "/usr/include/linux"; then
--    KERNEL_INCLUDE="/usr/include/linux"
--elif test -d "/usr/src/linux/include"; then
--    KERNEL_INCLUDE="/usr/src/linux/include"
--fi
--
--if test -z ${KERNEL_INCLUDE}; then
--    { { echo "$as_me:$LINENO: error: could not find directory of kernel include files" >&5
--echo "$as_me: error: could not find directory of kernel include files" >&2;}
--   { (exit 1); exit 1; }; }
--else
--    echo "$as_me:$LINENO: result: Using kernel includes from ${KERNEL_INCLUDE}" >&5
--echo "${ECHO_T}Using kernel includes from ${KERNEL_INCLUDE}" >&6
--fi
--
--
-
- # could not find a way to compile the kernel module correctly
- #    kernel/Makefile
diff --git a/audio/mpiosh/files/patch-libmpio-defs.h b/audio/mpiosh/files/patch-libmpio-defs.h
deleted file mode 100644
index 0ca4688ef183..000000000000
--- a/audio/mpiosh/files/patch-libmpio-defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpio/defs.h.orig        Fri Jun 20 10:41:50 2003
-+++ libmpio/defs.h     Fri Jun 20 10:42:08 2003
-@@ -99,7 +99,7 @@
- #define NULL             0
- #endif
-
--#define MPIO_DEVICE "/dev/usb/mpio"
-+#define MPIO_DEVICE "/dev/urio0"
- #define MPIO_CHARSET "ISO-8859-15"
-
- #define SECTOR_SIZE      0x200
diff --git a/audio/mpiosh/files/patch-mpiosh-Makefile.in b/audio/mpiosh/files/patch-mpiosh-Makefile.in
index 66445733765d..169ec6d64737 100644
--- a/audio/mpiosh/files/patch-mpiosh-Makefile.in
+++ b/audio/mpiosh/files/patch-mpiosh-Makefile.in
@@ -1,11 +1,11 @@
---- mpiosh/Makefile.in.orig    Thu Jun 19 19:54:46 2003
-+++ mpiosh/Makefile.in Thu Jun 19 19:55:54 2003
-@@ -142,7 +142,7 @@
-
- AM_CFLAGS = -DSYSCONFDIR=\"@sysconfdir@\"
-
--mpiosh_LDADD = ../libmpio/libmpio.la -lreadline -lncurses
-+mpiosh_LDADD = ../libmpio/libmpio.la -lreadline -lncurses -liconv
-
- noinst_HEADERS = mpiosh.h \
-               callback.h \
+--- mpiosh/Makefile.in.orig	Mon May 31 09:19:32 2004
++++ mpiosh/Makefile.in	Mon May 31 09:20:36 2004
+@@ -116,7 +116,7 @@
+ KERNEL_INCLUDE = @KERNEL_INCLUDE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -liconv
+ LIBTOOL = @LIBTOOL@
+ LIBUSB_CONFIG = @LIBUSB_CONFIG@
+ LN_S = @LN_S@
diff --git a/audio/mpiosh/files/patch-tools-Makefile.in b/audio/mpiosh/files/patch-tools-Makefile.in
deleted file mode 100644
index f88f77120658..000000000000
--- a/audio/mpiosh/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig     Thu Jun 19 20:02:33 2003
-+++ tools/Makefile.in  Thu Jun 19 20:02:46 2003
-@@ -138,7 +138,7 @@
-
- am_mpiologo_OBJECTS = mpiologo.$(OBJEXT)
- mpiologo_OBJECTS = $(am_mpiologo_OBJECTS)
--mpiologo_LDADD = $(LDADD)
-+mpiologo_LDADD = $(LDADD) -lgnugetopt
- mpiologo_DEPENDENCIES =
- mpiologo_LDFLAGS =
-
diff --git a/audio/mpiosh/pkg-plist b/audio/mpiosh/pkg-plist
index 9d7e06e5a9ff..1e2da3ee2af4 100644
--- a/audio/mpiosh/pkg-plist
+++ b/audio/mpiosh/pkg-plist
@@ -2,10 +2,10 @@ bin/mpiologo
 bin/mpiosh
 etc/mpio/mpioshrc
 lib/libmpio.a
+lib/libmpio.la
 lib/libmpio.so
 lib/libmpio.so.1
 include/mpio/defs.h
 include/mpio/mpio.h
-sbin/mkmpiodev
 @dirrm include/mpio
 @dirrm etc/mpio