Attachment #79919 for bug #114736

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

Lines 6-40 Link Here

(-)audio/streamripper/Makefile (-16 / +34 lines)
6	#	6	#
7		7
8	PORTNAME= streamripper	8	PORTNAME= streamripper
9	PORTVERSION= 1.61.27	9	PORTVERSION= 1.62.1
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= streamripper
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Splits SHOUTcast stream into tracks	14	COMMENT= Splits SHOUTcast stream into tracks
16		15
17	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad	16	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
		17	tre.6:${PORTSDIR}/textproc/libtre
18		18
		19	OPTIONS= FAAD "Include FAAD mpeg4 codec support" on \
		20	VORBIS "Include Ogg Vorbis codec support" on
		21
		22	USE_GNOME= gnometarget
19	USE_ICONV= yes	23	USE_ICONV= yes
		24	GNU_CONFIGURE= yes
		25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
		26	LDFLAGS="-L${LOCALBASE}/lib"
		27	CONFIGURE_ARGS= --without-included-libmad \
		28	--without-included-tre \
		29	--with-included-argv
		30	CFLAGS+= -DANSI_PROTOTYPES -DHAVE_LANGINFO_CODESET
20		31
21	OPTIONS= VORBIS "Include Ogg Vorbis codec support" on	32	MAN1= streamripper.1
		33	PLIST_FILES= bin/cstreamripper bin/streamripper
22		34
23	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
24		36
25	.ifdef(WITH_VORBIS)	37	.if defined(WITHOUT_FAAD)
26	LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg \	38	CONFIGURE_ARGS+= ac_cv_lib_faad_NeAACDecDecode2=no
27	vorbis.3:${PORTSDIR}/audio/libvorbis	39	.else
		40	LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
28	.endif	41	.endif
29		42
30	GNU_CONFIGURE= yes	43	.if defined(WITHOUT_VORBIS)
31	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \	44	CONFIGURE_ARGS+= --without-ogg
32	LDFLAGS="-L${LOCALBASE}/lib"	45	.else
33		46	LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
34	PLIST_FILES= bin/streamripper	47	.endif
35	MAN1= streamripper.1
36		48
37	pre-install:	49	post-patch:
38	@${CHMOD} +x ${WRKSRC}/install-sh	50	@${REINPLACE_CMD} -e '/if test/s\|==\|=\|g ; \
		51	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure
		52
		53	do-install:
		54	${INSTALL_PROGRAM} ${WRKSRC}/cstreamripper ${PREFIX}/bin
		55	${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${PREFIX}/bin
		56	${INSTALL_MAN} ${WRKSRC}/streamripper.1 ${MANPREFIX}/man/man1
39		57
40	.include <bsd.port.post.mk>	58	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)audio/streamripper/distinfo (-3 / +3 lines)
1	MD5 (streamripper-1.61.27.tar.gz) = d92a37bf23ee3f1bd5a9498d72c0562a	1	MD5 (streamripper-1.62.1.tar.gz) = c8c84b8acf84f3d431bf7b6303acc63b
2	SHA256 (streamripper-1.61.27.tar.gz) = d53fc5d3fb49bbb2332a4d26c5a63a0679009d6bf6b4b0e4e5078a9cdc183111	2	SHA256 (streamripper-1.62.1.tar.gz) = 03890195689f72d93426d674c84d3baf2ddee39cb3e09d09811ca5b08c2b21a3
3	SIZE (streamripper-1.61.27.tar.gz) = 1227559	3	SIZE (streamripper-1.62.1.tar.gz) = 1244851




--- Makefile.in.orig	Sun May 27 04:26:06 2007
+++ Makefile.in	Thu Jul 19 23:40:43 2007
@@ -64,7 +64,7 @@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
+install_sh_DATA = $(BSD_INSTALL_DATA)
+install_sh_PROGRAM = $(BSD_INSTALL_PROGRAM)
+install_sh_SCRIPT = $(BSD_INSTALL_SCRIPT)
+INSTALL_HEADER = $(BSD_INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
@@ -57,7 +57,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(INSTALL) -d
 CONFIG_HEADER = $(top_builddir)/lib/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT)
+am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT) $(am__objects_1)
 cstreamripper_OBJECTS = $(am_cstreamripper_OBJECTS)
 cstreamripper_DEPENDENCIES = lib/libstreamripper.a
 am_ictest_OBJECTS = ictest.$(OBJEXT)
@@ -227,7 +227,7 @@
 
 streamripper_SOURCES = console/streamripper.c $(am__append_2)
 cstreamripper_SOURCES = \
-	console/cstreamripper.c
+	console/cstreamripper.c $(am__append_2)
 
 libmad_manifest = \
 	libmad-0.15.1b/README \
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mkdir_p = @mkdir_p@
+mkdir_p = @INSTALL@ -d
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

Lines 1-20 Link Here

(-)audio/streamripper/files/patch-lib_parse.c (-20 lines)
1	--- lib/parse.c.orig Sun Sep 11 12:45:28 2005
2	+++ lib/parse.c Sun Sep 11 12:45:28 2005
3	@@ -70,14 +70,14 @@
4	PARSERULE_ICASE,
5	0, 0, 0, 0,
6	0,
7	- "[[:space:]]-?[[:space:]]mp3pro$",
8	+ " -? mp3pro$",
9	""
10	},
11	{ PARSERULE_CMD_MATCH,
12	PARSERULE_ICASE,
13	1, 2, 0, 0,
14	- 0,
15	- "^[[:space:]]([^-][^-[:space:]])[[:space:]]-[[:space:]](.)[[:space:]]$",
16	+ 0,
17	+ "^ ([^-][^- ]) - (.) $",
18	""
19	},
20	{ 0x00,




Argh, FreeBSD 4.X has a wctype.h header that does nothing.

--- lib/util.c.orig	Sun Sep 11 12:46:20 2005
+++ lib/util.c	Sun Sep 11 12:46:20 2005
@@ -28,9 +28,7 @@
 #if defined HAVE_WCHAR_H
 #include <wchar.h>
 #endif
-#if defined HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
+#include <ctype.h>
 #endif
 #include <locale.h>
 #include <time.h>
@@ -450,7 +448,7 @@
 
     /* Replace illegals to legal */
     for (wstrp = w_in; *wstrp; wstrp++) {
-	if ((wcschr(w_invalid, *wstrp) == NULL) && (!iswcntrl(*wstrp)))
+	if ((wcschr(w_invalid, *wstrp) == NULL) && (!iscntrl(*wstrp)))
 	    continue;
 	*wstrp = replacement;
     }
@@ -525,7 +523,7 @@
 
     /* Replace illegals to legal */
     for (wstrp = w_in; *wstrp; wstrp++) {
-	if ((wcschr(w_invalid, *wstrp) == NULL) && (!iswcntrl(*wstrp)))
+	if ((wcschr(w_invalid, *wstrp) == NULL) && (!iscntrl(*wstrp)))
 	    continue;
 	*wstrp = replacement;
     }

Return to bug 114736

Lines 1-50 Link Here

(-)audio/streamripper/files/patch-Makefile.in (-49 / +19 lines)
1	--- Makefile.in.orig Sun Nov 6 22:33:28 2005	1	--- Makefile.in.orig Sun May 27 04:26:06 2007
2	+++ Makefile.in Sun Nov 6 22:33:28 2005	2	+++ Makefile.in Thu Jul 19 23:40:43 2007
3	@@ -25,10 +25,10 @@	3	@@ -64,7 +64,7 @@
4	top_builddir = .
5	am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6	INSTALL = @INSTALL@
7	-install_sh_DATA = $(install_sh) -c -m 644
8	-install_sh_PROGRAM = $(install_sh) -c
9	-install_sh_SCRIPT = $(install_sh) -c
10	-INSTALL_HEADER = $(INSTALL_DATA)
11	+install_sh_DATA = $(BSD_INSTALL_DATA)
12	+install_sh_PROGRAM = $(BSD_INSTALL_PROGRAM)
13	+install_sh_SCRIPT = $(BSD_INSTALL_SCRIPT)
14	+INSTALL_HEADER = $(BSD_INSTALL_DATA)
15	transform = $(program_transform_name)
16	NORMAL_INSTALL = :
17	PRE_INSTALL = :
18	@@ -57,7 +57,7 @@
19	$(ACLOCAL_M4)
20	am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
21	configure.lineno configure.status.lineno
22	-mkinstalldirs = $(install_sh) -d
23	+mkinstalldirs = $(INSTALL) -d
24	CONFIG_HEADER = $(top_builddir)/lib/config.h
25	CONFIG_CLEAN_FILES =
26	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"	4	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
27	@@ -140,7 +140,7 @@	5	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
28	INSTALL_DATA = @INSTALL_DATA@	6	PROGRAMS = $(bin_PROGRAMS)
29	INSTALL_PROGRAM = @INSTALL_PROGRAM@	7	-am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT)
30	INSTALL_SCRIPT = @INSTALL_SCRIPT@	8	+am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT) $(am__objects_1)
31	-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@	9	cstreamripper_OBJECTS = $(am_cstreamripper_OBJECTS)
32	+INSTALL_STRIP_PROGRAM = @INSTALL_PROGRAM@	10	cstreamripper_DEPENDENCIES = lib/libstreamripper.a
33	LDFLAGS = @LDFLAGS@	11	am_ictest_OBJECTS = ictest.$(OBJEXT)
34	LIBCHARSET = @LIBCHARSET@	12	@@ -227,7 +227,7 @@
35	LIBIBERTY_LIBS = @LIBIBERTY_LIBS@	13
36	@@ -201,12 +201,12 @@	14	streamripper_SOURCES = console/streamripper.c $(am__append_2)
37	host_vendor = @host_vendor@	15	cstreamripper_SOURCES = \
38	includedir = @includedir@	16	- console/cstreamripper.c
39	infodir = @infodir@	17	+ console/cstreamripper.c $(am__append_2)
40	-install_sh = @install_sh@	18
41	+install_sh = @INSTALL@	19	libmad_manifest = \
42	libdir = @libdir@	20	libmad-0.15.1b/README \
43	libexecdir = @libexecdir@
44	localstatedir = @localstatedir@
45	mandir = @mandir@
46	-mkdir_p = @mkdir_p@
47	+mkdir_p = @INSTALL@ -d
48	oldincludedir = @oldincludedir@
49	prefix = @prefix@
50	program_transform_name = @program_transform_name@

Lines 1-33 Link Here

(-)audio/streamripper/files/patch-lib_util.c (-33 lines)
1	Argh, FreeBSD 4.X has a wctype.h header that does nothing.
2
3	--- lib/util.c.orig Sun Sep 11 12:46:20 2005
4	+++ lib/util.c Sun Sep 11 12:46:20 2005
5	@@ -28,9 +28,7 @@
6	#if defined HAVE_WCHAR_H
7	#include <wchar.h>
8	#endif
9	-#if defined HAVE_WCTYPE_H
10	-#include <wctype.h>
11	-#endif
12	+#include <ctype.h>
13	#endif
14	#include <locale.h>
15	#include <time.h>
16	@@ -450,7 +448,7 @@
17
18	/* Replace illegals to legal */
19	for (wstrp = w_in; *wstrp; wstrp++) {
20	- if ((wcschr(w_invalid, wstrp) == NULL) && (!iswcntrl(wstrp)))
21	+ if ((wcschr(w_invalid, wstrp) == NULL) && (!iscntrl(wstrp)))
22	continue;
23	*wstrp = replacement;
24	}
25	@@ -525,7 +523,7 @@
26
27	/* Replace illegals to legal */
28	for (wstrp = w_in; *wstrp; wstrp++) {
29	- if ((wcschr(w_invalid, wstrp) == NULL) && (!iswcntrl(wstrp)))
30	+ if ((wcschr(w_invalid, wstrp) == NULL) && (!iscntrl(wstrp)))
31	continue;
32	*wstrp = replacement;
33	}