cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bye, bye SCRIPTS_ENV,

Browse Source 
bye, bye SCRIPTDIR
This commit is contained in:
espie 2006-11-03 17:03:28 +00:00
parent 4ec0940ae1
commit aa88a7693f
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.792 2006/11/01 12:41:34 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.793 2006/11/03 17:03:28 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -41,9 +41,6 @@ ERRORS+= "Fatal: Variable $v is obsolete, use PACKAGE_REPOSITORY instead."
# change without notice.
#
#
# SCRIPTS_ENV - Additional environment vars passed to scripts in
# ${SCRIPTDIR} executed by bsd.port.mk.
#
# Variables to change if you want a special behavior:
#
# DEPENDS_TARGET - The target to execute when a port is calling a
@ -274,14 +271,6 @@ PATCHDIR?= ${.CURDIR}/patches
PATCH_LIST?= patch-*
.if exists(${.CURDIR}/scripts.${ARCH})
SCRIPTDIR?= ${.CURDIR}/scripts.${ARCH}
.elif exists(${.CURDIR}/scripts.${MACHINE_ARCH})
SCRIPTDIR?= ${.CURDIR}/scripts.${MACHINE_ARCH}
.else
SCRIPTDIR?= ${.CURDIR}/scripts
.endif
.if exists(${.CURDIR}/files.${ARCH})
FILESDIR?= ${.CURDIR}/files.${ARCH}
.elif exists(${.CURDIR}/files.${MACHINE_ARCH})
@ -647,7 +636,6 @@ _INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
BSD_INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
BSD_INSTALL_MAN_DIR="${INSTALL_MAN_DIR}"
MAKE_ENV+= ${_INSTALL_MACROS}
SCRIPTS_ENV+= ${_INSTALL_MACROS}
# setup systrace variables
NO_SYSTRACE?= No
@ -951,19 +939,6 @@ CONFIGURE_SHARED?= --disable-shared
CONFIGURE_SHARED?= --enable-shared
.endif
# Passed to configure invocations, and user scripts
SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \
PATH=${PORTPATH} WRKDIR=${WRKDIR} WRKDIST=${WRKDIST} \
WRKSRC=${WRKSRC} WRKBUILD=${WRKBUILD} \
PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
PORTSDIR=${PORTSDIR} DEPENDS="${DEPENDS}" \
PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} DEPBASE='${DEPBASE}' \
X11BASE=${X11BASE}
.if defined(BATCH)
SCRIPTS_ENV+= BATCH=yes
.endif
USE_X11?=No
FETCH_MANUALLY?=No
@ -1942,10 +1917,6 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
@cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} do-configure
.else
# What CONFIGURE normally does
@if [ -f ${SCRIPTDIR}/configure ]; then \
cd ${.CURDIR} && ${_SYSTRACE_CMD} ${SETENV} \
${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure; \
fi
. for _c in ${CONFIGURE_STYLE:L}
. if defined(MOD${_c:U}_configure)
@${MOD${_c:U}_configure}

3
infrastructure/templates/Makefile.template
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.template,v 1.49 2006/10/21 12:59:35 espie Exp $
# $OpenBSD: Makefile.template,v 1.50 2006/11/03 17:03:28 espie Exp $
# $FreeBSD/NetBSD: credit FreeBSD/NetBSD if thats where the port came from $
# Original from: credit the original author here
#
@ -156,7 +156,6 @@ MASTER_SITES= ???
#LDFLAGS= ???
#MAKE_FILE= ???
#PKG_ARCH= ???
#SCRIPTS_ENV= ???
#WRKDIST= ??? if other than ${WRKDIR}/$DISTNAME
#WRKSRC= ??? if other than ${WRKDIST}
#WRKBUILD= ??? if other than ${WRKSRC}