From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 1 07:40:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1669D16A417 for ; Wed, 1 Aug 2007 07:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E982313C467 for ; Wed, 1 Aug 2007 07:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l717e1pk015285 for ; Wed, 1 Aug 2007 07:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l717e18s015284; Wed, 1 Aug 2007 07:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 1 Aug 2007 07:40:01 GMT Resent-Message-Id: <200708010740.l717e18s015284@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Yeske Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAE6C16A419 for ; Wed, 1 Aug 2007 07:35:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 80CA113C4A8 for ; Wed, 1 Aug 2007 07:35:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l717ZNqj033849 for ; Wed, 1 Aug 2007 07:35:23 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l717ZNaR033848; Wed, 1 Aug 2007 07:35:23 GMT (envelope-from nobody) Message-Id: <200708010735.l717ZNaR033848@www.freebsd.org> Date: Wed, 1 Aug 2007 07:35:23 GMT From: David Yeske To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/115108: multimedia/mplayer remove references to FreeBSD 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2007 07:40:02 -0000 >Number: 115108 >Category: ports >Synopsis: multimedia/mplayer remove references to FreeBSD 4.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 01 07:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: David Yeske >Release: RELENG_6 >Organization: >Environment: FreeBSD hymen 6.2-STABLE FreeBSD 6.2-STABLE #9: Mon Jul 2 02:25:24 EDT 2007 root@hymen:/usr/obj/usr/src/sys/HYMEN i386 >Description: remove references to FreeBSD 4.x since this is a noop >How-To-Repeat: >Fix: see attachment Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/mplayer/Makefile,v retrieving revision 1.165 diff -u -r1.165 Makefile --- Makefile 28 Jul 2007 12:27:28 -0000 1.165 +++ Makefile 1 Aug 2007 06:16:07 -0000 @@ -59,13 +59,11 @@ # # WITH_DVD_DEVICE=/path/to/desired/device # default 5.x: /dev/acd0 -# default 4.x: /dev/acd0c # This option changes the default device where mplayer looks for # a DVD medium # # WITH_CDROM_DEVICE=/path/to/desired/device # default 5.x: /dev/acd0 -# default 4.x: /dev/acd0c # This option changes the default cdrom device, maybe useful for VCDs # # WITH_LANG= @@ -191,24 +189,6 @@ .include -.if ${OSVERSION} < 500000 -USE_GCC= 3.4+ -CFLAGS+= -Duint_fast64_t=uint64_t -CFLAGS+= -Droundf=rintf -CFLAGS+= -Dllrint=rint -.if ${ARCH} == "i386" -CFLAGS+= -DPRId64=\\\"lld\\\" -CFLAGS+= -DPRIu64=\\\"llu\\\" -CFLAGS+= -DPRIx64=\\\"llx\\\" -CFLAGS+= -DPRIX64=\\\"llX\\\" -.else -CFLAGS+= -DPRId64=\\\"ld\\\" -CFLAGS+= -DPRIu64=\\\"lu\\\" -CFLAGS+= -DPRIx64=\\\"lx\\\" -CFLAGS+= -DPRIX64=\\\"lX\\\" -.endif -.endif - #Building of vidix dependent shared libs is only possible #on i386 and amd64 at the moment. .if !defined(WITHOUT_VIDIX) @@ -565,22 +545,14 @@ .if defined(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 .if defined(WITH_CDROM_DEVICE) DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} .else -.if ${OSVERSION} < 500000 -DEFAULT_CDROM_DEVICE=/dev/acd0c -.else DEFAULT_CDROM_DEVICE=/dev/acd0 .endif -.endif .if defined(WITH_KERN_HZ) DEFAULT_KERN_HZ=${WITH_KERN_HZ} @@ -603,7 +575,7 @@ .if defined(WITHOUT_MMX) || defined(WITHOUT_SIMD) CONFIGURE_ARGS+=--disable-mmx .endif -.if defined(WITHOUT_3DNOW) || defined(WITHOUT_SIMD) || ${OSVERSION} < 400021 +.if defined(WITHOUT_3DNOW) || defined(WITHOUT_SIMD) CONFIGURE_ARGS+=--disable-3dnow --disable-3dnowext .endif .if defined(WITHOUT_SSE) || defined(WITHOUT_SIMD) >Release-Note: >Audit-Trail: >Unformatted: