[Midnightbsd-cvs] mports: bsd.mport.mk: Make sure that the metadata for the old tools is

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Mar 20 14:30:58 EDT 2009


Log Message:
-----------
Make sure that the metadata for the old tools is defined before we run the
old tools.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.141 -> r1.142)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.141
retrieving revision 1.142
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.141 -r1.142
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -430,11 +430,36 @@
 
 
 
+# Make sure we have some stuff defined before we pull in the mixins.
+#
+# The user can override the NO_PACKAGE by specifying this from
+# the make command line
+.if defined(FORCE_PACKAGE)
+.undef NO_PACKAGE
+.endif
+
+COMMENTFILE?=	${PKGDIR}/pkg-comment
+DESCR?=			${PKGDIR}/pkg-descr
+PLIST?=			${PKGDIR}/pkg-plist
+PKGINSTALL?=	${PKGDIR}/pkg-install
+PKGDEINSTALL?=	${PKGDIR}/pkg-deinstall
+PKGREQ?=		${PKGDIR}/pkg-req
+PKGMESSAGE?=	${PKGDIR}/pkg-message
+
+TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
+
+.for _CATEGORY in ${CATEGORIES}
+PKGCATEGORY?=	${_CATEGORY}
+.endfor
+_PORTDIRNAME=	${.CURDIR:T}
+PORTDIRNAME?=	${_PORTDIRNAME}
+PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
+
+
 
 #
 # Pull in our mixins.
 #
-
 .if !defined(USE_MPORT_TOOLS)
 .include "${PORTSDIR}/Mk/components/old_pkg_tools.mk"
 .endif
@@ -1019,30 +1044,6 @@
 
 
 
-# The user can override the NO_PACKAGE by specifying this from
-# the make command line
-.if defined(FORCE_PACKAGE)
-.undef NO_PACKAGE
-.endif
-
-COMMENTFILE?=	${PKGDIR}/pkg-comment
-DESCR?=			${PKGDIR}/pkg-descr
-PLIST?=			${PKGDIR}/pkg-plist
-PKGINSTALL?=	${PKGDIR}/pkg-install
-PKGDEINSTALL?=	${PKGDIR}/pkg-deinstall
-PKGREQ?=		${PKGDIR}/pkg-req
-PKGMESSAGE?=	${PKGDIR}/pkg-message
-
-TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
-
-.for _CATEGORY in ${CATEGORIES}
-PKGCATEGORY?=	${_CATEGORY}
-.endfor
-_PORTDIRNAME=	${.CURDIR:T}
-PORTDIRNAME?=	${_PORTDIRNAME}
-PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
-
-
 
 
 MPORT_CREATE?=		/usr/libexec/mport.create


More information about the Midnightbsd-cvs mailing list