From owner-freebsd-ports Mon Aug 13 21:30:12 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3B1E037B407 for ; Mon, 13 Aug 2001 21:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7E4U1J56560; Mon, 13 Aug 2001 21:30:01 -0700 (PDT) (envelope-from gnats) Received: from mail.westbend.net (ns1.westbend.net [216.47.253.3]) by hub.freebsd.org (Postfix) with ESMTP id 974AC37B412 for ; Mon, 13 Aug 2001 21:21:40 -0700 (PDT) (envelope-from admin@mail.westbend.net) Received: (from root@localhost) by mail.westbend.net (8.11.2/8.11.2) id f7E4LF370390; Mon, 13 Aug 2001 23:21:15 -0500 (CDT) (envelope-from admin) Message-Id: <200108140421.f7E4LF370390@mail.westbend.net> Date: Mon, 13 Aug 2001 23:21:15 -0500 (CDT) From: "Scot W. Hetzel" Reply-To: "Scot W. Hetzel" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/29692: New port variable USE_COMPAT_LIB - bsd.port.mk Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29692 >Category: ports >Synopsis: New port variable USE_COMPAT_LIB - bsd.port.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 13 21:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.4-PRERELEASE i386 >Organization: West Bend Internet >Environment: System: FreeBSD wbiW09.westbend.net 4.4-PRERELEASE FreeBSD 4.4-PRERELEASE #0: Sat Aug 11 10:55:29 CDT 2001 root@wbiW09.westbend.net:/usr/obj/usr/src/sys/WBIW09-SMP i386 >Description: Add a USE_COMPAT_LIB variable which selects the appropriate misc/compat* port that is required by the port. Currently, USE_COMPAT_LIB can be set to the following values: 22 - uses compat22 libraries. 3X - uses compat3x libraries. 4X - uses compat4x libraries. I plan on using USE_COMPAT_LIB for the www/apache13-fp ports dependence on the compat3x libraries. Scot >How-To-Repeat: >Fix: Changed Files: bsd.port.mk Added Files: bsd.compatlib.mk diff -ruN Mk.orig/bsd.compatlib.mk Mk/bsd.compatlib.mk --- Mk.orig/bsd.compatlib.mk Wed Dec 31 18:00:00 1969 +++ Mk/bsd.compatlib.mk Mon Aug 13 22:39:57 2001 @@ -0,0 +1,45 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Please view me with 4 column tabs! + +# Please make sure all changes to this file are past through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +COMPAT_LIB_MAINTAINER= hetzels@westbend.net + +# This section contains the USE_ definitions. + +# USE_COMPAT_LIB can be set to the following values: +# 22 - uses compat22 libraries. +# 3X - uses compat3x libraries. +# 4X - uses compat4x libraries. + +# USE_COMPAT_LIB = 22 +.if ${USE_COMPAT_LIB} == 22 && ${OSVERSION} >= 300000 +.if !exists(/usr/lib/compat/aout/libc.so.3.1) +RUN_DEPENDS+= /usr/lib/compat/aout/libc.so.3.1:${PORTSDIR}/misc/compat22 +.endif +.endif +# End of USE_COMPAT_LIB = 22 + +# USE_COMPAT_LIB = 3X +.if ${USE_COMPAT_LIB} == 3X && ${OSVERSION} >= 400000 +.if !exists(/usr/lib/compat/libc.so.3) +LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x +.endif +.endif +# End of USE_COMPAT_LIB = 3X + +# USE_COMPAT_LIB = 4X +.if ${USE_COMPAT_LIB} == 4X +.if ( ${OSVERSION} >= 430000 && ${OSVERSION} < 500000 ) || ${OSVERSION} > 500018 +.if !exists(/usr/lib/compat/libcrypto.so.1) +LIB_DEPENDS+= crypto.1:${PORTSDIR}/misc/compat4x +.endif +.endif +.endif +# End of USE_COMPAT_LIB = 4x + +# End of use part. diff -ruN Mk.orig/bsd.port.mk Mk/bsd.port.mk --- Mk.orig/bsd.port.mk Mon Jul 16 13:46:54 2001 +++ Mk/bsd.port.mk Mon Aug 13 22:39:15 2001 @@ -906,6 +906,10 @@ .include "${PORTSDIR}/../Makefile.inc" .endif +.if defined(USE_COMPAT_LIB) +.include "${PORTSDIR}/Mk/bsd.compatlib.mk" +.endif + # Don't change these!!! These names are built into the _TARGET_USE macro, # there is no way to refer to them cleanly from within the macro AFAIK. EXTRACT_COOKIE?= ${WRKDIR}/.extract_done >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message