From nobody Thu Aug 15 11:54:38 2024 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 4Wl3St5MVxz5TTsY; Thu, 15 Aug 2024 11:54:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl3St3D9Fz3xtR; Thu, 15 Aug 2024 11:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722878; 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=KSJlyuO0pTvL5r8MEwSIAEV1kdEPFblNzVmPxEIs/R0=; b=Co4KIMTNMrSaBchikRddAPRFTbRms9UtwdvIuCQT2IDBIq70gkgeXU+TLxM6bg8cCMRuP9 F/lrU2vaifNuwDhhD07DhPZIY7L5t72ezQwPSvDX4bpTCoyiahQdqLu2/ovnHg5cB0cHoF rtgZyq8t9mvhXr7sF5Er1jJ+J5vhrIfDcOnnLBu/joZPH4DskP/xmAQOpuma0D/XeyZtS1 u6qzjBBVI6yYHMqckgg7yAopfBMy4QiEqft/Qy+DTKuSvOcyj8H9kD+xgUQXUxGb56vzFR v9z8y6/YoV09BL3RYhR7YB746GZ/f3QD5DS2zd1KR0TteOZQpqRkuhl030bXSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722878; a=rsa-sha256; cv=none; b=BKB4TCwNNmaX9zoT+A9ckbj334fxmw4STIcxYm97mg3kSz3Gveik9AnI+ZvpBozVn1eByC 7dVY4cVxnwufSnt1b0Gcb0vIkcJ4qu/9xn0IBjAImeNefwZxSgPthnxZrWskk3ZWDGWkII yjoxNOgj1dJ02UBNrVTxcXkS01KCMc1rmgVFba2dSRMdlEpbFiFBacCrFD+hw+A6CUca8u KzhfWxO+/e1Yf96xIcF7mMGlKQqcqmHxJ73C8Cp45YMH6WOhfrMnGf1DLv2uCbv54AVllb dDjFqJsc2p9iCiT/4J48RInN9n7vFKPpBmATmNwUCzfp+xGD7XFWp78KpCfdgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722878; 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=KSJlyuO0pTvL5r8MEwSIAEV1kdEPFblNzVmPxEIs/R0=; b=XEv2c0d+mnvTowUer3rEMZGqqJJckNS+/q5xJN4xSJvAwPXqB6yFCN/jgFgTOBntPI8odY 4uZ5lXq9O2r6yTXWBxfcUXL9yGJakS9LkEJNDWkxDlkIWAbr63lDGg3tr1bmm7kGlBPPHy WvfS6fJje8mCI/cvzWcBxfkBQYBf64ogTtBe362p6ouEmDry5UkbXOiRWPX+PRvm6dy4O/ M6cR8IuaIcx8f7BX8a0KPeFtghzRQnh4eqmrdq4EGqAa6WH7PH3HG6DcTpqIekbtjfiHtv CtPHdntoMsUNNu2XTUY4wH+6e7rYIJJzlm4eWJksAvfbRvjKTCr6HWeWaeDFKQ== 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 4Wl3St2jFyzMQN; Thu, 15 Aug 2024 11:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FBscrn056875; Thu, 15 Aug 2024 11:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBscn4056872; Thu, 15 Aug 2024 11:54:38 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:54:38 GMT Message-Id: <202408151154.47FBscn4056872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 55a7a5fc09d8 - main - graphics/libwmf: Convert X11 option to x11 and nox11 flavors 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55a7a5fc09d8d2357c0d7b8c91024246a9556226 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=55a7a5fc09d8d2357c0d7b8c91024246a9556226 commit 55a7a5fc09d8d2357c0d7b8c91024246a9556226 Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 09:41:29 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 10:55:27 +0000 graphics/libwmf: Convert X11 option to x11 and nox11 flavors graphics/libwmf-nox11 is graphics/libwmf@nox11 now. --- graphics/libwmf/Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index cb791decd836..81c656b4f66b 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -28,6 +28,17 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +FLAVORS_SUB= yes +nox11_PKGNAMESUFFIX= -nox11 +.if ${FLAVOR} == x11 +USE_XORG= x11 +USES+= xorg +.else +CONFIGURE_ARGS+=--with-x=no +.endif + CONFLICTS_INSTALL= libwmf libwmf-nox11 CPE_VENDOR= wvware @@ -35,14 +46,9 @@ CPE_VENDOR= wvware USE_GITHUB= yes GH_ACCOUNT= caolanm -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT=X11 +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -X11_CONFIGURE_OFF= --with-x=no -X11_USE= XORG=x11 -X11_USES= xorg - post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ "! -name Makefile ! -name Makefile.am ! -name Makefile.in"