From 2ca6e0b404a0f1419449288f8ec88ade38492427 Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 13 Nov 2021 16:00:22 +0000 Subject: [PATCH] infrastructure changes for icinga-web2-module-ipl/reactbundle being replaced by icinga-php-library/thirdparty --- net/icinga/Makefile | 6 +++--- net/icinga/Makefile.inc | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/net/icinga/Makefile b/net/icinga/Makefile index 551aa861af4..65a2012107c 100644 --- a/net/icinga/Makefile +++ b/net/icinga/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.9 2021/01/31 18:53:54 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2021/11/13 16:00:22 sthen Exp $ SUBDIR = SUBDIR += core2 + SUBDIR += icinga-php-library + SUBDIR += icinga-php-thirdparty SUBDIR += web2 SUBDIR += web2-module-director SUBDIR += web2-module-incubator - SUBDIR += web2-module-ipl - SUBDIR += web2-module-reactbundle .include diff --git a/net/icinga/Makefile.inc b/net/icinga/Makefile.inc index 71f5223db46..724bae5bfcd 100644 --- a/net/icinga/Makefile.inc +++ b/net/icinga/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.21 2020/12/16 20:47:31 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.22 2021/11/13 16:00:22 sthen Exp $ CATEGORIES += net GH_ACCOUNT = Icinga -PKGNAME = ${DISTNAME:S/icingaweb2/icinga-web2/} +PKGNAME ?= ${DISTNAME:S/icingaweb2/icinga-web2/} # GPLv2 only PERMIT_PACKAGE ?= Yes @@ -11,15 +11,20 @@ PERMIT_PACKAGE ?= Yes .if !defined(MODULE_NAME) HOMEPAGE = https://icinga.com/ .else -MODULES += lang/php -GH_PROJECT = icingaweb2-module-${MODULE_NAME} -GH_TAGNAME = ${MODULE_VERSION} +GH_PROJECT ?= icingaweb2-module-${MODULE_NAME} +GH_TAGNAME ?= ${MODULE_VERSION} +MODULE_DEST ?= ${PREFIX}/icinga-web2/modules/${MODULE_NAME} RUN_DEPENDS += net/icinga/web2 +.endif + +.if defined(MODULE_DEST) +MODULES += lang/php NO_TEST = Yes NO_BUILD = Yes PREFIX = ${VARBASE}/www +MODULE_SRC ?= do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/icinga-web2/modules/${MODULE_NAME} - cd ${WRKSRC}; pax -rw ./ ${PREFIX}/icinga-web2/modules/${MODULE_NAME} + ${INSTALL_DATA_DIR} ${MODULE_DEST} + cd ${WRKSRC}/${MODULE_SRC}; pax -rw ./ ${MODULE_DEST} .endif