From 5ab5932c3cf4cccb72af9950bb1be569c2213580 Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Fri, 16 Sep 2011 17:57:58 +0000 Subject: - Use gnomehack - Remove CONFIGURE_ENV - Invalid 'WITH_OLDLIBS' deletion. PR: ports/160727 Submitted by: Takefu (maintainer) --- audio/libaacplus/Makefile | 16 +++++----------- audio/libaacplus/files/patch-Makefile.am | 11 ----------- audio/libaacplus/pkg-descr | 2 +- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 audio/libaacplus/files/patch-Makefile.am (limited to 'audio/libaacplus') diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile index 9bfcffaab2a9..bbeec691d976 100644 --- a/audio/libaacplus/Makefile +++ b/audio/libaacplus/Makefile @@ -11,6 +11,7 @@ CATEGORIES= audio MASTER_SITES= http://tipok.org.ua/downloads/media/aac+/libaacplus/:site1\ http://217.20.164.161/~tipok/aacplus/:site1\ http://media.wnet.ua/~tipok/aacplus/:site1\ + ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2\ http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2 DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:site1\ 26410-800.zip:site2 @@ -25,17 +26,16 @@ RESTRICTED= unclear legal status, probably need licenses from 3GPP, Via Licensin CONFLICTS= aacplusenc-0* -USE_GNOME= pkgconfig +USE_GNOME= gnomehack pkgconfig USE_LDCONFIG= yes USE_AUTOTOOLS= libtool libtoolize aclocal autoheader automake +GNOME_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes AUTOMAKE_ARGS= --add-missing ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \ -I ${LOCALBASE}/share/aclocal -I ${WRKSRC}/m4 LIBTOOLIZE_ARGS=--automake -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"\ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAN1= aacplusenc.1 @@ -54,13 +54,7 @@ CONFIGURE_ARGS+=--with-fftw3=no pre-configure: @${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src - -post-patch: -.if defined(WITH_OLDLIBS) - @${REINPLACE_CMD} -e 's,-I${includedir},-I@includedir@\ -I${includedir},'\ - -e 's,@includedir@\/aacplus,@includedir@\/libaacplus,' ${WRKSRC}/aacplus.pc.in -.else - @${REINPLACE_CMD} -e 's,\/aacplus,,' ${WRKSRC}/aacplus.pc.in -.endif + @${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 .include diff --git a/audio/libaacplus/files/patch-Makefile.am b/audio/libaacplus/files/patch-Makefile.am deleted file mode 100644 index ec4f825fd218..000000000000 --- a/audio/libaacplus/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2010-10-07 21:00:14.000000000 +0900 -+++ Makefile.am 2010-10-14 18:02:13.000000000 +0900 -@@ -2,7 +2,7 @@ - SUBDIRS = src include patches frontend - - if HAVE_PKGCONFIG -- pkgconfigdir = $(libdir)/pkgconfig -+ pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = aacplus.pc - else - bin_SCRIPTS = aacplus-config diff --git a/audio/libaacplus/pkg-descr b/audio/libaacplus/pkg-descr index d9a5d70dcf20..d11b80199f9b 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/ru/node/17/ +WWW: http://tipok.org.ua/node/17/ -- cgit v1.2.3