git: 9e9918d1f04b - main - audio/libaacplus: Fix MASTER_SITES, deprecate and set expiration date to 2021-12-31

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Thu, 14 Oct 2021 08:31:54 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e9918d1f04b0eb8c57cc09b6359fd15bc735d17

commit 9e9918d1f04b0eb8c57cc09b6359fd15bc735d17
Author:     takefu <takefu@airport.fm>
AuthorDate: 2021-10-14 08:27:13 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2021-10-14 08:31:37 +0000

    audio/libaacplus: Fix MASTER_SITES, deprecate and set expiration date to 2021-12-31
    
    PR:             258239
    Approved by:    arrowd (mentor)
    Differential Revision:  https://reviews.freebsd.org/D32471
---
 audio/libaacplus/Makefile                    | 27 +++++++++-------
 audio/libaacplus/distinfo                    |  5 +--
 audio/libaacplus/files/patch-src_Makefile.am | 48 ++++++++++++++++++++++++----
 audio/libaacplus/pkg-descr                   |  2 +-
 4 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 70e6fe20ac63..f7b57a36963e 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -1,14 +1,12 @@
-# Created by: takefu <takefu@airport.fm>
-
 PORTNAME=	libaacplus
 PORTVERSION=	2.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/ \
 		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2 \
-		http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2
+		https://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SRC26410}:site2
+		${SRC26410}.zip:site2
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	HE-AAC+ Codec as Shared Library
@@ -17,23 +15,23 @@ LICENSE=	libaacplus
 LICENSE_NAME=	3GPP
 LICENSE_TEXT=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-LICENSE_DISTFILES_3GPP=	${SRC26410}
 
-CONFLICTS=	aacplusenc-0*
+DEPRECATED=	Abandoned upstream, no new release since 2011
+EXPIRATION_DATE=2021-12-31
 
-USE_CSTD=	gnu89
 USES=		autoreconf cpe pathfix pkgconfig libtool
+
+USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
-CPE_VENDOR=	libaacplus_project
+
+CONFLICTS=	aacplusenc-0*
 
 OPTIONS_DEFINE=	FFTW3
 OPTIONS_DEFAULT=FFTW3
 
-SRC26410=	26410-800.zip
-
 FFTW3_DESC=	Use FFTW3 library for performance
 
 FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
@@ -41,13 +39,18 @@ FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 FFTW3_CONFIGURE_ON=	--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
 FFTW3_CONFIGURE_OFF=	--with-fftw3=no
 
+LICENSE_DISTFILES_3GPP=	${SRC26410}.zip
+SRC26410=	26410-g00
+
 pre-configure:
-	@${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src
+	@${CP} ${DISTDIR}/${SRC26410}.zip ${WRKSRC}/src
 	@${REINPLACE_CMD} -e 's,@includedir@\/aacplus,@prefix@\/include,' \
 		${WRKSRC}/aacplus.pc.in
 	@${REINPLACE_CMD} -e 's,\/aacplus\.h,\/libaacplus\/aacplus\.h,' \
 		${WRKSRC}/aacplus.spec.in
 	@${REINPLACE_CMD} -e 's,INCLUDES,AM_CPPFLAGS,'\
 		${WRKSRC}/frontend/Makefile.am ${WRKSRC}/src/Makefile.am
+	@${REINPLACE_CMD} -e 's,%%SRC26410%%,${SRC26410},g' \
+		${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/audio/libaacplus/distinfo b/audio/libaacplus/distinfo
index f8cc26ab2c05..3f37847ca576 100644
--- a/audio/libaacplus/distinfo
+++ b/audio/libaacplus/distinfo
@@ -1,4 +1,5 @@
+TIMESTAMP = 1630653095
 SHA256 (libaacplus-2.0.2.tar.gz) = 60dceb64d4ecf0be8d21661d5af2f214710f9d5b6ab389a5bdebf746baa7e1d7
 SIZE (libaacplus-2.0.2.tar.gz) = 42155
-SHA256 (26410-800.zip) = 4e7b3268b4e21a4dc2c88ee3af57c9115334d6b616a6e5f2e3f43643bf37b72f
-SIZE (26410-800.zip) = 1348294
+SHA256 (26410-g00.zip) = 2a180b4a71160bdf37f49c47be6e67e0674f560b7d329088b2f13d232ed82db2
+SIZE (26410-g00.zip) = 1215311
diff --git a/audio/libaacplus/files/patch-src_Makefile.am b/audio/libaacplus/files/patch-src_Makefile.am
index 78786b6e24f5..48ac0542ee44 100644
--- a/audio/libaacplus/files/patch-src_Makefile.am
+++ b/audio/libaacplus/files/patch-src_Makefile.am
@@ -1,19 +1,53 @@
 --- src/Makefile.am.orig	2010-11-10 21:27:41 UTC
 +++ src/Makefile.am
-@@ -206,14 +206,14 @@ $(library_sources_used):
+@@ -1,5 +1,5 @@
+ 
+-DISTCLEANFILES = 26410-800.zip $(top_srcdir)/26410-800.doc 26410-800-ANSI-C_source_code.zip $(library_sources_used) $(library_headers_used)
++DISTCLEANFILES = %%SRC26410%%.zip $(top_srcdir)/%%SRC26410%%.doc %%SRC26410%%-ANSI-C_source_code.zip $(library_sources_used) $(library_headers_used)
+ EXTRA_DIST = libaacplus.sym
+ INCLUDES = @FFTW3_INCFLAGS@ -I$(top_srcdir)/include
+ LDADD = @FFTW3_LDFLAGS@
+@@ -191,9 +191,9 @@ remove_debugging_symbols:
+ unpack_3gp_sources:
+ 	if ! [ -e $(srcdir)/aacenc.c ]; \
+ 	then \
+-	$(MAKE) $(srcdir)/26410-800-ANSI-C_source_code.zip; \
++	$(MAKE) $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip; \
+ 	$(MAKE) $(srcdir)/FloatFR_aacPlusenc; \
+-	rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip; \
++	rm -f $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip; \
+ 	$(MAKE) sources_delete; \
+ 	$(MAKE) sources_copy; \
+ 	rm -rf $(srcdir)/FloatFR_aacPlusenc; \
+@@ -206,22 +206,22 @@ $(library_sources_used):
  	$(MAKE) unpack_3gp_sources
  
  $(srcdir)/FloatFR_aacPlusenc:
 -	cd $(srcdir) && $(UNZIP) 26410-800-ANSI-C_source_code.zip
-+	cd $(srcdir) && /usr/bin/bsdtar xf 26410-800-ANSI-C_source_code.zip
++	cd $(srcdir) && /rescue/tar xf  %%SRC26410%%-ANSI-C_source_code.zip
  	mv -f $(srcdir)/3GPP_enhanced_aacPlus_src_*/FloatFR_aacPlusenc $(srcdir)
  	rm -rf $(srcdir)/3GPP_enhanced_aacPlus_src_*
  
  
- $(srcdir)/26410-800-ANSI-C_source_code.zip: $(srcdir)/26410-800.zip
- 	rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip $(srcdir)/26410-800.doc
+-$(srcdir)/26410-800-ANSI-C_source_code.zip: $(srcdir)/26410-800.zip
+-	rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip $(srcdir)/26410-800.doc
 -	cd $(srcdir) && $(UNZIP) 26410-800.zip
-+	cd $(srcdir) && /usr/bin/bsdtar xf 26410-800.zip
- 	mv $(srcdir)/26410-800.doc $(top_srcdir)/26410-800.doc
- 	chmod og-w $(top_srcdir)/26410-800.doc
+-	mv $(srcdir)/26410-800.doc $(top_srcdir)/26410-800.doc
+-	chmod og-w $(top_srcdir)/26410-800.doc
++$(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip: $(srcdir)/%%SRC26410%%.zip
++	rm -f $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip $(srcdir)/%%SRC26410%%.doc
++	cd $(srcdir) && /rescue/tar xf %%SRC26410%%.zip
++	mv $(srcdir)/%%SRC26410%%.doc $(top_srcdir)/%%SRC26410%%.doc
++	chmod og-w $(top_srcdir)/%%SRC26410%%.doc
+ 
+-$(srcdir)/26410-800.zip:
+-	cd $(srcdir) && $(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
++$(srcdir)/%%SRC26410%%.zip:
++	cd $(srcdir) && $(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/%%SRC26410%%.zip
+ 
+ extraclean:
+-	rm -f $(distdir)/($(library_sources_used)) $(distdir)/($(library_headers_used)) $(distdir)/26410-800.zip $(distdir)/../26410-800.doc $(distdir)/26410-800_ANSI-C_source_code.zip
++	rm -f $(distdir)/($(library_sources_used)) $(distdir)/($(library_headers_used)) $(distdir)/%%SRC26410%%.zip $(distdir)/../%%SRC26410%%.doc $(distdir)/%%SRC26410%%_ANSI-C_source_code.zip
  
+ # WARNING: These commands use internal automake command and may fail in future version.
+ extradist-gzip: distdir extraclean
diff --git a/audio/libaacplus/pkg-descr b/audio/libaacplus/pkg-descr
index d11b80199f9b..fcacfc4b2c05 100644
--- a/audio/libaacplus/pkg-descr
+++ b/audio/libaacplus/pkg-descr
@@ -1,3 +1,3 @@
 HE-AAC+ Codec as Shared Library
 
-WWW: http://tipok.org.ua/node/17/
+WWW: https://tipok.org.ua/node/17/