ports/74866: Update Mk/bsd.port.mk to support python packages with OPTIONS

[Marcus Grando]

>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 at 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 <perky at FreeBSD.org> 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: