From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 23 06:30:12 2003 Return-Path: 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 4FEF237B401 for ; Wed, 23 Jul 2003 06:30:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AB9643FA3 for ; Wed, 23 Jul 2003 06:30:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6NDUBUp068755 for ; Wed, 23 Jul 2003 06:30:11 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6NDUBei068753; Wed, 23 Jul 2003 06:30:11 -0700 (PDT) Resent-Date: Wed, 23 Jul 2003 06:30:11 -0700 (PDT) Resent-Message-Id: <200307231330.h6NDUBei068753@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, Tilman Linneweh Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2247037B401; Wed, 23 Jul 2003 06:25:29 -0700 (PDT) Received: from tl.kom.tuwien.ac.at (tl.kom.tuwien.ac.at [128.131.34.148]) by mx1.FreeBSD.org (Postfix) with ESMTP id 484C343FAF; Wed, 23 Jul 2003 06:25:28 -0700 (PDT) (envelope-from tilman@tl.kom.tuwien.ac.at) Received: from tl.kom.tuwien.ac.at (localhost [127.0.0.1]) by tl.kom.tuwien.ac.at (8.12.9/8.12.6) with ESMTP id h6NDPQqX044846; Wed, 23 Jul 2003 15:25:26 +0200 (CEST) (envelope-from tilman@tl.kom.tuwien.ac.at) Received: (from tilman@localhost) by tl.kom.tuwien.ac.at (8.12.8/8.12.6/Submit) id h6NDPPCS044845; Wed, 23 Jul 2003 15:25:25 +0200 (CEST) Message-Id: <200307231325.h6NDPPCS044845@tl.kom.tuwien.ac.at> Date: Wed, 23 Jul 2003 15:25:25 +0200 (CEST) From: Tilman Linneweh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: portmgr@FreeBSD.org Subject: ports/54782: Clean up bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Tilman Linneweh List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2003 13:30:12 -0000 >Number: 54782 >Category: ports >Synopsis: Clean up bsd.port.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jul 23 06:30:10 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Tilman Linneweh >Release: FreeBSD 4.8-RC i386 >Organization: Vienna University of Technology >Environment: System: FreeBSD tl.kom.tuwien.ac.at 4.8-RC FreeBSD 4.8-RC #3: Tue Mar 25 16:31:43 CET 2003 root@tl.kom.tuwien.ac.at:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: - Remove BROKEN_ELF: elf is the default since a few years. Not used by any port. All ports should now build on elf Platforms. - Adjust comments for USE_KDELIBS_VER, KDE2 is gone. - Remove USE_DGS: Not used by any port. If a port in future uses this, it can add explicit dependencies on dgs and XLIB. - Removed check NO_WRKDIR NO_EXTRACT, NO_CONFIGURE and NO_PATCH. Support for these variables was removed 4 years ago. >How-To-Repeat: >Fix: --- bsd.port.mk.patch begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.457 diff -u -r1.457 bsd.port.mk --- bsd.port.mk 22 Jul 2003 03:51:15 -0000 1.457 +++ bsd.port.mk 23 Jul 2003 13:11:50 -0000 @@ -143,7 +143,6 @@ # because it cannot be manually fetched, etc). Error # logs will not appear on bento, so this should be # used sparingly. -# BROKEN_ELF - Port doesn't build on ELF machines. # BROKEN - Port is believed to be broken. Package builds will # still be attempted on the bento package cluster to # test this assumption. @@ -336,7 +335,6 @@ # USE_X_PREFIX - Says that the port installs in ${X11BASE}. Implies USE_XLIB. # USE_XLIB - Says that the port uses the X libraries. # -# USE_DGS - Says that the port uses the dgs X11 libraries. # USE_FREETYPE - Says that the port uses the freetype print libraries. # USE_MESA - Says that the port uses the Mesa libraries. # USE_MOTIF - Says that the port uses the Motif toolkit. Implies USE_XPM. @@ -366,11 +364,11 @@ # for more details. # Default: not set. # -# USE_KDEBASE_VER - Set to either 2 or 3 to use the KDE windowing system. -# (Only 3 is currently supported). Implies inclusion +# USE_KDEBASE_VER - Set to 3 to use the KDE windowing system. +# Implies inclusion # of bsd.kde.mk. Default: not set. -# USE_KDELIBS_VER - Set to either 2 or 3 to use the KDE libraries. -# (Only 3 is currently supported). Implies inclusion +# USE_KDELIBS_VER - Set to 3 to use the KDE libraries. +# Implies inclusion # of bsd.kde.mk. Default: not set. # USE_QT_VER - Set to either 2 or 3 to use the QT libraries. # (Only 3 is currently supported). Implies inclusion @@ -1375,9 +1373,6 @@ .if defined(USE_XPM) LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm .endif -.if defined(USE_DGS) -LIB_DEPENDS+= dps.0:${PORTSDIR}/x11/dgs -.endif .if defined(USE_MESA) LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3 .endif @@ -1388,7 +1383,7 @@ BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/date.def:${PORTSDIR}/devel/imake-4 RUN_DEPENDS+= mkhtmlindex:${PORTSDIR}/devel/imake-4 .endif -.if defined(USE_XPM) || defined(USE_DGS) +.if defined(USE_XPM) USE_XLIB= yes .endif .if defined(USE_MESA) @@ -2422,17 +2417,6 @@ IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) IGNORE= "is restricted: ${RESTRICTED}" -.elif defined(NO_WRKDIR) -IGNORE= "defines NO_WRKDIR, which is obsoleted. If you are defining NO_WRKDIR and NO_EXTRACT, try changing it to NO_WRKSUBDIR=yes and EXTRACT_ONLY= \(the right side intentionally left empty\)" -.elif defined(NO_EXTRACT) -IGNORE= "defines NO_EXTRACT, which is obsoleted. Try changing it to EXTRACT_ONLY= \(the right side intentionally left empty\)" -.elif defined(NO_CONFIGURE) -IGNORE= "defines NO_CONFIGURE, which is obsoleted" -.elif defined(NO_PATCH) -IGNORE= "defines NO_PATCH, which is obsoleted" -.elif defined(BROKEN_ELF) && (${PORTOBJFORMAT} == "elf") && \ - !defined(PARALLEL_PACKAGE_BUILD) -IGNORE= "is broken for ELF: ${BROKEN_ELF}" .elif defined(BROKEN) .if defined(PARALLEL_PACKAGE_BUILD) # try building even if marked BROKEN --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: