From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 21 18:40:12 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B078516A4D0 for ; Mon, 21 Feb 2005 18:40:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CAE043D39 for ; Mon, 21 Feb 2005 18:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j1LIeCmf097799 for ; Mon, 21 Feb 2005 18:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j1LIeCV3097798; Mon, 21 Feb 2005 18:40:12 GMT (envelope-from gnats) Resent-Date: Mon, 21 Feb 2005 18:40:12 GMT Resent-Message-Id: <200502211840.j1LIeCV3097798@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, skv@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF8A116A4CE for ; Mon, 21 Feb 2005 18:38:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 961B243D5D for ; Mon, 21 Feb 2005 18:38:12 +0000 (GMT) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (skv@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j1LIcCub097695 for ; Mon, 21 Feb 2005 18:38:12 GMT (envelope-from skv@freefall.freebsd.org) Received: (from skv@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j1LIcCgP097694; Mon, 21 Feb 2005 18:38:12 GMT (envelope-from skv) Message-Id: <200502211838.j1LIcCgP097694@freefall.freebsd.org> Date: Mon, 21 Feb 2005 18:38:12 GMT From: skv@FreeBSD.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.2 Subject: ports/77873: New variable: USE_BSD_MK X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: skv@FreeBSD.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2005 18:40:12 -0000 >Number: 77873 >Category: ports >Synopsis: New variable: USE_BSD_MK >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 21 18:40:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Sergey Skvortsov >Release: FreeBSD 4.11-STABLE i386 >Organization: >Environment: >Description: New variable USE_BSD_MK is offered. These is some ports in tree depending on (building via) /usr/share/mk/*.mk files. New USE_BSD_MK should rip off all MAKE_ENV appendings and NOPROFILE hacks. Possibly affected ports: audio/ufmcontrol-i18n comms/tits converters/iconv databases/db devel/libhash devel/linuxthreads graphics/gdchart graphics/libglut graphics/ming graphics/tifmerge irc/icbirc japanese/libjconv japanese/ming lang/ghc lang/ghc5 mail/popd math/lapack math/libranlib misc/projectionlib misc/ezload multimedia/libdivxdecore-devel multimedia/libdivxencore net/libconnect net-mgmt/ipacctd net/widentd news/newsfetch science/hdf security/isakmpd security/vncrypt sysutils/dc42wrap sysutils/estctrl textproc/nunnimcax textproc/tinyxml Note commonly used in ports that MANDIR-via-MAKE_ENV passing is not added to applied patch because MANDIR is already depends on SHAREDIR. >How-To-Repeat: >Fix: --- bsd.port.mk.orig Mon Feb 21 20:37:22 2005 +++ bsd.port.mk Mon Feb 21 21:23:12 2005 @@ -221,6 +221,11 @@ # USE_GMAKE - If set, this port uses gmake. # GMAKE - Set to path of GNU make if not in $PATH. # Default: gmake +# USE_BSD_MK - If set, this port uses /usr/share/mk/* files. Additional variables +# are added to MAKE_ENV and PLIST_SUB. +# Note that if USE_BSD_MK equal to "bin" +# then "BINDIR=${PREFIX}/bin" will be added to MAKE_ENV, +# else "BINDIR=${PREFIX}/sbin" will be appended. ## # USE_GETOPT_LONG # - If set, this port uses getopt_long. If OSVERSION @@ -1459,6 +1464,23 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lgnugetopt CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.endif +.endif + +.if defined(USE_BSD_MK) +.if ${USE_BSD_MK:U} == "BIN" +MAKE_ENV+= BINDIR=${PREFIX}/bin +.else +MAKE_ENV+= BINDIR=${PREFIX}/sbin +.endif +MAKE_ENV+= SHAREDIR=${PREFIX} +.if defined(NOMANCOMPRESS) +MAKE_ENV+= NOMANCOMPRESS=${NOMANCOMPRESS} +.endif +.if defined(NOPROFILE) +PLIST_SUB+= PROFILE="@comment " +.else +PLIST_SUB+= PROFILE="" .endif .endif >Release-Note: >Audit-Trail: >Unformatted: