Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 05 Jul 2002 13:05:13 +0300
From:      Maxim Sobolev <sobomax@FreeBSD.org>
To:        portmgr@FreeBSD.org
Cc:        ports@FreeBSD.org, gnome@FreeBSD.org
Subject:   Please approve small bsd.port.mk patch
Message-ID:  <3D256F59.1E563F98@FreeBSD.org>

next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------CB3F9EA57BB3C1D5B61164ED
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit

Folks,

Attached please find patch, which moves USE_REINPLACE detection
downwards, so that it is possible to trigger it from bsd.gnomeng.mk.

Thanks!

-Maxim
--------------CB3F9EA57BB3C1D5B61164ED
Content-Type: text/plain; charset=koi8-r;
 name="bsd.port.mk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="bsd.port.mk.diff"

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.417
diff -d -u -r1.417 bsd.port.mk
--- bsd.port.mk	5 Jul 2002 09:11:29 -0000	1.417
+++ bsd.port.mk	5 Jul 2002 09:54:31 -0000
@@ -709,17 +709,6 @@
 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
@@ -1058,6 +1047,17 @@
 
 .if exists(${PORTSDIR}/../Makefile.inc)
 .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} < 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
 
 # Names of cookies used to skip already completed stages

--------------CB3F9EA57BB3C1D5B61164ED--


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D256F59.1E563F98>