Attachment #46034 for bug #70783

View | Details | Raw Unified | Return to bug 70783
Collapse All | Expand All

Lines 6-13 Link Here

(-)audio/rioutil/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= rioutil	8	PORTNAME= rioutil
9	PORTVERSION= 1.0.6	9	PORTVERSION= 1.4.6
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-25 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A program to inferface with the Rio600, Rio800 and psa[play devices	15	COMMENT= A program to inferface with the Rio600, Rio800 and psa[play devices
17		16
18	USE_GETOPT_LONG=yes	17	LIB_DEPENDS= usb-0.1.7:${PORTSDIR}/devel/libusb
		18
		19	USE_GETOPT_LONG= yes
19	USE_GMAKE= yes	20	USE_GMAKE= yes
		21	USE_LIBTOOL_VER= 15
		22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		23	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
20	INSTALLS_SHLIB= yes	24	INSTALLS_SHLIB= yes
21	GNU_CONFIGURE= yes
22		25
23	MAN1= rioutil.1	26	MAN1= rioutil.1
		27
		28	CPPFLAGS= -I${LOCALBASE}/include
		29	LDFLAGS= -L${LOCALBASE}/lib
		30
		31	post-extract:
		32	@${RM} -f ${WRKSRC}/src/getopt*
24		33
25	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/rioutil/distinfo (-2 / +2 lines)
1	MD5 (rioutil-1.0.6.tar.gz) = e729d33b3299280832b810ec282c422c	1	MD5 (rioutil-1.4.6.tar.gz) = 3034cd74288c9cc6076222dd6412287a
2	SIZE (rioutil-1.0.6.tar.gz) = 267303	2	SIZE (rioutil-1.4.6.tar.gz) = 406514





$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"




--- 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_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@
 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@
 
 distclean-depend:
 info: info-am

Lines 1-5 Link Here

(-)audio/rioutil/pkg-descr (-2 / +7 lines)
1	rioutil is a program/library created to interface with Diamond MM's	1	rioutil is a utility designed for the use of interfacing with Sonic
2	Rio600, Rio800, and psa[play.	2	Blue/dnna's third, fourth, and fifth generations of flash MP3 players
		3	(Rio 600/800/900/S-Series/Riot/Cali/Chiba/Fuse and Nike psa[play).
		4	On many players, it goes beyond the packaged software by providing
		5	downloading.
		6
		7	WWW: http://rioutil.sourceforge.net/
3		8
4	- George Reid	9	- George Reid
5	greid@FreeBSD.org	10	greid@FreeBSD.org

Lines 1-6 Link Here

(-)audio/rioutil/pkg-plist (-2 / +1 lines)
1	bin/riofck
2	bin/rioutil	1	bin/rioutil
3	include/rio.h	2	include/rio.h
4	lib/librioutil.a	3	lib/librioutil.a
5	lib/librioutil.so	4	lib/librioutil.so
6	lib/librioutil.so.1	5	lib/librioutil.so.5

Return to bug 70783

Lines 1-28 Link Here

(-)audio/rioutil/files/patch-ltmain.sh (-28 lines)
1
2	$FreeBSD: ports/audio/rioutil/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:56 sobomax Exp $
3
4	--- ltmain.sh 2001/08/27 09:51:26 1.1
5	+++ ltmain.sh 2001/08/27 09:51:42
6	@@ -2408,6 +2408,9 @@
7	--netbsd*)
8	# Don't link with libc until the a.out ld.so is fixed.
9	;;
10	+ --freebsd*)
11	+ # FreeBSD doesn't need this...
12	+ ;;
13	*)
14	# Add libc to deplibs on all other systems if necessary.
15	if test "$build_libtool_need_lc" = "yes"; then
16	@@ -4175,10 +4178,12 @@
17	fi
18
19	# Install the pseudo-library for information purposes.
20	+ if /usr/bin/false; then
21	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
22	instname="$dir/$name"i
23	$show "$install_prog $instname $destdir/$name"
24	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
25	+ fi
26
27	# Maybe install the static library, too.
28	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-29 Link Here

(-)audio/rioutil/files/patch-src::Makefile.in (-23 / +39 lines)
1	--- src/Makefile.in.orig Fri Dec 14 09:11:53 2001	1	--- src/Makefile.in.orig Thu Aug 19 03:13:54 2004
2	+++ src/Makefile.in Sat Dec 15 01:46:11 2001	2	+++ src/Makefile.in Thu Aug 19 04:14:32 2004
3	@@ -204,7 +204,7 @@	3	@@ -98,12 +98,12 @@
4	INCLUDES = -I$(top_srcdir)/include -I/usr/local/include	4	install_sh = @install_sh@
		5	bin_PROGRAMS = rioutil
		6
		7	-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
		8	+INCLUDES = -I$(top_srcdir)/include
5		9
6	riofck_SOURCES = fckrio.c
7	-rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h	10	-rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
8	+rioutil_SOURCES = main.c main.h	11	+rioutil_SOURCES = main.c main.h
		12
9	@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit	13	@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
10	@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la	14	-@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
11	@MACOSX_TRUE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit /System/Library/Frameworks/CoreFoundation.framework/Versions/Current/CoreFoundation	15	+@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la
12	@@ -223,7 +223,7 @@	16	@MACOSX_TRUE@CFLGS = -traditional-cpp
13	CPPFLAGS = @CPPFLAGS@	17
14	LDFLAGS = @LDFLAGS@	18	rioutil_DEPENDENCIES = $(top_srcdir)/librioutil/librioutil.la
		19	@@ -114,7 +114,7 @@
		20	bin_PROGRAMS = rioutil$(EXEEXT)
		21	PROGRAMS = $(bin_PROGRAMS)
		22
		23	-am_rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
		24	+am_rioutil_OBJECTS = main.$(OBJEXT)
		25	rioutil_OBJECTS = $(am_rioutil_OBJECTS)
		26	rioutil_LDFLAGS =
		27
		28	@@ -125,7 +125,7 @@
15	LIBS = @LIBS@	29	LIBS = @LIBS@
16	-rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)	30	depcomp = $(SHELL) $(top_srcdir)/depcomp
17	+rioutil_OBJECTS = main.$(OBJEXT)	31	am__depfiles_maybe = depfiles
18	rioutil_LDFLAGS =	32	-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
19	riofck_OBJECTS = fckrio.$(OBJEXT)	33	+@AMDEP_TRUE@DEP_FILES = \
20	@MACOSX_TRUE@riofck_DEPENDENCIES = \	34	@AMDEP_TRUE@ ./$(DEPDIR)/main.Po
21	@@ -383,7 +383,7 @@	35	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
22	../include/usbdevfs.h ../include/usbdrv.h ../include/rio_usb.h	36	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
23	getopt.o: getopt.c ../include/config.h	37	@@ -187,8 +187,6 @@
24	getopt1.o: getopt1.c ../include/config.h	38	distclean-compile:
25	-main.o: main.c ../include/config.h ../include/rio.h main.h getopt.h	39	-rm -f *.tab.c
26	+main.o: main.c ../include/config.h ../include/rio.h main.h	40
		41	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
		42	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
		43	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
27		44
28	info-am:	45	distclean-depend:
29	info: info-am