From nobody Thu Nov 25 08:26:32 2021 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 6A78A18B4DF7; Thu, 25 Nov 2021 08:26:33 +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 4J09vX3s3tz3Nrc; Thu, 25 Nov 2021 08:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 65A391A43B; Thu, 25 Nov 2021 08:26:32 +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 1AP8QWto003436; Thu, 25 Nov 2021 08:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AP8QWWC003435; Thu, 25 Nov 2021 08:26:32 GMT (envelope-from git) Date: Thu, 25 Nov 2021 08:26:32 GMT Message-Id: <202111250826.1AP8QWWC003435@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 6387592817b5 - main - emulators/wine: Unconditionally set MAINTAINER and COMMENT 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6387592817b5276970d954b6645636cb496a8603 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637828792; 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=UI4/zOAqZFekx+GdLW53RdWp/GZYtzmWdQcBpYIbDN8=; b=FHXae0bk2LqRLac2YzRxVFfUDlOfJ1DlLPFqwQ99UKTCfYt5c83oi7xYnmqXxXOSdy9rR1 PTRHNchhoVxLC8O9D7Vxd5/yJ6QGmRzDT/qThXa3UJ/DJC/NNjq/SXCraLLNeXqONHBSj2 zHn+/cv9KZyv0dT7ibZk2x7Zifc2YcWr1bS3BwxQB/o0AW7cTNKsAZqAjlmZpw0BwllYQ5 O5kfT6/F1H8vmEU0GGLBb/CIL/+27xljv8VOQb+zd4gwVuH+1C6M6eTvDnGcsx+kt7Lhqb R4MCOnuFRfxMtv2DRFBfgNe/yBzUhKDdM5zUQQ5ptd1mtZrsi+MVs0a7hfD94Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637828792; a=rsa-sha256; cv=none; b=r3BMAiwn6KhxW2lqnm8MIiueIf3CoibxS+U2/e6KKTANvqDROUyWdnINOYEiyEbFDLNOBW S6prNq5blL4vmRLs+hxP7cMmlTpwbflIxi1fwH0bGrl3diMUMpgOW52292e1aA7i+HRRiE 4XoOWkNy01bV7MJ50ppgJGIwg0xD3MHlVXZbcIg2DdLlhfkINCC/qT0vqoTCSwM8SEGo2G U80RRbJqiYbRO9HIZI5td80zn50apR/t5docPG+EfEVxugQFipcAKx/+t5/Vvd24GDXObz fJFRsN3hnsfV+XSKvWC3urOfCwOEJJxR9IBDVj9NhwhgyRGgfsCKIiRYzbEBZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=6387592817b5276970d954b6645636cb496a8603 commit 6387592817b5276970d954b6645636cb496a8603 Author: Gerald Pfeifer AuthorDate: 2021-11-25 08:25:59 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-25 08:25:59 +0000 emulators/wine: Unconditionally set MAINTAINER and COMMENT The MAINTAINER and COMMENT variables, as well as WINELIBDIR, could be overridden for the sake of the i386-wine port. With that port gone, simply set these unconditionally. --- emulators/wine/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ed3e5754d68f..3b97b70ecf4b 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,8 +7,8 @@ CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ http://mirrors.ibiblio.org/wine/source/6.0/ -MAINTAINER?= gerald@FreeBSD.org -COMMENT?= Microsoft Windows compatibility environment +MAINTAINER= gerald@FreeBSD.org +COMMENT= Microsoft Windows compatibility environment LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--verbose \ --without-unwind \ --without-usb CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" -WINELIBDIR?= ${PREFIX}/lib +WINELIBDIR= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif