ports/160727: [MAINTAINER] audio/libaacplus: Use gnomehack

[Takefu]

>Number:         160727
>Category:       ports
>Synopsis:       [MAINTAINER] audio/libaacplus: Use gnomehack
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 14 09:40:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
  Use gnomehack
  Remove CONFIGURE_ENV
  Invalid 'WITH_OLDLIBS' deletion.
>How-To-Repeat:
>Fix:
--- libaacplus.patch begins here ---
diff -ruN /usr/ports/audio/libaacplus/Makefile audio/libaacplus/Makefile
--- /usr/ports/audio/libaacplus/Makefile	2011-01-26 10:48:07.000000000 +0900
+++ audio/libaacplus/Makefile	2011-09-14 18:01:24.000000000 +0900
@@ -11,6 +11,7 @@
 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 @@

 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 @@

 pre-configure:
 	@${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src
-
-post-patch:
-.if defined(WITH_OLDLIBS)
-	@${REINPLACE_CMD} -e 's,-I${includedir},-I at includedir@\ -I${includedir},'\
-	-e 's, at includedir@\/aacplus, at includedir@\/libaacplus,' ${WRKSRC}/aacplus.pc.in
-.else
-	@${REINPLACE_CMD} -e 's,\/aacplus,,' ${WRKSRC}/aacplus.pc.in
-.endif
+	@${REINPLACE_CMD} -e 's, at includedir@\/aacplus, at prefix@\/include,' ${WRKSRC}/aacplus.pc.in
+	@${REINPLACE_CMD} -e 's,\/aacplus\.h,\/libaacplus\/aacplus\.h,' ${WRKSRC}/aacplus.spec.in

 .include <bsd.port.mk>
diff -ruN /usr/ports/audio/libaacplus/files/patch-Makefile.am audio/libaacplus/files/patch-Makefile.am
--- /usr/ports/audio/libaacplus/files/patch-Makefile.am	2011-01-26 10:48:07.000000000 +0900
+++ audio/libaacplus/files/patch-Makefile.am	1970-01-01 09:00:00.000000000 +0900
@@ -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 -ruN /usr/ports/audio/libaacplus/pkg-descr audio/libaacplus/pkg-descr
--- /usr/ports/audio/libaacplus/pkg-descr	2010-09-23 09:44:22.000000000 +0900
+++ audio/libaacplus/pkg-descr	2011-09-14 11:31:02.000000000 +0900
@@ -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/
--- libaacplus.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: