From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 11 12:10:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C207B16A41C for ; Sat, 11 Jun 2005 12:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DC8043D53 for ; Sat, 11 Jun 2005 12:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5BCAJAS031956 for ; Sat, 11 Jun 2005 12:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5BCAJMQ031955; Sat, 11 Jun 2005 12:10:19 GMT (envelope-from gnats) Resent-Date: Sat, 11 Jun 2005 12:10:19 GMT Resent-Message-Id: <200506111210.j5BCAJMQ031955@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, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F86416A41C for ; Sat, 11 Jun 2005 12:07:30 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: from mail3out.barnet.com.au (mail3out.barnet.com.au [202.83.176.17]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDA2F43D1F for ; Sat, 11 Jun 2005 12:07:29 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail3out.barnet.com.au (Postfix, from userid 27) id CFC05877C8A; Sat, 11 Jun 2005 22:07:27 +1000 (EST) Received: from mail3-auth.barnet.com.au (mail3.barnet.com.au [202.83.176.16]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK)) by mail3.barnet.com.au (Postfix) with ESMTP id 90830877C5E for ; Sat, 11 Jun 2005 22:07:27 +1000 (EST) Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (not verified)) by mail3-auth.barnet.com.au (Postfix) with ESMTP id D8C10877C49 for ; Sat, 11 Jun 2005 22:07:26 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id C6FAC611F; Sat, 11 Jun 2005 22:07:25 +1000 (EST) Message-Id: <20050611120725.C6FAC611F@k7.mavetju> Date: Sat, 11 Jun 2005 22:07:25 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/82138: [patch] timewaster: remove old versions from bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2005 12:10:21 -0000 >Number: 82138 >Category: ports >Synopsis: [patch] timewaster: remove old versions from bsd.port.mk >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: Sat Jun 11 12:10:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386 >Description: Remove a lot of historical OSVERSION checks from bsd.port.mk and bsd.java.mk. >How-To-Repeat: >Fix: Index: bsd.java.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.java.mk,v retrieving revision 1.65 diff -u -r1.65 bsd.java.mk --- bsd.java.mk 27 Feb 2005 23:49:33 -0000 1.65 +++ bsd.java.mk 11 Jun 2005 12:03:18 -0000 @@ -216,12 +216,7 @@ _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if ${OSVERSION} >= 400000 _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 -. else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 -. endif - # List all JDK ports __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.512 diff -u -r1.512 bsd.port.mk --- bsd.port.mk 9 Jun 2005 20:39:43 -0000 1.512 +++ bsd.port.mk 11 Jun 2005 12:03:31 -0000 @@ -1242,11 +1242,7 @@ PERL_VERSION?= 5.6.0 PERL_VER?= 5.6.0 .else -.if ${OSVERSION} >= 300000 PERL_VERSION?= 5.00503 -.else -PERL_VERSION?= 5.00502 -.endif PERL_VER?= 5.005 .endif .endif @@ -1639,10 +1635,8 @@ .endif .if defined(USE_BISON) -.if ${OSVERSION} >= 400014 BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison .endif -.endif PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ @@ -1842,13 +1836,8 @@ # Special macro for doing in-place file editing using regexps .if defined(USE_REINPLACE) REINPLACE_ARGS?= -i.bak -.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 ) -PATCH_DEPENDS+= ${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace -REINPLACE_CMD?= ${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS} -.else REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} .endif -.endif # Names of cookies used to skip already completed stages EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g} @@ -1895,13 +1884,8 @@ .endif .if exists(/usr/bin/fetch) -# avoid -A for 2.2 -- it's not ported to that branch -.if ${OSVERSION} < 300000 -FETCH_CMD?= /usr/bin/fetch -.else FETCH_CMD?= /usr/bin/fetch -ARr FETCH_REGET?= 1 -.endif .if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE) # Avoid -S for 4.7 and earlier since it causes fetch errors FETCH_BEFORE_ARGS+= $${CKSIZE:+-S $$CKSIZE} @@ -2036,7 +2020,7 @@ .undef NO_PACKAGE .endif -COMMENTFILE?= ${PKGDIR}/pkg-comment +COMMENTFILE?= ${PKGDIR}/pkg-comment DESCR?= ${PKGDIR}/pkg-descr PLIST?= ${PKGDIR}/pkg-plist PKGINSTALL?= ${PKGDIR}/pkg-install @@ -2046,14 +2030,12 @@ TMPPLIST?= ${WRKDIR}/.PLIST.mktmp -.if ${OSVERSION} >= 400000 .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor _PORTDIRNAME= ${.CURDIR:T} PORTDIRNAME?= ${_PORTDIRNAME} PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} -.endif .if exists(${LOCALBASE}/sbin/pkg_info) PKG_CMD?= ${LOCALBASE}/sbin/pkg_create @@ -2061,13 +2043,6 @@ PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete PKG_INFO?= ${LOCALBASE}/sbin/pkg_info PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version -.elif ${OSVERSION} < 460102 && ${PKGORIGIN} != "sysutils/pkg_install" -BUILD_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install -PKG_CMD?= ${LOCALBASE}/sbin/pkg_create -PKG_ADD?= ${LOCALBASE}/sbin/pkg_add -PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete -PKG_INFO?= ${LOCALBASE}/sbin/pkg_info -PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version .else PKG_CMD?= /usr/sbin/pkg_create PKG_ADD?= /usr/sbin/pkg_add @@ -2778,11 +2753,6 @@ # Don't build a port if the system is too old. ################################################################ -.if ${OSVERSION} < 420000 -# You need an upgrade kit or make world newer than this -IGNORE= ": Your system is too old to use this bsd.port.mk. You need a fresh make world or an upgrade kit. Please go to http://www.FreeBSD.org/ports/ or a mirror site and follow the instructions" -.endif - .if defined(ONLY_FOR_ARCHS) .for __ARCH in ${ONLY_FOR_ARCHS} .if ${MACHINE_ARCH:M${__ARCH}} != "" @@ -3028,10 +2998,6 @@ # Check if the port is listed in the vulnerability database -.if ${PKGINSTALLVER} < 20040125 || ${OSVERSION} < 420001 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 -DISABLE_VULNERABILITIES= yes -.endif - AUDITFILE?= /var/db/portaudit/auditfile.tbz _EXTRACT_AUDITFILE= ${TAR} -jxOf "${AUDITFILE}" auditfile @@ -4607,11 +4573,7 @@ # Print out package names. package-depends: -.if ${OSVERSION} >= 460102 || exists(${LOCALBASE}/sbin/pkg_info) @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}' -.else - @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1}' -.endif # Build packages for port and dependencies >Release-Note: >Audit-Trail: >Unformatted: