Attachment 46034 Details for Bug 70783 – file.diff

[patch] file.diff

file.diff (text/plain), 6.37 KB, created by tkato432 on 2004-08-21 18:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2004-08-21 18:10:07 UTC

Size: 6.37 KB

patch

obsolete

>diff -urN /usr/ports/audio/rioutil/Makefile audio/rioutil/Makefile
>--- /usr/ports/audio/rioutil/Makefile	Wed Feb  4 18:55:30 2004
>+++ audio/rioutil/Makefile	Fri Aug 20 17:41:43 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	rioutil
>-PORTVERSION=	1.0.6
>-PORTREVISION=	2
>+PORTVERSION=	1.4.6
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,11 +14,21 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A program to inferface with the Rio600, Rio800 and psa[play devices
> 
>-USE_GETOPT_LONG=yes
>+LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb
>+
>+USE_GETOPT_LONG=	yes
> USE_GMAKE=	yes
>+USE_LIBTOOL_VER=	15
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> INSTALLS_SHLIB=	yes
>-GNU_CONFIGURE=	yes
> 
> MAN1=		rioutil.1
>+
>+CPPFLAGS=	-I${LOCALBASE}/include
>+LDFLAGS=	-L${LOCALBASE}/lib
>+
>+post-extract:
>+	@${RM} -f ${WRKSRC}/src/getopt*
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/audio/rioutil/distinfo audio/rioutil/distinfo
>--- /usr/ports/audio/rioutil/distinfo	Wed Jan 28 18:45:06 2004
>+++ audio/rioutil/distinfo	Fri Aug 20 17:32:45 2004
>@@ -1,2 +1,2 @@
>-MD5 (rioutil-1.0.6.tar.gz) = e729d33b3299280832b810ec282c422c
>-SIZE (rioutil-1.0.6.tar.gz) = 267303
>+MD5 (rioutil-1.4.6.tar.gz) = 3034cd74288c9cc6076222dd6412287a
>+SIZE (rioutil-1.4.6.tar.gz) = 406514
>diff -urN /usr/ports/audio/rioutil/files/patch-ltmain.sh audio/rioutil/files/patch-ltmain.sh
>--- /usr/ports/audio/rioutil/files/patch-ltmain.sh	Thu Dec 20 15:18:56 2001
>+++ audio/rioutil/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,28 +0,0 @@
>-
>-$FreeBSD: ports/audio/rioutil/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:56 sobomax Exp $
>-
>---- ltmain.sh	2001/08/27 09:51:26	1.1
>-+++ ltmain.sh	2001/08/27 09:51:42
>-@@ -2408,6 +2408,9 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>-+	  *-*-freebsd*)
>-+	    # FreeBSD doesn't need this...
>-+	    ;;
>- 	  *)
>- 	    # Add libc to deplibs on all other systems if necessary.
>- 	    if test "$build_libtool_need_lc" = "yes"; then
>-@@ -4175,10 +4178,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/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 -urN /usr/ports/audio/rioutil/files/patch-src::Makefile.in audio/rioutil/files/patch-src::Makefile.in
>--- /usr/ports/audio/rioutil/files/patch-src::Makefile.in	Sat Dec 15 16:50:03 2001
>+++ audio/rioutil/files/patch-src::Makefile.in	Fri Aug 20 17:32:45 2004
>@@ -1,29 +1,45 @@
>---- 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
>+--- src/Makefile.in.orig	Thu Aug 19 03:13:54 2004
>++++ src/Makefile.in	Thu Aug 19 04:14:32 2004
>+@@ -98,12 +98,12 @@
>+ install_sh = @install_sh@
>+ bin_PROGRAMS = rioutil
>+ 
>+-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
>++INCLUDES = -I$(top_srcdir)/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
>- @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@
>+-@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
>++@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la
>+ @MACOSX_TRUE@CFLGS = -traditional-cpp
>+ 
>+ rioutil_DEPENDENCIES = $(top_srcdir)/librioutil/librioutil.la
>+@@ -114,7 +114,7 @@
>+ bin_PROGRAMS = rioutil$(EXEEXT)
>+ PROGRAMS = $(bin_PROGRAMS)
>+ 
>+-am_rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
>++am_rioutil_OBJECTS = main.$(OBJEXT)
>+ rioutil_OBJECTS = $(am_rioutil_OBJECTS)
>+ rioutil_LDFLAGS =
>+ 
>+@@ -125,7 +125,7 @@
>  LIBS = @LIBS@
>--rioutil_OBJECTS =  main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
>-+rioutil_OBJECTS =  main.$(OBJEXT)
>- rioutil_LDFLAGS = 
>- riofck_OBJECTS =  fckrio.$(OBJEXT)
>- @MACOSX_TRUE@riofck_DEPENDENCIES =  \
>-@@ -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
>--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
>+ depcomp = $(SHELL) $(top_srcdir)/depcomp
>+ am__depfiles_maybe = depfiles
>+-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
>++@AMDEP_TRUE@DEP_FILES = \
>+ @AMDEP_TRUE@	./$(DEPDIR)/main.Po
>+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
>+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>+@@ -187,8 +187,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@
>  
>- info-am:
>- info: info-am
>+ distclean-depend:
>diff -urN /usr/ports/audio/rioutil/pkg-descr audio/rioutil/pkg-descr
>--- /usr/ports/audio/rioutil/pkg-descr	Fri Sep 28 14:15:49 2001
>+++ audio/rioutil/pkg-descr	Fri Aug 20 17:32:45 2004
>@@ -1,5 +1,10 @@
>-rioutil is a program/library created to interface with Diamond MM's
>-Rio600, Rio800, and psa[play.
>+rioutil is a utility designed for the use of interfacing with Sonic
>+Blue/dnna's third, fourth, and fifth generations of flash MP3 players
>+(Rio 600/800/900/S-Series/Riot/Cali/Chiba/Fuse and Nike psa[play).
>+On many players, it goes beyond the packaged software by providing
>+downloading.
>+
>+WWW:  http://rioutil.sourceforge.net/
> 
> - George Reid
> greid@FreeBSD.org
>diff -urN /usr/ports/audio/rioutil/pkg-plist audio/rioutil/pkg-plist
>--- /usr/ports/audio/rioutil/pkg-plist	Sat Dec 15 16:50:01 2001
>+++ audio/rioutil/pkg-plist	Fri Aug 20 17:32:45 2004
>@@ -1,6 +1,5 @@
>-bin/riofck
> bin/rioutil
> include/rio.h
> lib/librioutil.a
> lib/librioutil.so
>-lib/librioutil.so.1
>+lib/librioutil.so.5

Actions: View | Diff

Attachments on bug 70783: 46034