From 0b9143106816e56c2d4845ccac426722e835fe84 Mon Sep 17 00:00:00 2001 From: jakemsr Date: Fri, 1 Jun 2007 18:19:45 +0000 Subject: [PATCH] use a MAKE_ENV variable instead of patching and then substituting in a Makefile in pre-configure "yes, go ahead." steven@ --- audio/audacious-plugins/Makefile | 6 +----- audio/audacious-plugins/patches/patch-src_aac_src_Makefile | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile index 4c39eb059c2..46a496892ec 100644 --- a/audio/audacious-plugins/Makefile +++ b/audio/audacious-plugins/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/05/28 18:24:49 steven Exp $ +# $OpenBSD: Makefile,v 1.6 2007/06/01 18:19:45 jakemsr Exp $ SHARED_ONLY= Yes @@ -71,8 +71,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_header_altivec_h=no -pre-configure: - perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \ - ${WRKSRC}/src/aac/src/Makefile - .include diff --git a/audio/audacious-plugins/patches/patch-src_aac_src_Makefile b/audio/audacious-plugins/patches/patch-src_aac_src_Makefile index 89f0402d242..f3eb831e79d 100644 --- a/audio/audacious-plugins/patches/patch-src_aac_src_Makefile +++ b/audio/audacious-plugins/patches/patch-src_aac_src_Makefile @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_aac_src_Makefile,v 1.2 2007/05/21 11:34:07 steven Exp $ +$OpenBSD: patch-src_aac_src_Makefile,v 1.3 2007/06/01 18:19:45 jakemsr Exp $ --- src/aac/src/Makefile.orig Wed Apr 4 20:38:00 2007 +++ src/aac/src/Makefile Sun Apr 8 11:28:33 2007 @@ -8,7 +8,7 @@ CFLAGS += $(PICFLAGS) @@ -6,7 +6,7 @@ $OpenBSD: patch-src_aac_src_Makefile,v 1.2 2007/05/21 11:34:07 steven Exp $ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++ -+LDFLAGS += -L!!LOCALBASE!!/lib -lfaad -lmp4ff -lstdc++ ++LDFLAGS += -L$(LOCALBASE)/lib -lfaad -lmp4ff -lstdc++ SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c