From 0691688a506fc2dffc574eeeb80dc0d876378fed Mon Sep 17 00:00:00 2001
From: mat <mat@FreeBSD.org>
Date: Fri, 3 Apr 2015 11:26:48 +0000
Subject: Remove OSVERSION checks that do not make sense any more.

For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).

Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.

Differential Revision:	https://reviews.freebsd.org/D2209
---
 audio/libgpod/Makefile                          |  7 +++----
 audio/musicpd/Makefile                          |  6 ------
 audio/schism/Makefile                           |  9 +--------
 audio/schism/files/extrapatch-modplug__snd_gm.c | 17 -----------------
 audio/schism/files/patch-modplug__snd_gm.c      | 17 +++++++++++++++++
 5 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 audio/schism/files/extrapatch-modplug__snd_gm.c
 create mode 100644 audio/schism/files/patch-modplug__snd_gm.c

(limited to 'audio')

diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 40f7f7b221d7..2bb189b1fe64 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -46,10 +46,9 @@ PYTHON_CONFIGURE_WITH=	python
 
 PORTDOCS=	ChangeLog NEWS README*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIMOBILE} && (${OSVERSION} > 900002 || \
-	${OSVERSION} < 900000 && ${OSVERSION} > 800107)
+.if ${PORT_OPTIONS:MIMOBILE}
 COMMENT:=	${COMMENT:S,iPod,&/iPhone,}
 LIB_DEPENDS+=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
 CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
@@ -65,4 +64,4 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 428fc6cf8557..54d1c8f69085 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -201,12 +201,6 @@ post-patch:
 		-e 's#^mpd.conf#${PORTNAME}.conf#' \
 		-e 's#^mpd(1)#musicpd(1)#' \
 		${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5
-.if (${OSVERSION} < 800000)
-	${REINPLACE_CMD} -e 's/nan[f]*(\"\")/NAN/g' \
-		${WRKSRC}/src/crossfade.c \
-		${WRKSRC}/src/player_thread.c \
-		${WRKSRC}/src/player_control.c
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
diff --git a/audio/schism/Makefile b/audio/schism/Makefile
index c2aafd2a297e..d82af440ef2c 100644
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@@ -30,11 +30,4 @@ PORTSCOUT=	skipv:20100202,20101127,20101128,20110101,20120105
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/schismtracker ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-# after merging log2 and log2f into libm
-.if ${OSVERSION} >= 802502
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-modplug__snd_gm.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/schism/files/extrapatch-modplug__snd_gm.c b/audio/schism/files/extrapatch-modplug__snd_gm.c
deleted file mode 100644
index 73b22615aec1..000000000000
--- a/audio/schism/files/extrapatch-modplug__snd_gm.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./modplug/snd_gm.c.orig	2010-01-01 20:22:26.000000000 +0100
-+++ ./modplug/snd_gm.c	2011-12-09 21:50:22.000000000 +0100
-@@ -10,12 +10,14 @@
- #include "mplink.h" // for 'mp', which we shouldn't need
- #include "snd_gm.h"
- 
-+/*
- #if !defined(HAVE_LOG2) && !defined(__USE_ISOC99) && !defined(log2)
- static double log2(double d)
- {
-         return log(d) / log(2.0);
- }
- #endif
-+*/
- 
- 
- #define LinearMidivol 1
diff --git a/audio/schism/files/patch-modplug__snd_gm.c b/audio/schism/files/patch-modplug__snd_gm.c
new file mode 100644
index 000000000000..73b22615aec1
--- /dev/null
+++ b/audio/schism/files/patch-modplug__snd_gm.c
@@ -0,0 +1,17 @@
+--- ./modplug/snd_gm.c.orig	2010-01-01 20:22:26.000000000 +0100
++++ ./modplug/snd_gm.c	2011-12-09 21:50:22.000000000 +0100
+@@ -10,12 +10,14 @@
+ #include "mplink.h" // for 'mp', which we shouldn't need
+ #include "snd_gm.h"
+ 
++/*
+ #if !defined(HAVE_LOG2) && !defined(__USE_ISOC99) && !defined(log2)
+ static double log2(double d)
+ {
+         return log(d) / log(2.0);
+ }
+ #endif
++*/
+ 
+ 
+ #define LinearMidivol 1
-- 
cgit