From nobody Tue Jan 03 08:50:12 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NmRJP05YLz2p9d8; Tue, 3 Jan 2023 08:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmRJN5Knbz47Tr; Tue, 3 Jan 2023 08:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672735812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59UAspWbu7VrX/7np/JT4OSE1Ob+gAxy9WpKDZAaSTQ=; b=FnZc4U8uq597dAi13mZpdRXN5puPH4+m03Rq6QCyx61OpCn/MPRr+vhvQc7sQNKrG6A5zJ cpdN3OAkqPie7TrcYrQk5NUk1KarISv+LsNlOuVW+lG3/fx3qpNBh8hUyfNHpe2yOYB/v5 QPqqOxO9D+5Jm6gFx5uhBob7LCOXXZQU8YrL0plRhOBHQydp8JxNQ2AGTuAdsfmN2nlhmk /Q4SZZjlANu0k/zp+8D7e4JNs9tYgef0ZeQsvNPhXoVWPs1lfg3wyem/y8wifytp++5dIL G3UpIgO3RoHT5iMIxgN0sUx0rfYSaTN6sB6R1QFxDHqraEinmZFdAXlSt44TgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672735812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59UAspWbu7VrX/7np/JT4OSE1Ob+gAxy9WpKDZAaSTQ=; b=rDldKlO+S1pkBB9ZPRdtg5x862dHl9DAxaIbGkfNzZzXuMtxT+ftQupPiqNuAj9/OUlDCd 0c2lKK//Kk8ec+/HxDA4BTEzVMgin4CCv0g7lc0PtS5LXCFZITMsSWeVxM/GxWgLclz4dl edCM9aSHUWhz886Vn0BThT02XpWdQfv61iSjgKp2vZXhgOPEEZDwluT2CWLa1wqDnVYMis Zqygp4+lOguIs/vEpSMnIktjGRgW+Os0JyNllywTnt1ZWhPxoe3CyK+yj0AhLoq334IFV3 KZgAuZd/Qv90jJFyNgYMCTICviAYtBwMKFi4Yn87umMK20Z0hS/8rfs+JXwc8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672735812; a=rsa-sha256; cv=none; b=B4SuHhiUyDGu0O7LVI43JtsFAFy0Cz7lxfZERxDeHF/ZS7cfB84VGZ/0sO0K6fFd4JIMkh fb+n8PN61I/oU98m2njiU6qOxMi0Uzw4Dk4OjOafMcMtXiMUSw+7Guw4/qAAoJwMkhN/A9 +Gyn9Tjtw9IV/D33a83DRRN8pVFwr+TK13Lmzq4gO8U6o8HIaFxGGkabSXNnTczLwOXdeS cNsah8kvWybr7Uc/1+A35R/W10zH5mPSBk1iDPnngp4kaFt79tkyx9z18Mt3cj/1WUnd87 kt05ihXeFmEzOfdjRFnZgBLoVLtV/AQENpKc5tgOAIM2f5BoaK+jViyGTbKB6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NmRJN40fvzQZ0; Tue, 3 Jan 2023 08:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3038oC41036897; Tue, 3 Jan 2023 08:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3038oCNa036891; Tue, 3 Jan 2023 08:50:12 GMT (envelope-from git) Date: Tue, 3 Jan 2023 08:50:12 GMT Message-Id: <202301030850.3038oCNa036891@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 54df541db5b4 - main - net/quagga: introduce compatible installation mode List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54df541db5b43bad19051ca8c5a6d0d8667fd8b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=54df541db5b43bad19051ca8c5a6d0d8667fd8b5 commit 54df541db5b43bad19051ca8c5a6d0d8667fd8b5 Author: Eugene Grosbein AuthorDate: 2023-01-03 08:38:14 +0000 Commit: Eugene Grosbein CommitDate: 2023-01-03 08:50:02 +0000 net/quagga: introduce compatible installation mode This change makes it possible to build a package not conflicting with frr, pimd nor openbgpd introducing new port option LEGACY enabled by default. If disabled, the package is called quagga-compat and has following differences: * /usr/local/bin/vtysh renamed to /usr/local/bin/qvtysh; * libraries install to /usr/local/quagga/lib instead of /usr/local/lib; * binaries install to /usr/local/quagga/sbin instead of /usr/local/sbin. * manual pages install to /usr/local/quagga/man; This is intended to ease migration from quagga to frr making it possible to stop quagga and start frr at once and fall back quickly if things go wrong. Also, remove unneeded USES=ssl. Add other distfile mirrors. --- net/quagga/Makefile | 42 ++++++++++-- net/quagga/{pkg-message => files/pkg-message.in} | 2 + net/quagga/files/quagga.in | 4 +- net/quagga/files/watchquagga.in | 2 +- net/quagga/pkg-plist | 84 ++++++++++++------------ 5 files changed, 82 insertions(+), 52 deletions(-) diff --git a/net/quagga/Makefile b/net/quagga/Makefile index edce72330110..84eeeebf2b27 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,8 +1,10 @@ PORTNAME= quagga PORTVERSION= 1.2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net -MASTER_SITES= https://github.com/Quagga/quagga/releases/download/${DISTNAME}/ +MASTER_SITES= https://github.com/Quagga/quagga/releases/download/${DISTNAME}/ \ + http://www.grosbein.net/freebsd/distfiles/ \ + LOCAL/eugen MAINTAINER= eugen@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software @@ -12,27 +14,26 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c11 cpe gmake libtool makeinfo \ - perl5 readline ssl + perl5 readline -CONFLICTS= frr7 openbgpd pimd zebra GNU_CONFIGURE= yes CONFIGURE_ENV+= GAWK=${AWK} CFLAGS+= -fcommon INSTALL_TARGET= install-strip -USE_LDCONFIG= yes USE_PERL5= build INFO= quagga -OPTIONS_DEFINE= ISISD PIMD PAM RTADV SNMP TCPSOCKETS DLMALLOC \ +OPTIONS_DEFINE= LEGACY ISISD PIMD PAM RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP ISIS_TOPOLOGY EXAMPLES # IRDP needs something freebsd does not seem to have: # configure: error: 'IRDP requires in_pktinfo at the moment!' -OPTIONS_DEFAULT= ISISD PIMD RTADV +OPTIONS_DEFAULT= LEGACY ISISD PIMD RTADV OPTIONS_SUB= yes +LEGACY_DESC= Install to legacy paths (conflicts with FRR etc.) PIMD_DESC= PIM-SSM multicast routing IRDP_DESC= Enable IRDP server support ISISD_DESC= Enable ISIS daemon (beta) @@ -84,6 +85,11 @@ NO_BGP_ANNOUNCE_CONFIGURE_OFF= --enable-bgp-announce USE_RC_SUBR= quagga watchquagga +LEGACY_SUB_LIST= VTYSH=vtysh N= +LEGACY_SUB_LIST_OFF= VTYSH=qvtysh N=${PORTNAME}/ +LEGACY_PLIST_SUB= VTYSH=vtysh N= +LEGACY_PLIST_SUB_OFF= VTYSH=qvtysh N=${PORTNAME}/ + SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} @@ -106,4 +112,26 @@ pre-everything:: post-install: ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} +.include + +.if ${PORT_OPTIONS:MLEGACY} +CONFLICTS= frr7 openbgpd pimd +USE_LDCONFIG= yes +.else +PKGNAMESUFFIX= -compat +QPREFIX= ${PREFIX}/${PORTNAME} +GNU_CONFIGURE_PREFIX= ${QPREFIX} +MANPREFIX= ${QPREFIX} +MANDIRS= ${QPREFIX}/man +USE_LDCONFIG= ${QPREFIX}/lib +CONFIGURE_ARGS+= --datarootdir=${QPREFIX} \ + --bindir=${PREFIX}/bin \ + --includedir=${PREFIX}/include + +post-install-LEGACY-off: + ${MV} ${STAGEDIR}${PREFIX}/bin/vtysh ${STAGEDIR}${PREFIX}/bin/qvtysh + ${MV} ${STAGEDIR}${QPREFIX}/${INFO_PATH}/${PORTNAME}* ${STAGEDIR}${PREFIX}/${INFO_PATH}/ + +.endif + .include diff --git a/net/quagga/pkg-message b/net/quagga/files/pkg-message.in similarity index 86% rename from net/quagga/pkg-message rename to net/quagga/files/pkg-message.in index 39a462ff3210..3c1b5716e9b6 100644 --- a/net/quagga/pkg-message +++ b/net/quagga/files/pkg-message.in @@ -1,6 +1,8 @@ [ { type: install message: <