Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Jul 2018 19:09:29 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475683 - in head/audio/id3lib: . files
Message-ID:  <201807291909.w6TJ9TII033911@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Jul 29 19:09:29 2018
New Revision: 475683
URL: https://svnweb.freebsd.org/changeset/ports/475683

Log:
  Add LICENSE
  
  - Use USES=localbase
  - Cosmetic change
  - Regenerate patch files with makepatch:
  - Take maintainership

Added:
  head/audio/id3lib/files/patch-include_id3_globals.h
     - copied, changed from r475682, head/audio/id3lib/files/patch-globals.h
Deleted:
  head/audio/id3lib/files/patch-globals.h
Modified:
  head/audio/id3lib/Makefile
  head/audio/id3lib/files/patch-CVE-2007-4460
  head/audio/id3lib/files/patch-Makefile.in
  head/audio/id3lib/files/patch-configure
  head/audio/id3lib/files/patch-src_mp3__parse.cpp
  head/audio/id3lib/pkg-descr

Modified: head/audio/id3lib/Makefile
==============================================================================
--- head/audio/id3lib/Makefile	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/Makefile	Sun Jul 29 19:09:29 2018	(r475683)
@@ -7,27 +7,26 @@ PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
-BROKEN_mips=		fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
-BROKEN_mips64=		fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_mips=	fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
+BROKEN_mips64=	fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
+
 GNU_CONFIGURE=	yes
-USES=		iconv libtool
+USES=		iconv libtool localbase
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-extract:
 	@${RM} -r ${WRKSRC}/zlib
 
 post-patch:
-	@${REINPLACE_CMD} '/main/s/unsigned int/int/' \
-		${WRKSRC}/examples/demo_*.cpp
-	@${REINPLACE_CMD} 's/\(iomanip\)\.h/\1/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} '/include.*/{ p; s//include <cstring>/; n;n;n; }' \
+	@${REINPLACE_CMD} '/main/ s|unsigned int|int|' ${WRKSRC}/examples/demo_*.cpp
+	@${REINPLACE_CMD} 's|\(iomanip\)\.h|\1|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/include.*/ { p; s||include <cstring>|; n; n; n; }' \
 		${WRKSRC}/include/id3/id3lib_strings.h \
 		${WRKSRC}/include/id3/writers.h
 

Modified: head/audio/id3lib/files/patch-CVE-2007-4460
==============================================================================
--- head/audio/id3lib/files/patch-CVE-2007-4460	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/files/patch-CVE-2007-4460	Sun Jul 29 19:09:29 2018	(r475683)
@@ -1,6 +1,6 @@
---- ./src/tag_file.cpp.orig	2003-03-02 08:23:00.000000000 +0800
-+++ ./src/tag_file.cpp	2007-10-02 05:23:26.519473634 +0800
-@@ -242,8 +242,8 @@
+--- src/tag_file.cpp.orig	2003-03-02 00:23:00 UTC
++++ src/tag_file.cpp
+@@ -242,8 +242,8 @@ size_t RenderV2ToFile(const ID3_TagImpl&
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
  
@@ -11,7 +11,7 @@
      fstream tmpOut;
      createFile(sTempFile, tmpOut);
  
-@@ -257,7 +257,7 @@
+@@ -257,7 +257,7 @@ size_t RenderV2ToFile(const ID3_TagImpl&
        tmpOut.write((char *)tmpBuffer, nBytes);
      }
  
@@ -20,7 +20,7 @@
  
      // else we gotta make a temp file, copy the tag into it, copy the
      // rest of the old file after the tag, delete the old file, rename
-@@ -270,7 +270,7 @@
+@@ -270,7 +270,7 @@ size_t RenderV2ToFile(const ID3_TagImpl&
        //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
      }
  
@@ -29,7 +29,7 @@
      if (!tmpOut)
      {
        tmpOut.close();
-@@ -285,14 +285,14 @@
+@@ -285,14 +285,14 @@ size_t RenderV2ToFile(const ID3_TagImpl&
      uchar tmpBuffer[BUFSIZ];
      while (file)
      {

Modified: head/audio/id3lib/files/patch-Makefile.in
==============================================================================
--- head/audio/id3lib/files/patch-Makefile.in	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/files/patch-Makefile.in	Sun Jul 29 19:09:29 2018	(r475683)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Dec  6 10:37:42 2002
-+++ Makefile.in	Fri Dec  6 10:38:10 2002
-@@ -132,8 +132,8 @@
+--- Makefile.in.orig	2003-03-02 00:23:00 UTC
++++ Makefile.in
+@@ -132,8 +132,8 @@ EXTRA_DIST = \
  @ID3_NEEDZLIB_TRUE@zlib_subdir = zlib
  @ID3_NEEDZLIB_FALSE@zlib_subdir = 
  

Modified: head/audio/id3lib/files/patch-configure
==============================================================================
--- head/audio/id3lib/files/patch-configure	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/files/patch-configure	Sun Jul 29 19:09:29 2018	(r475683)
@@ -1,6 +1,6 @@
---- configure.orig	Sun Aug 14 11:21:37 2005
-+++ configure	Sun Aug 14 11:29:43 2005
-@@ -9134,6 +9134,7 @@
+--- configure.orig	2003-03-02 00:23:00 UTC
++++ configure
+@@ -9134,6 +9134,7 @@ if test x$ac_cv_lib_z_uncompress = xno; 
  else
    ID3_NEEDZLIB_TRUE='#'
    ID3_NEEDZLIB_FALSE=
@@ -8,7 +8,7 @@
  fi
  
  
-@@ -9730,14 +9731,13 @@
+@@ -9730,14 +9731,13 @@ fi
    if test ! x$silent = xyes; then
      exec 6>&1
    fi

Copied and modified: head/audio/id3lib/files/patch-include_id3_globals.h (from r475682, head/audio/id3lib/files/patch-globals.h)
==============================================================================
--- head/audio/id3lib/files/patch-globals.h	Sun Jul 29 19:09:23 2018	(r475682, copy source)
+++ head/audio/id3lib/files/patch-include_id3_globals.h	Sun Jul 29 19:09:29 2018	(r475683)
@@ -1,6 +1,6 @@
---- include/id3/globals.h.orig	Sun Feb 22 17:38:28 2004
-+++ include/id3/globals.h	Sun Feb 22 17:38:22 2004
-@@ -480,7 +480,7 @@
+--- include/id3/globals.h.orig	2003-03-02 00:23:00 UTC
++++ include/id3/globals.h
+@@ -480,7 +480,7 @@ ID3_ENUM(Mp3_Frequencies)
    MP3FREQUENCIES_24000HZ = 24000,
    MP3FREQUENCIES_32000HZ = 32000,
    MP3FREQUENCIES_48000HZ = 48000,

Modified: head/audio/id3lib/files/patch-src_mp3__parse.cpp
==============================================================================
--- head/audio/id3lib/files/patch-src_mp3__parse.cpp	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/files/patch-src_mp3__parse.cpp	Sun Jul 29 19:09:29 2018	(r475683)
@@ -1,6 +1,6 @@
---- src/mp3_parse.cpp.orig	2017-07-13 13:36:15 UTC
+--- src/mp3_parse.cpp.orig	2003-03-02 00:23:00 UTC
 +++ src/mp3_parse.cpp
-@@ -465,7 +465,7 @@ bool Mp3Info::Parse(ID3_Reader& reader, size_t mp3size
+@@ -465,7 +465,7 @@ bool Mp3Info::Parse(ID3_Reader& reader, 
    // from http://www.xingtech.com/developer/mp3/
  
    const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed

Modified: head/audio/id3lib/pkg-descr
==============================================================================
--- head/audio/id3lib/pkg-descr	Sun Jul 29 19:09:23 2018	(r475682)
+++ head/audio/id3lib/pkg-descr	Sun Jul 29 19:09:29 2018	(r475683)
@@ -3,5 +3,3 @@ id3lib 3.0.x conforms to all ID3v2 standards up to and
 informal standard.
 
 WWW: http://id3lib.sourceforge.net/
-
-Roman Shterenzon <roman@xpert.com>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807291909.w6TJ9TII033911>