From nobody Sat Mar 23 20:41:02 2024 X-Original-To: dev-commits-ports-main@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 4V2B1C0R1Bz5FqGP; Sat, 23 Mar 2024 20:41:03 +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 4V2B1B4l1cz4Kg5; Sat, 23 Mar 2024 20:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711226462; 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=Ftk6/u/ObzlwMTv6+BLSuu20Pyg4E8kvv/ErQctz52Y=; b=VDmkjJ9C94+IJIiIqKNkVE4lcPflXyagcBKEH2eOwE1lA3TR37ovtxjdbUSP4FPaSEmvwu 5sade7Cx9IZbjLtz5o8hCM6CL0zuCtHCQ/V8Ytr+jpzcDx6XvVbuNwYgk2jOyExs6rOk4S wIKbp4Pensj/ZzbOKWCXo7V6h+AHAhLADcorwofCpyfsNmYue1AETqixiSsmp3IwXBw46R sIcD/AdHHBYZLKTxkCJ0FNhmbC4GLBqvKF4cGW3w/QQT9aBsF+M4+tEqcF5DZrgQKKNsKZ E+9RzuJuDRgZOwZfZ96iQNeuJD1sUDv5z0ixzF0lvrsODgyTOjry/SczCptcUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711226462; a=rsa-sha256; cv=none; b=YYpod8ZiQFMQlZEUCqnn+F4P3K9ps71M2yxuW/cJ+SL6JKAAD7Vc4FalYaNTUo010kiZan fuHn4fzhmhzdolhw+0FZmCIrE+N4irbHGpsYj2sHp6aslgCsvvA/QVZxXeUKmcZr3WaoDg Tkd72Z7PX9MSDyMniR6ONUhH5WB/iQPsW3+XoJOo+nFPyj1741DHDdV2OHuXRs/MYCrx0h shmSRdM2vRHzaJGtxiBaMignoj4gggCbdeTObxz+DrPNJee6Nam3AwW6rKMS8oAmueQQPZ dp3n1G9i/So9G2YvublcxfR0fFgHsuB9VfC3vpfRTnRAZNzCb81GmIFuELOwtg== 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=1711226462; 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=Ftk6/u/ObzlwMTv6+BLSuu20Pyg4E8kvv/ErQctz52Y=; b=lYmddW3QPUg7ofMPMcdIWBfzzA6XqAFMUkxNWivPLeONZVRgQRApXUwhBHoyOaPLij/PyV YLxX+b9s7eYUBHFLGiFWdBHjA6IkkmQfCFN7j4bnhm0VVlEtm8yb0Wqpll8jZIZUv75rMh zCLkxDSnktFlRhCS2Fwilgfb+k1ncK6QI+f7mF72p/+RrzRUp4+XG2aDWQ7NLojf1/DWvF iIKoIbFY1WJo8Z/ZYHZNsvSh8+D9cndUDQ1gd0zWC+7qij2lQzOaSay1P3LtW9rSzY2NUb N/mwXmlN6KhlPutchq6uMPm3OpKjx8k3sn8DW6E6RWsXBY98CgWW4UNO01WAWg== 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 4V2B1B45GRz13bS; Sat, 23 Mar 2024 20:41:02 +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 42NKf2IH090278; Sat, 23 Mar 2024 20:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NKf2TU090275; Sat, 23 Mar 2024 20:41:02 GMT (envelope-from git) Date: Sat, 23 Mar 2024 20:41:02 GMT Message-Id: <202403232041.42NKf2TU090275@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: cbb9e34f9d76 - main - x11/slim: Move man pages to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbb9e34f9d764fef7f1e9f2c8a7edbaf509c8dee Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbb9e34f9d764fef7f1e9f2c8a7edbaf509c8dee commit cbb9e34f9d764fef7f1e9f2c8a7edbaf509c8dee Author: Nuno Teixeira AuthorDate: 2024-03-23 20:19:40 +0000 Commit: Nuno Teixeira CommitDate: 2024-03-23 20:40:43 +0000 x11/slim: Move man pages to share/man Approved by: portmgr (blanket) --- x11/slim/Makefile | 2 +- x11/slim/files/patch-CMakeLists.txt | 22 ++++++++++------------ x11/slim/pkg-plist | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 04bef53c5617..485d11aa87f2 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,6 +1,6 @@ PORTNAME= slim PORTVERSION= 1.3.6 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios diff --git a/x11/slim/files/patch-CMakeLists.txt b/x11/slim/files/patch-CMakeLists.txt index c099134c65b5..415929bfeb92 100644 --- a/x11/slim/files/patch-CMakeLists.txt +++ b/x11/slim/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-10-01 18:38:05.000000000 -0400 -+++ CMakeLists.txt 2014-12-15 21:35:53.000000000 -0500 -@@ -14,6 +14,7 @@ +--- CMakeLists.txt.orig 2013-10-01 22:38:05 UTC ++++ CMakeLists.txt +@@ -14,6 +14,7 @@ INCLUDE(CheckTypeSize) INCLUDE(CheckCCompilerFlag) INCLUDE(CheckCXXCompilerFlag) INCLUDE(CheckTypeSize) @@ -8,23 +8,21 @@ # Version set(SLIM_VERSION_MAJOR "1") -@@ -23,14 +24,23 @@ +@@ -23,14 +24,22 @@ set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") -set(SYSCONFDIR "/etc") -set(LIBDIR "/lib") --set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") + set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR + ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" + ) + set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}") + set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(MANDIR "${CMAKE_INSTALL_PREFIX}/man") +else() + set(SYSCONFDIR "/etc") + set(LIBDIR "/lib") -+ set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") +endif() set(SLIM_DEFINITIONS) @@ -36,7 +34,7 @@ ) set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DNEEDS_BASENAME") else() -@@ -70,8 +80,10 @@ +@@ -70,8 +79,10 @@ if(USE_PAM) ) if(USE_PAM) set(common_srcs ${common_srcs} PAM.cpp) @@ -49,7 +47,7 @@ endif(USE_PAM) # Build common library -@@ -120,7 +132,9 @@ +@@ -120,7 +131,9 @@ if(USE_PAM) message("\tPAM Found") set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) @@ -60,7 +58,7 @@ include_directories(${PAM_INCLUDE_DIR}) else(PAM_FOUND) message("\tPAM Not Found") -@@ -195,6 +209,7 @@ +@@ -195,6 +208,7 @@ target_link_libraries(${PROJECT_NAME} ${FREETYPE_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} @@ -68,7 +66,7 @@ libslim ) -@@ -221,7 +236,9 @@ +@@ -221,7 +235,9 @@ install(TARGETS slim RUNTIME DESTINATION bin) ####### install # slim install(TARGETS slim RUNTIME DESTINATION bin) @@ -79,7 +77,7 @@ if (BUILD_SHARED_LIBS) set_target_properties(libslim PROPERTIES -@@ -236,9 +253,11 @@ +@@ -236,9 +252,11 @@ install(FILES slim.1 DESTINATION ${MANDIR}/man1/) # man file install(FILES slim.1 DESTINATION ${MANDIR}/man1/) diff --git a/x11/slim/pkg-plist b/x11/slim/pkg-plist index c5191b1dd89a..dc575a478bf5 100644 --- a/x11/slim/pkg-plist +++ b/x11/slim/pkg-plist @@ -4,6 +4,6 @@ lib/libslim.so.%%VERSION%% %%DATADIR%%/themes/default/background.jpg %%DATADIR%%/themes/default/panel.png %%DATADIR%%/themes/default/slim.theme -man/man1/slim.1.gz +share/man/man1/slim.1.gz @sample etc/slim.conf.sample %%PAM%%@sample etc/pam.d/slim.sample