From 6833152adaf57e2b97ce5b472e4fb11c2bf65adb Mon Sep 17 00:00:00 2001 From: jcs Date: Mon, 13 Dec 2004 05:40:55 +0000 Subject: [PATCH] some hackery to work around faad's system.h needing config.h bump pkgname "doowit" jolan@ --- audio/faad/Makefile | 12 +++++++++--- audio/faad/patches/patch-common_mp4v2_systems_h | 12 ++++++++++++ audio/faad/pkg/PLIST | 3 ++- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 audio/faad/patches/patch-common_mp4v2_systems_h diff --git a/audio/faad/Makefile b/audio/faad/Makefile index 29e94596b5e..4e91177a742 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2004/12/09 04:57:56 jcs Exp $ +# $OpenBSD: Makefile,v 1.15 2004/12/13 05:40:55 jcs Exp $ COMMENT= "MPEG2 and MPEG-4 AAC decoder" COMMENT-xmms= "XMMS input plugin for AAC files" DISTNAME= faad2-2.0 -PKGNAME= faad-2.0 -PKGNAME-xmms= faad-xmms-2.0 +PKGNAME= faad-2.0p0 +PKGNAME-xmms= faad-xmms-2.0p0 CATEGORIES= audio MASTER_SITES= http://users.codefusionis.com/~jolan/ @@ -60,4 +60,10 @@ post-patch: PATH=${PORTPATH} sh bootstrap @perl -pi -e 's/--no-verify//g' ${WRKSRC}/configure +post-configure: + @cp ${WRKSRC}/config.h ${WRKSRC}/faadconfig.h + +post-install: + @${INSTALL_DATA} ${WRKSRC}/faadconfig.h ${PREFIX}/include + .include diff --git a/audio/faad/patches/patch-common_mp4v2_systems_h b/audio/faad/patches/patch-common_mp4v2_systems_h new file mode 100644 index 00000000000..c6380f72b16 --- /dev/null +++ b/audio/faad/patches/patch-common_mp4v2_systems_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-common_mp4v2_systems_h,v 1.1 2004/12/13 05:40:55 jcs Exp $ +--- common/mp4v2/systems.h.orig Sun Dec 12 23:00:22 2004 ++++ common/mp4v2/systems.h Sun Dec 12 23:00:28 2004 +@@ -31,7 +31,7 @@ + #else + #undef PACKAGE + #undef VERSION +-#include ++#include + #endif + + diff --git a/audio/faad/pkg/PLIST b/audio/faad/pkg/PLIST index 2e31765d7f7..5a0c7f5abf7 100644 --- a/audio/faad/pkg/PLIST +++ b/audio/faad/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/18 10:26:55 espie Exp $ +@comment $OpenBSD: PLIST,v 1.5 2004/12/13 05:40:55 jcs Exp $ @conflict playfair-* bin/faad include/faad.h +include/faadconfig.h include/mp4.h include/mp4ff.h include/mpeg4ip.h