Move USE_REINPLACE detection downward, so that it is possible to set it from
bsd.gnomeng.mk. Also increase OSVERSION `sed -i'check to be 500036 on -current, as users report that 500034 isn't sufficient to catch new sed(1) functionality. Approved by: portmgr (silently)
This commit is contained in:
parent
7487f2d1da
commit
d722fa71e4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=62694
1 changed files with 11 additions and 11 deletions
|
@ -709,17 +709,6 @@ FILESDIR?= ${MASTERDIR}/files
|
|||
SCRIPTDIR?= ${MASTERDIR}/scripts
|
||||
PKGDIR?= ${MASTERDIR}
|
||||
|
||||
# Special macro for doing in-place file editing using regexps
|
||||
.if defined(USE_REINPLACE)
|
||||
REINPLACE_ARGS?= -i.bak
|
||||
.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500034 )
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace
|
||||
REINPLACE_CMD?= ${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS}
|
||||
.else
|
||||
REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if defined(USE_IMAKE) && !defined(USE_X_PREFIX)
|
||||
USE_X_PREFIX= yes
|
||||
.endif
|
||||
|
@ -1057,6 +1046,17 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
|
|||
.include "${PORTSDIR}/../Makefile.inc"
|
||||
.endif
|
||||
|
||||
# Special macro for doing in-place file editing using regexps
|
||||
.if defined(USE_REINPLACE)
|
||||
REINPLACE_ARGS?= -i.bak
|
||||
.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 )
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace
|
||||
REINPLACE_CMD?= ${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS}
|
||||
.else
|
||||
REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
# Names of cookies used to skip already completed stages
|
||||
EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PKGNAME}
|
||||
CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PKGNAME}
|
||||
|
|
Loading…
Reference in a new issue