svn commit: r322355 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Fri Jul  5 20:15:48 2013
New Revision: 322355
URL: http://svnweb.freebsd.org/changeset/ports/322355

Log:
  Move PKGORIGIN definition a bit later so that PKGCATEGORY defined in Makefile.local or Makefile.inc works again
  
  Reported by:	dinoex
  Tested by:	dinoex

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Jul  5 20:11:24 2013	(r322354)
+++ head/Mk/bsd.port.mk	Fri Jul  5 20:15:48 2013	(r322355)
@@ -1212,13 +1212,6 @@ WITH_PKGNG?=	yes
 # Only define tools here (for transition period with between pkg tools)
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
-.for _CATEGORY in ${CATEGORIES}
-PKGCATEGORY?=	${_CATEGORY}
-.endfor
-_PORTDIRNAME=	${.CURDIR:T}
-PORTDIRNAME?=	${_PORTDIRNAME}
-PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
-
 MASTERDIR?=	${.CURDIR}
 
 .if ${MASTERDIR} != ${.CURDIR}
@@ -1258,6 +1251,13 @@ USE_SUBMAKE=	yes
 USE_SUBMAKE=	yes
 .endif
 
+.for _CATEGORY in ${CATEGORIES}
+PKGCATEGORY?=	${_CATEGORY}
+.endfor
+_PORTDIRNAME=	${.CURDIR:T}
+PORTDIRNAME?=	${_PORTDIRNAME}
+PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
+
 # where 'make config' records user configuration options
 PORT_DBDIR?=	/var/db/ports