Clean up the configure step and allow building with an older version

still installed.

Problem reported by:	alane

audio/flac/Makefile

@@ -13,12 +13,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	naddy@FreeBSD.org
 
+BUILD_DEPENDS=	${LOCALBASE}/share/gettext/config.rpath:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
 .if defined(WITH_XMMS)
+# id3lib is only used by the XMMS plugin
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/audio/xmms
 LIB_DEPENDS+=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		xmms.3:${PORTSDIR}/audio/xmms
+CONFIGURE_ARGS+=--with-id3lib="${LOCALBASE}"
 PLIST_SUB=	XMMS=""
 .else
 CONFIGURE_ENV+=	XMMS_CONFIG=/usr/bin/false	# must be absolute path
@@ -31,10 +34,10 @@ BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-sse --enable-3dnow
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH} \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--enable-sse --enable-3dnow \
+		--with-libiconv-prefix="${LOCALBASE}" \
+		--with-ogg="${LOCALBASE}"
+CONFIGURE_ENV=	CONFIG_SHELL=${SH}
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
@@ -45,7 +48,12 @@ MAKE_ENV=	DOC=doc
 INSTALLS_SHLIB=	yes
 MAN1=		flac.1
 
+# missing auxiliary script
+post-extract:
+	@${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}
+
+# "obj" is magic to our make(1)
 post-configure:
-	@${RM} -rf ${WRKSRC}/obj	# "obj" is magic to our make(1)
+	@${RM} -rf ${WRKSRC}/obj
 
 .include <bsd.port.mk>