From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 8 20:10:18 2004 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 7849A16A4CE for ; Wed, 8 Dec 2004 20:10:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E00E43D2D for ; Wed, 8 Dec 2004 20:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iB8KAIIV003178 for ; Wed, 8 Dec 2004 20:10:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iB8KAITv003177; Wed, 8 Dec 2004 20:10:18 GMT (envelope-from gnats) Resent-Date: Wed, 8 Dec 2004 20:10:18 GMT Resent-Message-Id: <200412082010.iB8KAITv003177@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, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D469A16A4CE; Wed, 8 Dec 2004 20:00:43 +0000 (GMT) Received: from gwmail1.grupos.com.br (gwmail1.grupos.com.br [66.90.64.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 763DC43D5C; Wed, 8 Dec 2004 20:00:43 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by gwmail1.grupos.com.br (Postfix) with ESMTP id BA1C13BFE7; Wed, 8 Dec 2004 18:00:42 -0200 (BRST) Received: by corp.grupos.com.br (Postfix, from userid 0) id F276620A9B; Wed, 8 Dec 2004 18:00:41 -0200 (BRST) Message-Id: <20041208200041.F276620A9B@corp.grupos.com.br> Date: Wed, 8 Dec 2004 18:00:41 -0200 (BRST) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: portmgr@FreeBSD.org Subject: ports/74866: Update Mk/bsd.port.mk to support python packages with OPTIONS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2004 20:10:18 -0000 >Number: 74866 >Category: ports >Synopsis: Update Mk/bsd.port.mk to support python packages with OPTIONS >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 08 20:10:17 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: FreeBSD 4.11-PRERELEASE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD corp.grupos.com.br 4.11-PRERELEASE FreeBSD 4.11-PRERELEASE #32: Tue Dec 7 12:11:36 BRST 2004 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: Update Mk/bsd.port.mk to support python (py-*) packages with OPTIONS In accordance with Hye-Shik Chang say, include bsd.python.mk is need before OPTIONS part. Patch only move OPTIONS to the end of pre section. >How-To-Repeat: >Fix: --- bsd.port.mk.patch begins here --- --- bsd.port.mk.orig Tue Dec 7 18:49:22 2004 +++ bsd.port.mk Tue Dec 7 18:49:49 2004 @@ -954,25 +954,6 @@ USE_SUBMAKE= yes .endif -# where 'make config' records user configuration options -PORT_DBDIR?= /var/db/ports - -.if defined(LATEST_LINK) -UNIQUENAME?= ${LATEST_LINK} -.else -UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} -.endif -OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options -_OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" -.if defined(OPTIONS) -.if exists(${_OPTIONSFILE}) && !make(rmconfig) -.include "${_OPTIONSFILE}" -.endif -.if exists(${_OPTIONSFILE}.local) -.include "${_OPTIONSFILE}.local" -.endif -.endif - # check for old, crufty, makefile types, part 1: .if !defined(PORTNAME) || !( defined(PORTVERSION) || defined (DISTVERSION) ) || defined(PKGNAME) check-makefile:: @@ -1199,6 +1180,25 @@ # Owner and group of the WWW user WWWOWN?= www WWWGRP?= www + +# where 'make config' records user configuration options +PORT_DBDIR?= /var/db/ports + +.if defined(LATEST_LINK) +UNIQUENAME?= ${LATEST_LINK} +.else +UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} +.endif +OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options +_OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" +.if defined(OPTIONS) +.if exists(${_OPTIONSFILE}) && !make(rmconfig) +.include "${_OPTIONSFILE}" +.endif +.if exists(${_OPTIONSFILE}.local) +.include "${_OPTIONSFILE}.local" +.endif +.endif .endif # End of pre-makefile section. --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: