From owner-freebsd-gnome Fri Jul 5 3: 5:17 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0390637B400; Fri, 5 Jul 2002 03:05:11 -0700 (PDT) Received: from sdns.kv.ukrtel.net (sdns.kv.ukrtel.net [195.5.27.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F17743E09; Fri, 5 Jul 2002 03:05:09 -0700 (PDT) (envelope-from sobomax@FreeBSD.org) Received: from vega.vega.com (195.5.51.243 [195.5.51.243]) by sdns.kv.ukrtel.net with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id 32NFHZ0C; Fri, 5 Jul 2002 13:07:22 +0300 Received: from FreeBSD.org (big_brother.vega.com [192.168.1.1]) by vega.vega.com (8.11.6/8.11.3) with ESMTP id g65A5En23012; Fri, 5 Jul 2002 13:05:14 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Message-ID: <3D256F59.1E563F98@FreeBSD.org> Date: Fri, 05 Jul 2002 13:05:13 +0300 From: Maxim Sobolev Reply-To: vegacap@i.com.ua Organization: Vega International Capital X-Mailer: Mozilla 4.79 [en] (Windows NT 5.0; U) X-Accept-Language: en,uk,ru MIME-Version: 1.0 To: portmgr@FreeBSD.org Cc: ports@FreeBSD.org, gnome@FreeBSD.org Subject: Please approve small bsd.port.mk patch Content-Type: multipart/mixed; boundary="------------CB3F9EA57BB3C1D5B61164ED" Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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