Date: Mon, 31 May 2004 10:08:09 +0400 (MSD) From: Sergey Akifyev <asa@gascom.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67410: [maintainer] update audio/mpiosh 0.7.0->0.7.1 + more Message-ID: <200405310608.i4V689xo065361@asa.gascom.net.ru> Resent-Message-ID: <200405310610.i4V6AK6X049633@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67410
>Category: ports
>Synopsis: [maintainer] update audio/mpiosh 0.7.0->0.7.1 + more
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 30 23:10:19 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Sergey Akifyev
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
JSC Gascom
>Environment:
System: FreeBSD asa.gascom.net.ru 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #4: Mon Apr 12 11:41:25 MSD 2004 asa@boulder-current.gascom.ru:/usr/src/sys/i386/compile/ASA i386
>Description:
* Update mpiosh 0.7.0->0.7.1
* Use libusb instead of mpio-driver for MPIO access
ATTENTION!
Please, remove audio/mpio-driver port, as it is not required any more
>How-To-Repeat:
>Fix:
--- mpiosh.diff begins here ---
diff -ruN mpiosh.orig/Makefile mpiosh/Makefile
--- mpiosh.orig/Makefile Mon May 31 09:14:40 2004
+++ mpiosh/Makefile Mon May 31 09:23:51 2004
@@ -6,18 +6,16 @@
#
PORTNAME= mpiosh
-PORTVERSION= 0.7.0
+PORTVERSION= 0.7.1p2
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 @@
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 -ruN mpiosh.orig/distinfo mpiosh/distinfo
--- mpiosh.orig/distinfo Mon May 31 09:14:40 2004
+++ mpiosh/distinfo Mon May 31 09:18:13 2004
@@ -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 -ruN mpiosh.orig/files/patch-Makefile.in mpiosh/files/patch-Makefile.in
--- mpiosh.orig/files/patch-Makefile.in Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-Makefile.in Mon May 31 09:21:22 2004
@@ -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 -ruN mpiosh.orig/files/patch-configure mpiosh/files/patch-configure
--- mpiosh.orig/files/patch-configure Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-configure Thu Jan 1 03:00:00 1970
@@ -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 -ruN mpiosh.orig/files/patch-libmpio-Makefile.in mpiosh/files/patch-libmpio-Makefile.in
--- mpiosh.orig/files/patch-libmpio-Makefile.in Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-libmpio-Makefile.in Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- libmpio/Makefile.in.orig Tue Apr 20 16:51:47 2004
-+++ libmpio/Makefile.in Tue Apr 20 16:54:44 2004
-@@ -241,7 +241,7 @@
- $(mkinstalldirs) $(DESTDIR)$(libdir)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ f="$$p"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
- else :; fi; \
diff -ruN mpiosh.orig/files/patch-libmpio-defs.h mpiosh/files/patch-libmpio-defs.h
--- mpiosh.orig/files/patch-libmpio-defs.h Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-libmpio-defs.h Thu Jan 1 03:00:00 1970
@@ -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 -ruN mpiosh.orig/files/patch-mpiosh-Makefile.in mpiosh/files/patch-mpiosh-Makefile.in
--- mpiosh.orig/files/patch-mpiosh-Makefile.in Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-mpiosh-Makefile.in Mon May 31 09:28:01 2004
@@ -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 -ruN mpiosh.orig/files/patch-tools-Makefile.in mpiosh/files/patch-tools-Makefile.in
--- mpiosh.orig/files/patch-tools-Makefile.in Mon May 31 09:14:40 2004
+++ mpiosh/files/patch-tools-Makefile.in Thu Jan 1 03:00:00 1970
@@ -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 -ruN mpiosh.orig/pkg-plist mpiosh/pkg-plist
--- mpiosh.orig/pkg-plist Mon May 31 09:14:40 2004
+++ mpiosh/pkg-plist Mon May 31 10:01:47 2004
@@ -6,6 +6,5 @@
lib/libmpio.so.1
include/mpio/defs.h
include/mpio/mpio.h
-sbin/mkmpiodev
@dirrm include/mpio
@dirrm etc/mpio
--- mpiosh.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405310608.i4V689xo065361>