From fa9509791fb3ad63885e207da5c039b25eeef942 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Thu, 4 Oct 2007 02:01:29 +0000 Subject: [PATCH] Remove always-false/true conditions based on OSVERSION 500000 --- multimedia/avifile/Makefile | 12 ------------ multimedia/bsdbktr_tvtune/Makefile | 11 ++--------- multimedia/exportvideo/Makefile | 8 +++----- multimedia/goggles/Makefile | 4 ---- multimedia/handbrake/Makefile | 13 ++----------- multimedia/kino/Makefile | 4 ---- multimedia/lsdvd/Makefile | 9 +-------- multimedia/lxdvdrip/Makefile | 8 ++------ multimedia/mmsrip/Makefile | 9 +-------- multimedia/motion/Makefile | 6 ------ multimedia/mp4v2/Makefile | 8 +------- multimedia/mpeg4ip-libmp4v2/Makefile | 8 +------- multimedia/nxtvepg/Makefile | 8 ++------ multimedia/ogle/Makefile | 8 ++------ multimedia/pvr250/Makefile | 24 ------------------------ multimedia/pvrxxx/Makefile | 24 ------------------------ multimedia/quodlibet/Makefile | 4 ---- multimedia/shell-fm/Makefile | 8 +------- multimedia/tivodecode/Makefile | 8 +------- multimedia/xawtv/Makefile | 16 +--------------- multimedia/y4mscaler/Makefile | 4 ---- 21 files changed, 20 insertions(+), 184 deletions(-) diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 8e5fd306e918..51f821093806 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -64,10 +64,6 @@ PLIST_SUB+= QT="@comment " .include -.if ${OSVERSION} < 500000 -BROKEN= xvid plugin fails to build -.endif - .if ${OSVERSION} >= 600000 WITH_OPTIMIZED_CFLAGS= yes .endif @@ -299,14 +295,6 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|^subdirs[[:space:]]*=.*libmad.*$$||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -# int_fast16/32_t are not in 4.x -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|int_fast16_t|int16_t|g; \ - s|int_fast32_t|int32_t|g' \ - ${WRKSRC}/ffmpeg/libavcodec/jfdctfst.c \ - ${WRKSRC}/ffmpeg/libavcodec/jfdctint.c \ - ${WRKSRC}/ffmpeg/libavcodec/ffv1.c -.endif post-configure: @${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool diff --git a/multimedia/bsdbktr_tvtune/Makefile b/multimedia/bsdbktr_tvtune/Makefile index 702fdff119cb..f16a21701745 100644 --- a/multimedia/bsdbktr_tvtune/Makefile +++ b/multimedia/bsdbktr_tvtune/Makefile @@ -13,6 +13,7 @@ MASTER_SITES= http://mina.naguib.ca/dist/ MAINTAINER= mina.website@naguib.ca COMMENT= A console Brooktree (bktr) TV tuner +ONLY_FOR_ARCHS= alpha i386 PLIST_FILES= bin/bsdbktr_tvtune WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= bsdbktr_tvtune @@ -20,12 +21,4 @@ ALL_TARGET= bsdbktr_tvtune do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bsdbktr_tvtune ${PREFIX}/bin/ -.include - -.if ${OSVERSION} < 500000 -ONLY_FOR_ARCHS= i386 -.else -ONLY_FOR_ARCHS= alpha i386 -.endif - -.include +.include diff --git a/multimedia/exportvideo/Makefile b/multimedia/exportvideo/Makefile index b1c94a348d3a..e4e0877293c6 100644 --- a/multimedia/exportvideo/Makefile +++ b/multimedia/exportvideo/Makefile @@ -28,17 +28,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME} PORTDOCS= README README.links +# Compiling with MMX extensions fails on FreeBSD 5.x +WITHOUT_MMX= yes + .include .if ${ARCH} != "i386" IGNORE= Supported for i386 architecture only .endif -# Compiling with MMX extensions fails on FreeBSD 5.x -.if ${OSVERSION} >= 500000 -WITHOUT_MMX= yes -.endif - .if defined(WITHOUT_MMX) CONFIGURE_ARGS+= --no-mmx .endif diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile index 9c1993160061..3d91d1f7b1a0 100644 --- a/multimedia/goggles/Makefile +++ b/multimedia/goggles/Makefile @@ -35,12 +35,8 @@ pre-everything:: .ifdef(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else -.if ${OSVERSION} < 500000 -DEFAULT_DVD_DEVICE=/dev/acd0c -.else DEFAULT_DVD_DEVICE=/dev/acd0 .endif -.endif PLIST_FILES= \ bin/goggles \ diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 4cc48ac67e91..88ee09123c60 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -40,6 +40,7 @@ PLIST_FILES= bin/handbrake JAM?= ${LOCALBASE}/bin/jam SYSCTL_CMD?= /sbin/sysctl +WITH_DVD_DEVICE?= acd0 EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude beos \ --exclude contrib \ @@ -47,16 +48,6 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude beos \ --exclude macosx \ --exclude wx -.include - -.if ${OSVERSION} < 500000 -USE_GETOPT_LONG= yes -MAKE_ENV= EXTRA_LIBS="-lcipher -lgnugetopt" -WITH_DVD_DEVICE?= acd0c -.else -WITH_DVD_DEVICE?= acd0 -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; s|HBTest|${PORTNAME}|g' \ @@ -74,4 +65,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ -.include +.include diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index ff1af15300a4..afe5be803993 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -40,10 +40,6 @@ MAN1= kino.1 kino2raw.1 .include -.if ${OSVERSION} < 500000 -IGNORE= does not compile on FreeBSD 4.x -.endif - .if defined(WITH_FFMPEG_KINO) MAN1+= ffmpeg-kino.1 .endif diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile index 8bbfef8d21fb..d7a33ce07170 100644 --- a/multimedia/lsdvd/Makefile +++ b/multimedia/lsdvd/Makefile @@ -23,14 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" MAN1= lsdvd.1 PLIST_FILES= bin/lsdvd -.include - -.if ${OSVERSION} < 500000 -WITH_DVD_DEVICE?=/dev/acd0c -BROKEN= does not configure -.else WITH_DVD_DEVICE?=/dev/acd0 -.endif pre-everything:: @${ECHO_MSG} "===> The default DVD device is ${WITH_DVD_DEVICE}" @@ -42,4 +35,4 @@ post-patch: @${REINPLACE_CMD} -e 's|/dev/dvd|${WITH_DVD_DEVICE}|' \ ${WRKSRC}/lsdvd.c -.include +.include diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile index e3cc653c4a13..defb81b306c9 100644 --- a/multimedia/lxdvdrip/Makefile +++ b/multimedia/lxdvdrip/Makefile @@ -53,12 +53,10 @@ PORTDOCS= Changelog.de Changelog.en Changelog.fr \ TODO freebsd.doc MAN1= lxdvdrip.1 -.include - -.if ${OSVERSION} > 500000 PLIST_FILES= bin/vamps_${PORTNAME} \ bin/play_cell_${PORTNAME} -.endif + +.include post-patch: @${REINPLACE_CMD} -E \ @@ -91,10 +89,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf .endif # binaries -.if ${OSVERSION} > 500000 ${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps_${PORTNAME} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/vamps/play_cell_${PORTNAME} ${PREFIX}/bin -.endif ${INSTALL_PROGRAM} ${WRKSRC}/dvdbackup/dvdbackup_${PORTNAME} ${PREFIX}/bin # examples @${MKDIR} ${EXAMPLESDIR} diff --git a/multimedia/mmsrip/Makefile b/multimedia/mmsrip/Makefile index f1237b87f0e1..97ffc7447273 100644 --- a/multimedia/mmsrip/Makefile +++ b/multimedia/mmsrip/Makefile @@ -21,11 +21,4 @@ MAN1= mmsrip.1 PLIST_FILES= bin/mmsrip -.include - -.if ${OSVERSION} < 500000 -post-patch: - ${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's/stdint.h/inttypes.h/g' -.endif - -.include +.include diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 4178ab34877f..b11277743381 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -53,13 +53,7 @@ CFLAGS+= -DWITHOUT_V4L .if defined(WITH_LINUXTHREADS) || ${OSVERSION} < 504000 CONFIGURE_ARGS= --with-linuxthreads - -.if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads -.else -LIB_DEPENDS+= lthread.[24]:${PORTSDIR}/devel/linuxthreads -.endif - .endif post-install: diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index ac50a578aea9..41881b13e253 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -23,12 +23,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes -.include - -.if ${OSVERSION} < 500000 -CFLAGS+= -O2 -.endif - post-patch: ${TOUCH} -f ${WRKSRC}/bootstrapped # Speed up configure by not using 2 unneeded configure scripts. @@ -53,4 +47,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include .endfor -.include +.include diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile index ac50a578aea9..41881b13e253 100644 --- a/multimedia/mpeg4ip-libmp4v2/Makefile +++ b/multimedia/mpeg4ip-libmp4v2/Makefile @@ -23,12 +23,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes -.include - -.if ${OSVERSION} < 500000 -CFLAGS+= -O2 -.endif - post-patch: ${TOUCH} -f ${WRKSRC}/bootstrapped # Speed up configure by not using 2 unneeded configure scripts. @@ -53,4 +47,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include .endfor -.include +.include diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile index dfa000b18572..ff0ff8b3f526 100644 --- a/multimedia/nxtvepg/Makefile +++ b/multimedia/nxtvepg/Makefile @@ -17,6 +17,7 @@ COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver) LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 +NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes USE_XLIB= yes USE_X_PREFIX= yes @@ -25,13 +26,8 @@ MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} MAN1= nxtvepg.1 MYPORTDOCS= README TODO CHANGES manual.html -.include -.if ${OSVERSION} < 500000 -ONLY_FOR_ARCHS= i386 -.else -NOT_FOR_ARCHS= sparc64 -.endif +.include .if ${OSVERSION} > 502100 post-patch: diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index f103d76c2af5..72a9dd9d23b4 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -32,6 +32,8 @@ CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} \ --with-liba52=${LOCALBASE} INSTALLS_SHLIB= yes +DEFAULT_DVD_DEVICE?= /dev/acd0c + MAN1= ogle.1 MAN5= oglerc.5 @@ -93,11 +95,5 @@ pre-everything:: @${ECHO_MSG} '===> only with 486 processors and above.' .endif -# default DVD devices -.if ${OSVERSION} >= 500000 -DEFAULT_DVD_DEVICE?= /dev/acd0 -.else -DEFAULT_DVD_DEVICE?= /dev/acd0c -.endif .include diff --git a/multimedia/pvr250/Makefile b/multimedia/pvr250/Makefile index cbb069f0d9bb..81fe34693cf9 100644 --- a/multimedia/pvr250/Makefile +++ b/multimedia/pvr250/Makefile @@ -32,11 +32,7 @@ MAN1= pvr250-setchannel.1 .include -.if ${OSVERSION} < 500000 -MODULESDIR= /modules -.else MODULESDIR= /boot/kernel -.endif PLIST_SUB= MODULESDIR=${MODULESDIR} .if ${OSVERSION} >= 700031 @@ -53,21 +49,12 @@ IGNORE= You need the kernel sources installed to build this module. .endif patch-iicbb: -.if ${OSVERSION} < 500000 - @if [ -z "`${GREP} cxm_iic /usr/src/sys/dev/iicbus/iicbb.c`" ]; then \ - ${PATCH} -d/sys <${WRKDIR}/dev/cxm/Patch.iicbb-fbsd4; \ - ${ECHO_CMD} "Patched /usr/src/sys/dev/iicbus/iicbb.c"; \ - else \ - ${ECHO_CMD} "/usr/src/sys/dev/iicbus/iicbb.c was already patched"; \ - fi -.else @if [ -z "`${GREP} cxm_iic /usr/src/sys/dev/iicbus/iicbb.c`" ]; then \ ${PATCH} -d/sys <${WRKDIR}/dev/cxm/Patch.iicbb-fbsd5; \ ${ECHO_CMD} "Patched /usr/src/sys/dev/iicbus/iicbb.c"; \ else \ ${ECHO_CMD} "/usr/src/sys/dev/iicbus/iicbb.c was already patched"; \ fi -.endif do-extract: ${MKDIR} ${WRKDIR} @@ -76,15 +63,8 @@ do-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PVRTOOLS}.tar.gz ${EXTRACT_AFTER_ARGS}; post-patch: -.if ${OSVERSION} < 500000 - ${REINPLACE_CMD} -e 's/cxm0/bktr0/' \ - ${WRKDIR}/${PVRTOOLS}/setchannel.c - ${REINPLACE_CMD} -e 's/tuner0/bktr0/' \ - ${WRKDIR}/${PVRTOOLS}/setchannel.c -.else ${REINPLACE_CMD} -e 's/tuner0/cxm0/' \ ${WRKDIR}/${PVRTOOLS}/setchannel.c -.endif do-configure: cd ${WRKDIR}/dev/cxm; \ @@ -101,10 +81,6 @@ do-install: ${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/cxm.4 ${PREFIX}/man/man4/cxm.4 ${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/pvr250-setchannel.1 ${PREFIX}/man/man1/pvr250-setchannel.1 ${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setchannel ${PREFIX}/bin/pvr250-setchannel -.if ${OSVERSION} < 500000 - cd /dev; \ - ./MAKEDEV bktr0 -.endif post-install: @${CAT} ${PKGMESSAGE} diff --git a/multimedia/pvrxxx/Makefile b/multimedia/pvrxxx/Makefile index 09ec8dd73877..03e2705771d6 100644 --- a/multimedia/pvrxxx/Makefile +++ b/multimedia/pvrxxx/Makefile @@ -33,11 +33,7 @@ MAN1= pvr250-setchannel.1 .include -.if ${OSVERSION} < 500000 -MODULESDIR= /modules -.else MODULESDIR= /boot/modules -.endif PLIST_SUB= MODULESDIR=${MODULESDIR} .if !exists(${DISTDIR}/hcwPVRP2.sys) @@ -54,21 +50,12 @@ IGNORE= You need the kernel sources installed to build this module. .endif patch-iicbb: -.if ${OSVERSION} < 500000 - @if [ -z "`${GREP} cxm_iic /usr/src/sys/dev/iicbus/iicbb.c`" ]; then \ - ${PATCH} -d/sys <${WRKDIR}/dev/cxm/Patch.iicbb-fbsd4; \ - ${ECHO_CMD} "Patched /usr/src/sys/dev/iicbus/iicbb.c"; \ - else \ - ${ECHO_CMD} "/usr/src/sys/dev/iicbus/iicbb.c was already patched"; \ - fi -.else @if [ -z "`${GREP} cxm_iic /usr/src/sys/dev/iicbus/iicbb.c`" ]; then \ ${PATCH} -d/sys <${WRKDIR}/dev/cxm/Patch.iicbb-fbsd5; \ ${ECHO_CMD} "Patched /usr/src/sys/dev/iicbus/iicbb.c"; \ else \ ${ECHO_CMD} "/usr/src/sys/dev/iicbus/iicbb.c was already patched"; \ fi -.endif do-extract: ${MKDIR} ${WRKDIR} @@ -79,15 +66,8 @@ do-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/pvrxxx_gpl.tgz ${EXTRACT_AFTER_ARGS}; post-patch: -.if ${OSVERSION} < 500000 - ${REINPLACE_CMD} -e 's/cxm0/bktr0/' \ - ${WRKDIR}/${PVRTOOLS}/setchannel.c - ${REINPLACE_CMD} -e 's/tuner0/bktr0/' \ - ${WRKDIR}/${PVRTOOLS}/setchannel.c -.else ${REINPLACE_CMD} -e 's/tuner0/cxm0/' \ ${WRKDIR}/${PVRTOOLS}/setchannel.c -.endif do-configure: cd ${WRKDIR}/dev/cxm; \ @@ -106,10 +86,6 @@ do-install: ${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/cxm.4 ${PREFIX}/man/man4/cxm.4 ${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/pvr250-setchannel.1 ${PREFIX}/man/man1/pvr250-setchannel.1 ${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setchannel ${PREFIX}/bin/pvr250-setchannel -.if ${OSVERSION} < 500000 - cd /dev; \ - ./MAKEDEV bktr0 -.endif post-install: @${CAT} ${PKGMESSAGE} diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 7f5a8e45e518..577a22d7ab30 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -110,10 +110,6 @@ BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} .endif -.if ${OSVERSION} < 500000 -IGNORE= is unsupported on FreeBSD 4.x -.endif - do-configure: @${PYTHON_CMD} ${WRKSRC}/check.py diff --git a/multimedia/shell-fm/Makefile b/multimedia/shell-fm/Makefile index f913bc7ddcd9..91c42dc363cf 100644 --- a/multimedia/shell-fm/Makefile +++ b/multimedia/shell-fm/Makefile @@ -41,10 +41,4 @@ PLIST_FILES= bin/shell-fm \ share/examples/shell-fm/shell-fm.rc-example PLIST_DIRS= share/examples/shell-fm -.include - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - -.include +.include diff --git a/multimedia/tivodecode/Makefile b/multimedia/tivodecode/Makefile index a046f2eadba1..e1ac7a97afbd 100644 --- a/multimedia/tivodecode/Makefile +++ b/multimedia/tivodecode/Makefile @@ -15,12 +15,6 @@ COMMENT= Converts .TiVo files to normal MPEG files USE_GMAKE= yes -.include - -.if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-tivo-parse.c -.endif - post-patch: ${REINPLACE_CMD} -e 's/CFLAGS=/CFLAGS+=/' ${WRKSRC}/Makefile @@ -32,4 +26,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include +.include diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 5b4b618c205d..bd927ce1be14 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -38,6 +38,7 @@ CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ CFLAGS="-I${WRKSRC}/common" MAKE_ENV= verbose=yes USE_LDCONFIG= yes +ONLY_FOR_ARCHS= alpha amd64 i386 FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk @@ -50,12 +51,6 @@ MAN8= v4l-conf.8 .include -.if ${OSVERSION} < 500000 -ONLY_FOR_ARCHS= i386 -.else -ONLY_FOR_ARCHS= alpha amd64 i386 -.endif - .if defined(WITHOUT_AA) CONFIGURE_ARGS+=--disable-aa PLIST_SUB+= AA="@comment " @@ -68,12 +63,8 @@ PLIST_SUB+= AA="" .if defined(WITH_ZVBI) LIB_DEPENDS+= zvbi.10:${PORTSDIR}/devel/libzvbi CONFIGURE_ARGS+=--enable-zvbi -.if ${OSVERSION} > 500000 PLIST_SUB+= ZVBI="" ZVBI5="" .else -PLIST_SUB+= ZVBI="" ZVBI5="@comment " -.endif -.else CONFIGURE_ARGS+=--enable-zvbi=no PLIST_SUB+= ZVBI="@comment " ZVBI5="@comment " .endif @@ -118,9 +109,4 @@ post-patch: @${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e "s|FOUND_ZVBI|NOT_WORKING_&|g" \ - ${WRKSRC}/vbistuff/Subdir.mk ${WRKSRC}/x11/Subdir.mk -.endif - .include diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile index 6705e933471f..c02aed0f5d4c 100644 --- a/multimedia/y4mscaler/Makefile +++ b/multimedia/y4mscaler/Makefile @@ -36,10 +36,6 @@ post-patch: ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|CXXFLAGS =|CXXFLAGS = ${CXXFLAGS} |' \ ${WRKSRC}/Makefile -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|#define HAVE_STDINT_H 1|#undef HAVE_STDINT_H 1|' \ - ${WRKSRC}/y4m-config.h -.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/y4mscaler ${PREFIX}/bin/y4mscaler