From nobody Thu Apr 21 12:38:28 2022 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 3C94F1995836; Thu, 21 Apr 2022 12:38:29 +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 4KkcXP1DF3z3wDB; Thu, 21 Apr 2022 12:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650544709; 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=WVr/RpBGWXPeD6gYDAJ8fPnleniQw7PsOqkDEI2HT5E=; b=Qeb6ZKJlCz46R9JVpJC9svF4wFsl7DLFcLA33exCo1IyinvqimOJehtrxkNF1PlO4jMvYt dpDNnclr3pvcRCdHBnbqzQzpK0c63WX9YHOD4Jmr6ydlV66Vny/vjpmNHkgdpTS3p8Kgwh ++px+m62zAhieoNum+giZSJRpwizl46gLPWyWf41d198pYZDDnWn1lNq/uAJk+fKZFNLl/ kLuYqDprhtyT46akG6V2A49jIdA88ywp3vZnGtV+ZzNBBnoCfgFs4aHluHraYOSodzLdZb +pnHGd+8tP6t9LwkyY6BW961IjsTb+R9aTg3ne+7mcY0pd404QcfCXwfOVyyaw== 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 09F08738; Thu, 21 Apr 2022 12:38:29 +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 23LCcStp007021; Thu, 21 Apr 2022 12:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LCcSqL007020; Thu, 21 Apr 2022 12:38:28 GMT (envelope-from git) Date: Thu, 21 Apr 2022 12:38:28 GMT Message-Id: <202204211238.23LCcSqL007020@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emanuel Haupt Subject: git: 4968b19903ed - 2022Q2 - audio/adplay: Fix default adplugdb install path 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 4968b19903ed35904a691d12bc9f38a9a70b7821 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650544709; 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=WVr/RpBGWXPeD6gYDAJ8fPnleniQw7PsOqkDEI2HT5E=; b=BTjPzohr485bxeqeGpusYn2M3icRGiRbYRgCN42U+seNpIyLjqiq8kYOnLVJDoNxW6e7rL Eya23/NzHLzmV9Qnf5cHjB53vhjvMUsZqNR3tAttc/CwixkHi/Y21GIDqZQtev3Q9MG8aJ yOcZXjOKuNiwL4KfpslEoXYkQMcQINtaRHlViMQzHRPJq/aGPkFu/dYqwpu8MgjHCKx2HR wPNX4dcY0DkHCExlAdgFw5QkK54IgcF4wzEcDXjG1vV2JUeKNqCeIXZS8WB+ufl+r6BaGt jxLcIADL+SGT+lb5Dyzw6zMXUv1DNnR4MROn9+LfUSAk0oWVSQBEwJUhtuzN4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650544709; a=rsa-sha256; cv=none; b=x/l7DlywPpjZL4pafRB+O35OMDsHehFibHQUT91V/2Z8Z+vlmCDaTcNfYsT+hHhJcHB6kt IRmqHkjfNbV6MMSjQ6zJN6LtgEFjxV7cGIVtKkdlfBnMOsqjNLng4CCx03BmuSYCxO9dko vF2e+1UiqWEuL7wyd+4nicKGogNzu4l4x27+y7I5z30OW2HjCPSvyOQNbk53ibgaSMEHMt 3boyRDSy9UTk4mMrzGT0Lq3vavoSFMF+qY2Dh4BYz5yx4Q7FswJwkpeU8VQwHzNH2fOn62 g+E+Nkgnrh085zHrKnmHw3QYwJd4gZh6zbGRz1Y0zDVwEMClUaTtJo4H6ZKvlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4968b19903ed35904a691d12bc9f38a9a70b7821 commit 4968b19903ed35904a691d12bc9f38a9a70b7821 Author: Emanuel Haupt AuthorDate: 2022-04-21 12:37:36 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-21 12:38:24 +0000 audio/adplay: Fix default adplugdb install path (cherry picked from commit d51270abb73560025024c753d0871d9804c7fc53) --- audio/adplay/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile index 7f2ecc2f02e9..9ec4a681cb5f 100644 --- a/audio/adplay/Makefile +++ b/audio/adplay/Makefile @@ -2,8 +2,8 @@ PORTNAME= adplay PORTVERSION= 1.8.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org @@ -25,7 +25,7 @@ GH_TUPLE= adplug:database:${DBVERSION}:database/database-${DBVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sharedstatedir=${DATADIR} -PLIST_FILES= ${DATADIR}/adplug.db \ +PLIST_FILES= ${DATADIR}/adplug/adplug.db \ bin/adplay \ man/man1/adplay.1.gz @@ -47,8 +47,8 @@ post-patch: @${RM} ${WRKSRC}/src/getopt.h post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/adplug ${INSTALL_DATA} ${WRKSRC}/database-${DBVERSION}/${DBFILE} \ - ${STAGEDIR}${DATADIR} + ${STAGEDIR}${DATADIR}/adplug .include