From nobody Thu Jan 18 22:23:49 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 4TGHMn5gJYz578FK; Thu, 18 Jan 2024 22:23:49 +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 4TGHMn4s8Vz40fR; Thu, 18 Jan 2024 22:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616629; 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=sEnxVPEQpOEyLNwo7NyNCkxZ2fvbmxc6TWZuTWmlJZw=; b=NFzvz6M5YxqYto3YRw59bWnf1WG5FBfzQC5+jj3OwP+F5JtIoemtBFLjXZnMX4X+RniSA+ nPgVLJq6ek+R/8R/QVVv8qlobOEwBzCnI0+uqqGuDZGJuc10R/RxfoR1NVwaSdjEzF0YPQ ATBTCjj8qdUdCr3SZfFhk6U40YSKMcJi4x0BnfsRz1y7Um4ug6KKYpmB0EammfOOeXrmfz NlZ/eG099IFEmV6WypnXdIEPoWFrN9RuHmK9bwNCMgydbAfzZ3KJx2xXLhJ/Mx4yOeilbq 6DcosQss3/MxaBMq2jXgmdOPXwjwOeDzqqQFswYAz6qGk9SJ1wgmbaffMm2hUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616629; 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=sEnxVPEQpOEyLNwo7NyNCkxZ2fvbmxc6TWZuTWmlJZw=; b=FhLoe1932z7DBgRKZ/y9u4VoqBF4fLS1t7J1VM2sxavmWjaeIm7DBpFLyNGo4Jec18ZElO 7qKUFCkkkhx0i3FheKQ37IUKOiXDLdHISEdIH/BxsVu9s3ohEDGRvlNEZ335xvjYDaSQpp A6GZxDg9MasV3HPYlg9KyVLDPNfPBr0xdYndhAQz+d3XkBy4FtHJMEhdP0XAdN73ZMSoRc ma3i1OsuhqqgazoZ3yFUckYp88FJaIY6WbgBgDr5EfnbAU14JagOqbxCYegrYuuh3O+4QJ NsqNlW10BRxfF62vK7Pt8o4orQg703+4b3qJgflh1xHjD/qvgRRRKkf/zTH5KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705616629; a=rsa-sha256; cv=none; b=ntW7cxNk6UspEQhoI8odXaDE2Wnr9ovoSb6HGjln1w5U3bBFB3kpZbMEhiEKfoZKMo2RCV 7ESHXNTOfbU62IqpeHmfmFgPaxLUWy3q+8BlzY/ufkF3Gi1O468Je63eblV9PNIPNmeHcC eN1kdf0e8pHsMrTJX9mnkXCZ5huEk9vSeJHPWevr1uejSaY39zjgPkUfaN2zLzkzxO+X+c C6wR6kVIcPQOLJCPQJdXKl40+TDfCoHMygy8T5MoYYQOMtD+t6TSoedPkfi+JKzY0CZVy1 Q+kwrzyhpzj81LHN07CqX6X+Hv+hWg/pK3+VjEY4b884wVUILcwj9hp+obwoOw== 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 4TGHMn3ws0zQKs; Thu, 18 Jan 2024 22:23:49 +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 40IMNnpZ088378; Thu, 18 Jan 2024 22:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMNnD3088376; Thu, 18 Jan 2024 22:23:49 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:23:49 GMT Message-Id: <202401182223.40IMNnD3088376@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: 429bc46aa1dd - main - x11/3ddesktop: Fix build with graphics/imlib2 1.12.1 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 429bc46aa1dd69bf6fef631a9b8d4f216bd38a3a Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=429bc46aa1dd69bf6fef631a9b8d4f216bd38a3a commit 429bc46aa1dd69bf6fef631a9b8d4f216bd38a3a Author: Nuno Teixeira AuthorDate: 2024-01-18 22:21:55 +0000 Commit: Nuno Teixeira CommitDate: 2024-01-18 22:23:38 +0000 x11/3ddesktop: Fix build with graphics/imlib2 1.12.1 - Add license - Put manpages in ${PREFIX}/share - Pet portlint, portclippy, portfmt and Q/A check Add minimal support to `pkg-config imlib2`; imlib2-config has been dropped since imlib2-1.7.5. PR: 276427 --- x11/3ddesktop/Makefile | 26 +++++++++++++++-------- x11/3ddesktop/files/patch-config.cpp | 4 ++-- x11/3ddesktop/files/patch-configure | 41 ++++++++++++++++++++++++++++++++++++ x11/3ddesktop/files/patch-event.hpp | 6 +++--- 4 files changed, 63 insertions(+), 14 deletions(-) diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile index 3419488bbb80..71bc801b3772 100644 --- a/x11/3ddesktop/Makefile +++ b/x11/3ddesktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= 3ddesktop PORTVERSION= 0.2.9 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11 MASTER_SITES= SF/desk3d/${PORTNAME}/${PORTVERSION} @@ -8,21 +8,29 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D Virtual Desktop Switcher WWW= https://desk3d.sourceforge.net/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libImlib2.so:graphics/imlib2 -USES= gl localbase xorg -USE_XORG= xmu -USE_GL= glut -GNU_CONFIGURE= yes +USES= gl localbase pkgconfig xorg +USE_GL= gl glu glut +USE_XORG= ice sm x11 xext xi xmu xt xxf86vm -PORTDOCS= README README.windowmanagers -PLIST_FILES= bin/3ddesk bin/3ddeskd etc/3ddesktop.conf \ - %%DATADIR%%/digits.bmp \ - man/man1/3ddesk.1.gz man/man1/3ddeskd.1.gz +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CPPFLAGS+= -DHAVE_DECL_GETOPT -pthread LDFLAGS+= -pthread +PLIST_FILES= bin/3ddesk \ + bin/3ddeskd \ + etc/3ddesktop.conf \ + share/man/man1/3ddesk.1.gz \ + share/man/man1/3ddeskd.1.gz +PORTDATA= digits.bmp +PORTDOCS= README README.windowmanagers + OPTIONS_DEFINE= DOCS post-patch: diff --git a/x11/3ddesktop/files/patch-config.cpp b/x11/3ddesktop/files/patch-config.cpp index 2a399b34aaf7..46cfa45e5c7c 100644 --- a/x11/3ddesktop/files/patch-config.cpp +++ b/x11/3ddesktop/files/patch-config.cpp @@ -1,6 +1,6 @@ ---- config.cpp.orig +--- config.cpp.orig 2005-06-20 11:20:44 UTC +++ config.cpp -@@ -64,8 +64,9 @@ +@@ -64,8 +64,9 @@ get_boolean (char *value) } diff --git a/x11/3ddesktop/files/patch-configure b/x11/3ddesktop/files/patch-configure new file mode 100644 index 000000000000..4f118d453258 --- /dev/null +++ b/x11/3ddesktop/files/patch-configure @@ -0,0 +1,41 @@ +Add minimal support to `pkg-config imlib2`; imlib2-config has been +dropped since imlib2-1.7.5. + +--- configure.orig 2005-06-26 14:22:29 UTC ++++ configure +@@ -8112,22 +8112,20 @@ fi + echo "${ECHO_T}no" >&6 + fi + +-if test "$IMLIB2_CONFIG_IN_PATH" != yes; then +- echo "------- ERROR -------" +- echo "The imlib2-config development script was not found in your execute path." +- echo "You may have imlib2 installed somewhere not covered by your path." +- echo "" +- echo "If this is the case make sure you have the packages installed, AND" +- echo "that the imlib2-config script is in your execute path (see your" +- echo "shell's manual page on setting the \$PATH environment variable)." +- echo "---------------------" +- { { echo "$as_me:$LINENO: error: Fatal Error: no imlib2-config detected." >&5 +-echo "$as_me: error: Fatal Error: no imlib2-config detected." >&2;} +- { (exit 1); exit 1; }; } +- exit; ++if test "$IMLIB2_CONFIG_IN_PATH" = yes; then ++ imlib2_cflags=`imlib2-config --cflags` ++ imlib2_libs=`imlib2-config --libs` ++else ++ if pkg-config imlib2; then ++ imlib2_cflags=`pkg-config imlib2 --cflags` ++ imlib2_libs=`pkg-config imlib2 --libs` ++ else ++ { { echo "$as_me:$LINENO: error: Fatal Error: no imlib2 detected." >&5 ++ echo "$as_me: error: Fatal Error: no imlib2 detected." >&2;} ++ { (exit 1); exit 1; }; } ++ exit; ++ fi + fi +-imlib2_cflags=`imlib2-config --cflags` +-imlib2_libs=`imlib2-config --libs` + + + diff --git a/x11/3ddesktop/files/patch-event.hpp b/x11/3ddesktop/files/patch-event.hpp index 8aed280e477c..ec69ce7b6853 100644 --- a/x11/3ddesktop/files/patch-event.hpp +++ b/x11/3ddesktop/files/patch-event.hpp @@ -1,6 +1,6 @@ ---- event.hpp.orig 2007-08-02 14:11:31.000000000 +0200 -+++ event.hpp 2007-08-02 14:11:45.000000000 +0200 -@@ -74,7 +74,7 @@ +--- event.hpp.orig 2004-12-06 02:57:32 UTC ++++ event.hpp +@@ -74,7 +74,7 @@ class EventManager { (public) list::iterator k; for (k = events.begin(); k != events.end(); ++k) { Event *e = *k;