- Remove conditional checks for FreeBSD 5.x and older

15 files changed, 4 insertions, 98 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 7a4a418fc318..086fc52abced 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -62,9 +62,7 @@ PLIST_SUB+=	QT="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
 WITH_OPTIMIZED_CFLAGS=	yes
-.endif
 
 .if ${OSVERSION} >= 700000
 USE_GCC=	3.4
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 1e402e528469..49173bba0655 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -86,10 +86,4 @@ PLIST_SUB+=		MPEG4IP=""
 PLIST_SUB+=		MPEG4IP="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 5.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index be53baf32fb3..729ac28a215b 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -28,10 +28,4 @@ DESKTOP_ENTRIES="Capture Video" \
 
 CONFLICTS=	dvts-[0-9]*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502000
-IGNORE=		does not work on FreeBSD older than 5.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 31fd829e10c3..217fcf31ab39 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -217,12 +217,10 @@ pre-configure:
 		 s|-funroll-loops||g ; \
 		 s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \
 		 s|echo aout|echo elf|g' ${WRKSRC}/configure
-.if ${OSVERSION} >= 500035
 	@${REINPLACE_CMD} -e \
 		 's|-malign-loops|-falign-loops|g ; \
 		  s|-malign-jumps|-falign-jumps|g ; \
 		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
-.endif
 
 pre-build:
 	@${CP} -p ${LOCALBASE}/include/dts.h ${WRKSRC}/src/libdts/
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index bc30556e9975..8cc285746426 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -52,7 +52,7 @@ BUILD_DEPENDS+=	v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
 RUN_DEPENDS+=	/boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
 .endif
 
-.if defined(WITH_LINUXTHREADS) || ${OSVERSION} < 504000
+.if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS=	--with-linuxthreads
 LIB_DEPENDS+=	lthread.[35]:${PORTSDIR}/devel/linuxthreads
 .endif
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 7a76dd0e960c..5b9eb65d2bb7 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -27,7 +27,6 @@ OPTIONS+=	X11VM "X11 VidMode support" on
 OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
 OPTIONS+=	SDL "Enable SDL video output" off
 OPTIONS+=	VIDIX "Enable VIDIX video output on supported archs" on
-OPTIONS+=	NVIDIA "Enable experimental nvidia xvmc driver" off
 OPTIONS+=	SKINS "Force dependency on mplayer-skins" on
 OPTIONS+=	FREETYPE "Use freetype for OSD fonts (TrueType!)" on
 OPTIONS+=	RTC "Add support for kernel real time clock timing" off
@@ -164,12 +163,6 @@ CONFIGURE_ENV+=		CFLAGS+="-I/${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--disable-rtc
 .endif
 
-.if defined(WITH_NVIDIA) && ${OSVERSION} < 600033
-LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
-CONFIGURE_ARGS+=	--enable-xvmc \
-			--enable-xvmclib=XvMCNVIDIA
-.endif
-
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=	--enable-arts
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index 973a2132bdc5..80ed19d42c6a 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -24,15 +24,10 @@ MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC}
 MAN1=		nxtvepg.1
 MYPORTDOCS=	README TODO CHANGES manual.html
 
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502100
 post-patch:
 	${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \
 		s,machine/ioctl_meteor.h,dev/bktr/ioctl_meteor.h," \
 		${WRKSRC}/epgvbi/btdrv4linux.c ${WRKSRC}/tvsim/tvsim_main.c
-.endif
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${LOCALBASE}/bin
@@ -46,4 +41,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 6e59739410d4..67e9fda2f229 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -60,9 +60,7 @@ pre-configure:
 
 # XXX due to gcc-3.4 (20040706) bug in preprocessing of inline functions,
 # this needs at least -O2 to compile. Fails with -O
-.if ${OSVERSION} >= 502126
 CFLAGS+=	-O2
-.endif
 
 # hack to make ogle work with liba52 + djbfft
 .if exists(${LOCALBASE}/lib/liba52.la)
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 672545412888..ca8df8c86cba 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -47,11 +47,9 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|"m"|"g"|' \
 		${WRKSRC}/audioplugin/MP3/audioencoder/lame3.70/quantize-pvt.c
-.if ${OSVERSION} >= 502126
 	@${REINPLACE_CMD} \
 		-e 's|-fpic||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/multimedia/toxine/Makefile b/multimedia/toxine/Makefile
index d7ab0a8c8ae3..bd1c57e03090 100644
--- a/multimedia/toxine/Makefile
+++ b/multimedia/toxine/Makefile
@@ -28,11 +28,6 @@ MAN1=		toxine.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502000
-LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
-CONFIGURE_ARGS+=--with-readline=${LOCALBASE}
-.endif
-
 .if !defined(WITHOUT_AALIB)
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 PLIST_SUB+=	AALIB=""
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index eb78d2be790e..adb01ae41a4e 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -221,11 +221,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
 		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
 			${WRKSRC}/projects/mozilla/Makefile.in
-# skins2 interface, no lrint on < 504000
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
-.endif
 # cdrom/dvd support
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
 		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 34226d053b1d..6b88cc3bae3a 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -227,11 +227,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
 		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
 			${WRKSRC}/mozilla/Makefile.in
-# skins2 interface, no lrint on < 504000
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
-.endif
 # s/Linux/FreeBSD/
 	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
 		${WRKSRC}/po/*
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 96fe84e8a0a8..8533a02c21e8 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -52,27 +52,6 @@ CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif
 
-.if ${OSVERSION} == 500043
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src:xitk:common.h
-.endif
-
-# PRIi64 macro is not defined
-.if ${OSVERSION} < 500040
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src:xitk:common.h-1
-.endif
-
-# mbrtowc() is not implemented
-.if ${OSVERSION} < 500039
-CONFIGURE_ARGS+=	--disable-mbs
-# Xft support requires --enable-mbs configure option
-WITHOUT_XFT=	yes
-.endif
-
-.if ${OSVERSION} < 502000
-LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
-CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
-.endif
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/multimedia/xine/files/extra-patch-src:xitk:common.h b/multimedia/xine/files/extra-patch-src:xitk:common.h
deleted file mode 100644
index 55a644b31ff2..000000000000
--- a/multimedia/xine/files/extra-patch-src:xitk:common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xitk/common.h.orig	Mon Feb 24 22:39:16 2003
-+++ src/xitk/common.h	Mon Feb 24 22:39:46 2003
-@@ -31,6 +31,8 @@
- #include <xine.h>
- #include <xine/xineutils.h>
- 
-+#define ushort unsigned short
-+
- #include "Imlib-light/Imlib.h"
- 
- #include "xitk.h"
diff --git a/multimedia/xine/files/extra-patch-src:xitk:common.h-1 b/multimedia/xine/files/extra-patch-src:xitk:common.h-1
deleted file mode 100644
index 1b56caf35979..000000000000
--- a/multimedia/xine/files/extra-patch-src:xitk:common.h-1
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/xitk/common.h.orig	Fri Apr 16 04:20:51 2004
-+++ src/xitk/common.h	Wed May 12 23:17:59 2004
-@@ -114,6 +114,12 @@
- #define PLAYLIST_CONTROL_STOP   0x00000001 /* Don't start next entry in playlist */
- #define PLAYLIST_CONTROL_IGNORE 0x00000002 /* Ignore some playlist adding action */
- 
-+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
-+#define PRIi64 "li"
-+#else if defined(__i386__) || defined(__powerpc__)
-+#define PRIi64 "lli"
-+#endif                                                                         
-+
- #define SAFE_FREE(x)            do {           \
-                                   if((x)) {    \
-                                     free((x)); \