From takefu@airport.fm  Wed Sep 14 09:36:22 2011
Return-Path: <takefu@airport.fm>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BAD0A1065672
	for <freebsd-gnats-submit@freebsd.org>; Wed, 14 Sep 2011 09:36:22 +0000 (UTC)
	(envelope-from takefu@airport.fm)
Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C8A38FC13
	for <freebsd-gnats-submit@freebsd.org>; Wed, 14 Sep 2011 09:36:22 +0000 (UTC)
Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1])
	by ae-osaka.co.jp (Postfix) with ESMTP id 2E1B011456
	for <freebsd-gnats-submit@freebsd.org>; Wed, 14 Sep 2011 18:36:21 +0900 (JST)
Received: from ae-osaka.co.jp ([127.0.0.1])
	by ae-osaka.co.jp (ae-osaka.co.jp [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id u4OFzQjN0VDg for <freebsd-gnats-submit@freebsd.org>;
	Wed, 14 Sep 2011 18:36:21 +0900 (JST)
Received: from [IPv6:2001:3e0:4ec:a011:c431:e548:36b2:f14b] (unknown [IPv6:2001:3e0:4ec:a011:c431:e548:36b2:f14b])
	by ae-osaka.co.jp (Postfix) with ESMTPSA id D85CE11452
	for <freebsd-gnats-submit@freebsd.org>; Wed, 14 Sep 2011 18:36:20 +0900 (JST)
Message-Id: <4E707594.5050507@airport.fm>
Date: Wed, 14 Sep 2011 18:36:20 +0900
From: Takefu <takefu@airport.fm>
Reply-To: takefu@airport.fm
To: freebsd-gnats-submit@freebsd.org
In-Reply-To: <201109140909.p8E99WIQ056349@unbound.local.ae-osaka.co.jp>
Subject: [MAINTAINER] audio/libaacplus: Use gnomehack
References: <201109140909.p8E99WIQ056349@unbound.local.ae-osaka.co.jp>

>Number:         160727
>Category:       ports
>Synopsis:       [MAINTAINER] audio/libaacplus: Use gnomehack
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 14 09:40:12 UTC 2011
>Closed-Date:    Fri Sep 16 17:58:34 UTC 2011
>Last-Modified:  Fri Sep 16 18:10:02 UTC 2011
>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@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 <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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Thu Sep 15 22:08:14 UTC 2011 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160727 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Fri Sep 16 17:58:20 UTC 2011 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160727 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160727: commit references a PR
Date: Fri, 16 Sep 2011 18:00:45 +0000 (UTC)

 beech       2011-09-16 17:57:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/libaacplus     Makefile pkg-descr 
   Removed files:
     audio/libaacplus/files patch-Makefile.am 
   Log:
   - Use gnomehack
   - Remove CONFIGURE_ENV
   - Invalid 'WITH_OLDLIBS' deletion.
   
   PR:             ports/160727
   Submitted by:   Takefu <takefu@airport.fm> (maintainer)
   
   Revision  Changes    Path
   1.9       +5 -11     ports/audio/libaacplus/Makefile
   1.3       +0 -11     ports/audio/libaacplus/files/patch-Makefile.am (dead)
   1.2       +1 -1      ports/audio/libaacplus/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
