Attachment #140183 for bug #186692

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





PORTNAME=	id3lib
PORTVERSION=	3.8.3
PORTREVISION=	6
CATEGORIES=	audio
MASTER_SITES=	SF

MAINTAINER=	kaeru@inigo-tech.com
COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags

USES=		iconv libtool
USES=		iconv
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes





--- configure.orig
+++ configure
+++ configure	Sun Aug 14 11:29:43 2005
@@ -9134,6 +9134,7 @@
 else
   ID3_NEEDZLIB_TRUE='#'

 fi
 
 
@@ -9730,14 +9731,13 @@
   if test ! x$silent = xyes; then
     exec 6>&1
   fi
-  #standalone library rules over libc
-  if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
+  if test $iconv_in_libc = 1; then
+    echo "$as_me:$LINENO: result: libc" >&5
+echo "${ECHO_T}libc" >&6
+  elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
     echo "$as_me:$LINENO: result: libiconv" >&5
 echo "${ECHO_T}libiconv" >&6
     ICONV_LIB=-liconv
-  elif test $iconv_in_libc = 1; then
-    echo "$as_me:$LINENO: result: libc" >&5
-echo "${ECHO_T}libc" >&6
   else
     echo "$as_me:$LINENO: result: not found (panic)" >&5
 echo "${ECHO_T}not found (panic)" >&6




--- examples/Makefile.in.orig	2007-10-31 00:27:29.000000000 +0100
+++ examples/Makefile.in	2007-10-31 00:27:55.000000000 +0100
@@ -647,19 +647,19 @@
 @AMDEP_TRUE@	./$(DEPDIR)/test_unicode.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
 DIST_SOURCES = $(findeng_SOURCES) $(findstr_SOURCES) $(get_pic_SOURCES) \




--- src/Makefile.in.orig	2007-10-31 00:26:59.000000000 +0100
+++ src/Makefile.in	2007-10-31 00:27:25.000000000 +0100
@@ -236,11 +236,11 @@
 @AMDEP_TRUE@	./$(DEPDIR)/writers.Plo
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
 DIST_SOURCES = $(libid3_la_SOURCES)

Lines 16-23 include/id3/tag.h Link Here

(-)audio/id3lib/pkg-plist (-1 / +1 lines)
16	include/id3/utils.h	16	include/id3/utils.h
17	include/id3/writer.h	17	include/id3/writer.h
18	include/id3/writers.h	18	include/id3/writers.h
19	lib/libid3-3.8.so
20	lib/libid3-3.8.so.3	19	lib/libid3-3.8.so.3
		20	lib/libid3-3.8.so.3.0.0
21	lib/libid3.a	21	lib/libid3.a
22	lib/libid3.la	22	lib/libid3.la
23	lib/libid3.so	23	lib/libid3.so

Return to bug 186692

Lines 3-17 Link Here

(-)audio/id3lib/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= id3lib	4	PORTNAME= id3lib
5	PORTVERSION= 3.8.3	5	PORTVERSION= 3.8.3
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
10	MAINTAINER= kaeru@inigo-tech.com	10	MAINTAINER= kaeru@inigo-tech.com
11	COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags	11	COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
12		12
13	USE_AUTOTOOLS= libtool	13	USES= iconv libtool
14	USES= iconv
15	GNU_CONFIGURE= yes	14	GNU_CONFIGURE= yes
16	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
17		16

Lines 1-6 Link Here

(-)audio/id3lib/files/patch-configure (-3 / +21 lines)
1	# $FreeBSD$	1	--- configure.orig
2	--- configure.orig Sun Aug 14 11:21:37 2005	2	+++ configure
3	+++ configure Sun Aug 14 11:29:43 2005
4	@@ -9134,6 +9134,7 @@	3	@@ -9134,6 +9134,7 @@
5	else	4	else
6	ID3_NEEDZLIB_TRUE='#'	5	ID3_NEEDZLIB_TRUE='#'
Lines 9-11 Link Here
9	fi	8	fi
10		9
11		10
		11	@@ -9730,14 +9731,13 @@
		12	if test ! x$silent = xyes; then
		13	exec 6>&1
		14	fi
		15	- #standalone library rules over libc
		16	- if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
		17	+ if test $iconv_in_libc = 1; then
		18	+ echo "$as_me:$LINENO: result: libc" >&5
		19	+echo "${ECHO_T}libc" >&6
		20	+ elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
		21	echo "$as_me:$LINENO: result: libiconv" >&5
		22	echo "${ECHO_T}libiconv" >&6
		23	ICONV_LIB=-liconv
		24	- elif test $iconv_in_libc = 1; then
		25	- echo "$as_me:$LINENO: result: libc" >&5
		26	-echo "${ECHO_T}libc" >&6
		27	else
		28	echo "$as_me:$LINENO: result: not found (panic)" >&5
		29	echo "${ECHO_T}not found (panic)" >&6

Lines 1-26 Link Here

(-)audio/id3lib/files/patch-examples-Makefile.in (-26 lines)
1	--- examples/Makefile.in.orig 2007-10-31 00:27:29.000000000 +0100
2	+++ examples/Makefile.in 2007-10-31 00:27:55.000000000 +0100
3	@@ -647,19 +647,19 @@
4	@AMDEP_TRUE@ ./$(DEPDIR)/test_unicode.Po
5	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
6	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
7	-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
8	+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
9	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
10	CCLD = $(CC)
11	-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
12	+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
13	$(AM_LDFLAGS) $(LDFLAGS) -o $@
14	CFLAGS = @CFLAGS@
15	CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
16	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
17	-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
18	+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
19	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
20	$(AM_CXXFLAGS) $(CXXFLAGS)
21	CXXLD = $(CXX)
22	-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
23	+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
24	$(AM_LDFLAGS) $(LDFLAGS) -o $@
25	CXXFLAGS = @CXXFLAGS@
26	DIST_SOURCES = $(findeng_SOURCES) $(findstr_SOURCES) $(get_pic_SOURCES) \

Lines 1-16 Link Here

(-)audio/id3lib/files/patch-src-Makefile.in (-16 lines)
1	--- src/Makefile.in.orig 2007-10-31 00:26:59.000000000 +0100
2	+++ src/Makefile.in 2007-10-31 00:27:25.000000000 +0100
3	@@ -236,11 +236,11 @@
4	@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo
5	CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
6	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
7	-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
8	+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
9	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
10	$(AM_CXXFLAGS) $(CXXFLAGS)
11	CXXLD = $(CXX)
12	-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
13	+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
14	$(AM_LDFLAGS) $(LDFLAGS) -o $@
15	CXXFLAGS = @CXXFLAGS@
16	DIST_SOURCES = $(libid3_la_SOURCES)