[Midnightbsd-cvs] CVS Commit: Makefile: OSVERSION

[laffer1 at midnightbsd.org]

Log Message:
-----------
OSVERSION

Modified Files:
--------------
    mports/audio/mpg123:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/mpg123/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Laudio/mpg123/Makefile -Laudio/mpg123/Makefile -u -r1.1 -r1.2
--- audio/mpg123/Makefile
+++ audio/mpg123/Makefile
@@ -48,9 +48,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400014
 MAKE_ENV+=	USE_INET6=yes
-.endif
 
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
@@ -80,7 +78,6 @@
 	@${ECHO_MSG}
 .endif
 .if ${ARCH} == "i386"
-.if ${OSVERSION} >= 430000
 .if ${MACHINE_CPU:M3dnow}
 OPT_ARCH=	3dnow
 .elif ${MACHINE_CPU:Mi586}
@@ -88,17 +85,6 @@
 .elif ${MACHINE_CPU:Mi486}
 OPT_ARCH=	i486
 .endif
-.else
-.if !defined(OPT_ARCH) || ((${OPT_ARCH} != "i486") && (${OPT_ARCH} != "i586") \
-    && (${OPT_ARCH} != "3dnow"))
-	@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-	@${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware."
-	@${ECHO_MSG} "(e.g. make OPT_ARCH=i486)."
-	@${ECHO_MSG} "Valid values are: i486, i586, 3dnow"
-	@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-OPT_ARCH?=	i586
-.endif
-.endif
 .endif
 
 .if defined(OPT_ARCH)