From nobody Sat Feb 24 13:35:45 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 4ThnvQ0tf0z59nZf; Sat, 24 Feb 2024 13:35:46 +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 4ThnvQ0MPkz42f3; Sat, 24 Feb 2024 13:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708781746; 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=95FA3o5+b864aIjJQUDqkY1mL/vOEFlJ+xE01/TSySM=; b=Y8x1ZVBQr8wPZLBjw42W23WFsGsETo4MBdSKNHuYlEkuE7LS9YocfFQuTCvlWZTQRuw7Rv YGAB8LO7nR3aAYgB2DP6eU8juCdyaq/cA/cNpLP6Dj7kARQjjKDkVHacIX9z/Jk+6/ouji NjgPLausZohbdlp6wR0QmMM7E9YEe4XF3V2DAeFonabU1kuPJD2O9uJD3thydRaZ0+Ph2X Q09q2kdg6lvaa8DmTYqVrWUfWexg+tWbbJTEy52fg9sM3in/BjNnHHk5ygr455tP26eq1C Y71rZiU7RaoTuD8p2EYPvCggHhmVEQp1ZnALy7CGMDHJOrcu/6sAymwxIAllGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708781746; a=rsa-sha256; cv=none; b=X2D3tP2zSWXs3XkZT8klrwBBIw/oB7NQqEfxElkM2G9U829a716nx0Zr9Hl4EY5zDLDCfZ OOzT+3lqNYgJFmKxLLc9cj949rpS+7gKJSZnC1rZ/D4zQahsXyOpsq8Orw/NPhUYPZpfc9 7HWnVI/e8up6BgnxEq2bti0VL6hYOKE2/W3/uiM9ke0bxONmSX4JZGvbJ3FR3HxqOjJmVv bPGiZysxeNkTpZy8OiV+4c59V41dmKzgaBY61h+ZtzV/HSdnyxXFwkwgxu/76ZBBHZYc7F D9XhUAHOikRGjbdem5VOcxIpV/7NwiKF3NiMRlsGAJ043Zv+CZCwQCBtINF/nQ== 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=1708781746; 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=95FA3o5+b864aIjJQUDqkY1mL/vOEFlJ+xE01/TSySM=; b=KvsNpF4uvxfDkUIWbRc+qejjcBNNy5eDaDF1Alu3zwWg/7IvwIpvSw1bhj7lXwKKi47Thn QyQgpCN4IlDK4MHZP0Vv2ij1tH4czjDxB18h2GSNObLbqFbQ0/nznOslLBX3tPyZKn8q+q kvs6gyeBSfEJNujUI573BGnDWBR04tw9so0UUhb4VVGMUV2Kaif1OVWyIzfwUR+cH9/U22 CkfV3Q/tiK8bY+iPnolpvG3qOF1FGs+OJzkpMEms7umhL2GWjn/D3wlDho+6w9LPdqzJwc +oAI4eHMxLAnGYSyzAKG4oULdQ+p5cm9cEbxDrwO4KXxTNIfCG8JHO0L6W40CQ== 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 4ThnvP6XMlz11w8; Sat, 24 Feb 2024 13:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ODZjuV021669; Sat, 24 Feb 2024 13:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ODZjd9021666; Sat, 24 Feb 2024 13:35:45 GMT (envelope-from git) Date: Sat, 24 Feb 2024 13:35:45 GMT Message-Id: <202402241335.41ODZjd9021666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 537cbffa5984 - main - multiple_ports: moved man to share/man 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: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537cbffa5984539c50847e71989842f72cb3a118 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=537cbffa5984539c50847e71989842f72cb3a118 commit 537cbffa5984539c50847e71989842f72cb3a118 Author: Zsolt Udvari AuthorDate: 2024-02-24 13:31:54 +0000 Commit: Zsolt Udvari CommitDate: 2024-02-24 13:35:19 +0000 multiple_ports: moved man to share/man Update my ports: graphics/mupdf x11-wm/herbstluftwm x11/stalonetray Fix order of variables in graphics/mupdf. Approved by: bofh (mentor) Differential Revision: https://reviews.freebsd.org/D44052 --- graphics/mupdf/Makefile | 33 +++++++++++++++----------- graphics/mupdf/pkg-plist | 4 ++-- x11-wm/herbstluftwm/Makefile | 1 + x11-wm/herbstluftwm/files/patch-CMakeLists.txt | 8 +++---- x11-wm/herbstluftwm/pkg-plist | 6 ++--- x11/stalonetray/Makefile | 2 ++ x11/stalonetray/pkg-plist | 2 +- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index 6f7384feef7c..76df26e1d01f 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -1,6 +1,7 @@ PORTNAME= mupdf DISTVERSION= 1.23.9 DISTVERSIONSUFFIX= -source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/archive/ @@ -18,36 +19,40 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libjbig2dec.so:graphics/jbig2dec \ libopenjp2.so:graphics/openjpeg -USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg -USE_XORG= x11 xcursor xext xinerama xrandr +USES= compiler:c++11-lang cpe gl gmake jpeg pkgconfig xorg +CPE_VENDOR= artifex USE_GL= gl glut USE_LDCONFIG= yes +USE_XORG= x11 xcursor xext xinerama xrandr -CPE_VENDOR= artifex +MAKE_ARGS= build=release \ + mandir=${PREFIX}/share/man \ + prefix=${PREFIX} \ + SOVERSION=${DISTVERSION} \ + verbose=yes \ + XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ + XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" +ALL_TARGET= all extra-libs # pkg-config to avoid the conflict with openjpeg15 CFLAGS+= `pkg-config --cflags libopenjp2` LDFLAGS+= `pkg-config --libs libjpeg libopenjp2` -ljbig2dec -MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ - XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ - XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \ - SOVERSION=${DISTVERSION} -ALL_TARGET= all extra-libs +BINARY_ALIAS= bash=/bin/sh + +PLIST_SUB= SOVERSION=${PORTVERSION} -OPTIONS_DEFINE= DOCS JS SCROLL +OPTIONS_DEFINE= DOCS JS SCROLL OPTIONS_DEFAULT= SCROLL JS_DESC= JavaScript support (V8 engine) SCROLL_DESC= Build with scroll hacks -JS_LIB_DEPENDS= libv8.so:lang/v8 -JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 +JS_LIB_DEPENDS= libv8.so:lang/v8 +JS_MAKE_ARGS= V8_PRESENT=1 \ + V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c -BINARY_ALIAS= bash=/bin/sh -PLIST_SUB= SOVERSION=${PORTVERSION} - post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2//' -e 's/-ldl//' ${WRKSRC}/Makerules diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist index f22e40634d55..b05a489d69ee 100644 --- a/graphics/mupdf/pkg-plist +++ b/graphics/mupdf/pkg-plist @@ -76,8 +76,8 @@ lib/libmupdf-third.so lib/libmupdf-third.so.%%SOVERSION%% lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% -man/man1/mupdf.1.gz -man/man1/mutool.1.gz +share/man/man1/mupdf.1.gz +share/man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile index 1bdec5e8677b..ecd0837e80ca 100644 --- a/x11-wm/herbstluftwm/Makefile +++ b/x11-wm/herbstluftwm/Makefile @@ -1,5 +1,6 @@ PORTNAME= herbstluftwm DISTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= https://herbstluftwm.org/tarballs/ diff --git a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt index ac1cef86b9cc..df06cfaf8379 100644 --- a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt +++ b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-02-17 10:06:29 UTC +--- CMakeLists.txt.orig 2022-07-30 05:55:21 UTC +++ CMakeLists.txt @@ -20,13 +20,13 @@ include(ccache) @@ -12,11 +12,11 @@ set(BINDIR bin) set(DATADIR share) -set(MANDIR ${DATADIR}/man) -+set(MANDIR ${CMAKE_INSTALL_PREFIX}/man) ++set(MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) set(DOCDIR ${DATADIR}/doc/herbstluftwm) set(LICENSEDIR ${DOCDIR} CACHE PATH "Install path for license file") -@@ -36,7 +36,7 @@ set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions +@@ -36,7 +36,7 @@ set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completio CACHE PATH "Install path for zsh completions file") set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d CACHE PATH "Install path for fish completions file") @@ -25,7 +25,7 @@ CACHE PATH "Install path for bash completions file") ## do the actual work -@@ -47,7 +47,6 @@ add_subdirectory(share) +@@ -47,7 +47,6 @@ install(FILES NEWS DESTINATION ${DOCDIR}) ## install everything that was not installed from subdirectories install(FILES NEWS DESTINATION ${DOCDIR}) diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist index 6d6b2aa6efcd..f23de1a17274 100644 --- a/x11-wm/herbstluftwm/pkg-plist +++ b/x11-wm/herbstluftwm/pkg-plist @@ -13,9 +13,9 @@ share/zsh/site-functions/_herbstclient %%PORTDOCS%%%%DOCSDIR%%/html/herbstclient.html %%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm-tutorial.html %%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm.html -%%PORTDOCS%%man/man1/herbstclient.1.gz -%%PORTDOCS%%man/man1/herbstluftwm.1.gz -%%PORTDOCS%%man/man7/herbstluftwm-tutorial.7.gz +%%PORTDOCS%%share/man/man1/herbstclient.1.gz +%%PORTDOCS%%share/man/man1/herbstluftwm.1.gz +%%PORTDOCS%%share/man/man7/herbstluftwm-tutorial.7.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmenu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpbeautify.sh diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile index 26fbf1908d65..93526080f64d 100644 --- a/x11/stalonetray/Makefile +++ b/x11/stalonetray/Makefile @@ -1,6 +1,7 @@ PORTNAME= stalonetray DISTVERSIONPREFIX= v DISTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= uzsolt@FreeBSD.org @@ -18,6 +19,7 @@ GH_ACCOUNT= kolbusa USE_XORG= sm ice x11 xpm GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --disable-native-kde \ --disable-debug diff --git a/x11/stalonetray/pkg-plist b/x11/stalonetray/pkg-plist index 14d596c789b9..1302605a567d 100644 --- a/x11/stalonetray/pkg-plist +++ b/x11/stalonetray/pkg-plist @@ -1,3 +1,3 @@ bin/stalonetray -man/man1/stalonetray.1.gz +share/man/man1/stalonetray.1.gz %%EXAMPLESDIR%%/stalonetrayrc.sample