[Midnightbsd-cvs] mports: bsd.mport.mk: move variables needed by package stuff to the

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 20 14:48:15 EDT 2009


Log Message:
-----------
move variables needed by package stuff to the right place.

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

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.142
retrieving revision 1.143
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.142 -r1.143
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -438,6 +438,18 @@
 .undef NO_PACKAGE
 .endif
 
+WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
+.if defined(NO_WRKSUBDIR)
+WRKSRC?=		${WRKDIR}
+.else
+WRKSRC?=		${WRKDIR}/${DISTNAME}
+.endif
+
+PATCH_WRKSRC?=	${WRKSRC}
+CONFIGURE_WRKSRC?=	${WRKSRC}
+BUILD_WRKSRC?=	${WRKSRC}
+INSTALL_WRKSRC?=${WRKSRC}
+
 COMMENTFILE?=	${PKGDIR}/pkg-comment
 DESCR?=			${PKGDIR}/pkg-descr
 PLIST?=			${PKGDIR}/pkg-plist
@@ -470,17 +482,7 @@
 .include "${MPORTCOMPONENTS}/fake.mk"
 .include "${MPORTCOMPONENTS}/maintainer.mk"
 
-WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
-.if defined(NO_WRKSUBDIR)
-WRKSRC?=		${WRKDIR}
-.else
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-.endif
 
-PATCH_WRKSRC?=	${WRKSRC}
-CONFIGURE_WRKSRC?=	${WRKSRC}
-BUILD_WRKSRC?=	${WRKSRC}
-INSTALL_WRKSRC?=${WRKSRC}
 
 PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
 		DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}


More information about the Midnightbsd-cvs mailing list