From f2e1fac7689773db8168074e6666c1af7b7ff624 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 25 Feb 2005 23:51:19 +0000 Subject: [PATCH] - Fix build on amd64 [1] - Switch to bash 3 PR: ports/73746 [1] Submitted by: Arjan van Leeuwen Approved by: maintainer timeout (4 months) --- multimedia/mjpegtools/Makefile | 6 +----- multimedia/mjpegtools/files/patch-utils-Makefile.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 multimedia/mjpegtools/files/patch-utils-Makefile.in diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 07aaefeae1d2..40ed7e046f42 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Set of tools to record/playback/edit videos in MPEG format LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_GNOME= glib12 USE_GMAKE= yes @@ -60,10 +60,6 @@ post-install: BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif -.if ${ARCH} == "amd64" -BROKEN= "Does not compile on amd64 (needs -fPIC)" -.endif - # pre-detection # JPEGMMX .if exists(${LOCALBASE}/lib/libjpeg-mmx.a) diff --git a/multimedia/mjpegtools/files/patch-utils-Makefile.in b/multimedia/mjpegtools/files/patch-utils-Makefile.in new file mode 100644 index 000000000000..d2f073c05d13 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-utils-Makefile.in @@ -0,0 +1,11 @@ +--- utils/Makefile.in.orig Tue Nov 9 22:37:34 2004 ++++ utils/Makefile.in Tue Nov 9 22:37:44 2004 +@@ -56,7 +56,7 @@ + CCAS = @CCAS@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -fPIC + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@