From nobody Sun Oct 22 06:13:34 2023 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 4SCp0t3qpRz4y7Qk; Sun, 22 Oct 2023 06:13:34 +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 4SCp0t31hQz4Zt1; Sun, 22 Oct 2023 06:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697955214; 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=ImeOWFq7+oLGnLz60xgpOrSXFqX6mX/ePqW+E5dgU6g=; b=u7pm2lATBfxZInAOtHm5/WvUlaDUUOXKXx2qj8o6Iu5WGefKBsB1aj9we3oxhQxrDNKiAc DGMnd7+r39vA3QFUayGb9j3M1yEiak7gKkQiGL+sthYymImdsgnc52YfsfDu4X4sVGnP9+ Vs4Okmc0KhP+Tv8pWi51Xt5PIr/0LsYG1QL8ZObIFcifEx6J+1K21TKmnhhuzYwFc1fztH 2GQbhbXivfnCcC8Hb20sgmn4HuAPAqFg0bKmznIck8CzYDDOnGRWCGNcvwQ1knaz1JknSi WqM9HlM5uh66H0ZL3LyebMaKPPL2YD9nTlSvBAHPqgkikZu4bzV7HPUc/ObOcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697955214; a=rsa-sha256; cv=none; b=uMHzxo9KQ3IzJkq+KoC6W1W6W5e4ISg7D50o5QNd34xgRcDodQgNFnnTnKq4yKGhKLl8iv WkRUWLtaxdf1j9fwu6fe7q5zJ6D3OzUDZc8JHM2WpvhxGB7Xss3SOIZL39W2uiL3D+GT8c X1g5QrQo8gC45yT7kOe7twOMpqoc6N7U+Uc6/WhKhEkov7Kqav5GPxqTFXoQRq8SD4dfCA t/Gl2QRTiJ0v/184ffurQKp1K0o8iNibMlpmMfSf3dr6Hxwy8qpQdTWa158GcmAv/cAJTY qiiyhD9BsgY6LxzGmvrELZ20ZIxbu3bunwymaijyoHHQnIgpKMmFSUv1zYXWsw== 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=1697955214; 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=ImeOWFq7+oLGnLz60xgpOrSXFqX6mX/ePqW+E5dgU6g=; b=ae/lPwylDmUk+bVyQIRQJGz1hBbf4flNwFnkUJwp+2S+bf1z0f8gmvtSdOEUkz5cULuZMR r+YJ9sQBCegnaMq2xbFMWgdFaPupeYtB6khZZjfN5DnRJeUuYx2IGXgjAG/PYlab3B/VVN ZtUK0ggnkPjnZwpFojzJNoBHfRrSymjd+Xmsoy5HfqKJmD5yNNQtI04TOU9rNbu7BYdBBG sFoiYnRhuqg7Kkso8JwE99K4eO9iSVSW1hoQUk/IdOib24P/oD03zMrGdaqaRCpINHwn5F VlnS8Emz5JewSzxRviIVJqyqf8ToFOP/G7D5PItGkNSMGnHO2vE2/U5O6GJYvQ== 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 4SCp0t24TBzmph; Sun, 22 Oct 2023 06:13:34 +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 39M6DYWC049780; Sun, 22 Oct 2023 06:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39M6DYel049777; Sun, 22 Oct 2023 06:13:34 GMT (envelope-from git) Date: Sun, 22 Oct 2023 06:13:34 GMT Message-Id: <202310220613.39M6DYel049777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: edc6ad59fbad - main - x11/fireflies: Update to 2.08 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc6ad59fbad705d00718813055e18ed177c85c2 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=edc6ad59fbad705d00718813055e18ed177c85c2 commit edc6ad59fbad705d00718813055e18ed177c85c2 Author: Felix Palmen AuthorDate: 2023-10-20 16:28:59 +0000 Commit: Felix Palmen CommitDate: 2023-10-22 06:13:16 +0000 x11/fireflies: Update to 2.08 Turned out there is a somewhat well-hidden new release available from GitHub, it wasn't even mentioned on the new project homepage. This version fixes build issues, it builds without local patches. There's also at least some activity on the repository, so no need to deprecate this port right now. A fixed libgfx is now integrated in the source tree, so use this instead of the external dependency. Take maintainership. --- x11/fireflies/Makefile | 63 ++++++++++++++++++++----------- x11/fireflies/distinfo | 5 ++- x11/fireflies/files/patch-Make.include.in | 13 ------- x11/fireflies/files/patch-Makefile | 17 --------- x11/fireflies/files/patch-src-main.cc | 49 ------------------------ x11/fireflies/files/patch-warnings | 43 --------------------- x11/fireflies/pkg-descr | 6 ++- x11/fireflies/pkg-plist | 2 - 8 files changed, 49 insertions(+), 149 deletions(-) diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile index f7d50bebd694..fdf8fca5069f 100644 --- a/x11/fireflies/Makefile +++ b/x11/fireflies/Makefile @@ -1,34 +1,53 @@ -PORTNAME= fireflies -PORTVERSION= 2.07 -PORTREVISION= 9 -CATEGORIES= x11 -MASTER_SITES= ${WWW}/files/ +PORTNAME= fireflies +DISTVERSIONPREFIX= v +DISTVERSION= 2.08 +CATEGORIES= x11 -MAINTAINER= ports@FreeBSD.org -COMMENT= Extension of xscreensaver -WWW= https://mpcomplete.org/proj/fireflies +MAINTAINER= zirias@FreeBSD.org +COMMENT= Fireflies screensaver, for use with xscreensaver LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= unmaintained upstream since dec 2005 -EXPIRATION_DATE= 2023-12-31 +LIB_DEPENDS= libargp.so:devel/argp-standalone -LIB_DEPENDS= libgfx.so:graphics/libgfx +USES= autoreconf gl gmake localbase:ldflags xorg +USE_GITHUB= yes +GH_ACCOUNT= mpcomplete +USE_GL= gl glu +USE_XORG= x11 GNU_CONFIGURE= yes -USES= gl -USE_GL= gl glu -EXTRACT_AFTER_ARGS=--exclude '${DISTNAME}/libgfx*' +CONFIGURE_ARGS= --with-bindir=${PREFIX}/${XSSHACKSDIR} \ + --with-confdir=${PREFIX}/${XSSCONFDIR} \ + ac_cv_lib_jpeg_jpeg_start_compress=no \ + ac_cv_lib_png_png_read_image=no \ + ac_cv_lib_tiff_TIFFOpen=no + +CPPFLAGS+= -DHAVE_BOOL +LDFLAGS+= -largp + +PLIST_FILES= ${XSSHACKSDIR}/fireflies \ + ${XSSCONFDIR}/fireflies.xml + +OPTIONS_DEFINE= SDL +SDL_DESC= SDL support, needed for running standalone + +SDL_USES= sdl +SDL_USE= SDL=sdl +SDL_CONFIGURE_OFF= ac_cv_prog_SDL_CONF="" + +XSSHACKSDIR= bin/xscreensaver-hacks +XSSCONFDIR= share/xscreensaver/config -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \ - --with-confdir=${LOCALBASE}/share/xscreensaver/config -PLIST_SUB= VERSION=${PORTVERSION} +# The bundled libgfx has an "automagic" dependency on FLTK that can't be +# overridden, therefore forcefully disable FLTK after configure. +post-configure: + @${REINPLACE_CMD} -E '/(^|HAVE_)FLTK/d' \ + ${WRKSRC}/libgfx/include/gfx/config.h \ + ${WRKSRC}/libgfx/gfx-config -MAKE_ARGS= CONFIGURE_ENV=${CONFIGURE_ENV:Q} \ - CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \ - CONFIGURE_ARGS=${CONFIGURE_ARGS:Q} +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${XSSHACKSDIR}/fireflies .include diff --git a/x11/fireflies/distinfo b/x11/fireflies/distinfo index a99ea0fd04a3..0a67515713dc 100644 --- a/x11/fireflies/distinfo +++ b/x11/fireflies/distinfo @@ -1,2 +1,3 @@ -SHA256 (fireflies-2.07.tar.gz) = e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 -SIZE (fireflies-2.07.tar.gz) = 199917 +TIMESTAMP = 1697799941 +SHA256 (mpcomplete-fireflies-v2.08_GH0.tar.gz) = 1372a3948a1ab93319dfcd9b3ae1cc7393ef4798f6390fc0d6be72e07e0b22b0 +SIZE (mpcomplete-fireflies-v2.08_GH0.tar.gz) = 134204 diff --git a/x11/fireflies/files/patch-Make.include.in b/x11/fireflies/files/patch-Make.include.in deleted file mode 100644 index d7a8817262d8..000000000000 --- a/x11/fireflies/files/patch-Make.include.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Make.include.in.orig Thu Apr 17 14:02:52 2003 -+++ Make.include.in Sat Feb 11 15:17:29 2006 -@@ -5,8 +5,8 @@ - GL_LIBS = @GL_LIBS@ - OPT_LIBS = @OPT_LIBS@ - --CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ --LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@ -+CFLAGS = -Wall -I$(LOCALBASE)/include $(SDL_CFLAGS) @CFLAGS@ -+LIBS = $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib -lgfx $(GL_LIBS) @LIBS@ -lX11 - - OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@ - PROGRAM = @PROGRAM@ diff --git a/x11/fireflies/files/patch-Makefile b/x11/fireflies/files/patch-Makefile deleted file mode 100644 index eacff238ea51..000000000000 --- a/x11/fireflies/files/patch-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile Tue May 6 15:00:40 2003 -+++ Makefile Tue Dec 5 16:44:03 2006 -@@ -1,4 +1,4 @@ --include Make.include -+#include Make.include - - DISTFILES=\ - add-xscreensaver \ -@@ -21,6 +21,6 @@ - win32/ - --all: libgfx/src/libgfx.a -- cd src && make -+all: -+ cd src && ${MAKE} - - libgfx/src/libgfx.a: diff --git a/x11/fireflies/files/patch-src-main.cc b/x11/fireflies/files/patch-src-main.cc deleted file mode 100644 index 165887068c2d..000000000000 --- a/x11/fireflies/files/patch-src-main.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- src/main.cc.orig 2003-06-23 22:55:04.000000000 +0200 -+++ src/main.cc 2014-06-13 19:00:33.000000000 +0200 -@@ -15,8 +15,10 @@ - #ifdef WIN32 - #include - #else -+#ifdef HAVE_ARGP_H - #include - #endif -+#endif - - CanvasBase *canvas; - Scene scene; -@@ -26,7 +28,7 @@ - int mspf = 1000/30; - bool full_screen = false; - --#ifdef WIN32 -+#if defined(WIN32) || !defined (HAVE_ARGP_H) - // mingw doesn't have argp. implement half-assed version - - #define OPTION_HIDDEN 1 -@@ -131,7 +133,7 @@ - return -1; - } - else if (opt[0] == 'V') { -- extern char *argp_program_version; -+ extern const char *argp_program_version; - cerr << argp_program_version << endl; - return -1; - } -@@ -154,7 +156,7 @@ - return -1; - } - else if (strcmp(opt, "version") == 0) { -- extern char *argp_program_version; -+ extern const char *argp_program_version; - cerr << argp_program_version << endl; - return -1; - } -@@ -187,7 +189,7 @@ - #define OPT_FPS 2 - #define OPT_FASTFORWARD 3 - --char *mode_help = -+const char *mode_help = - "\n" - "Per-swarm modes and their default probabilities:\n" - " 1: normal p=20\n" diff --git a/x11/fireflies/files/patch-warnings b/x11/fireflies/files/patch-warnings deleted file mode 100644 index 17fee0115455..000000000000 --- a/x11/fireflies/files/patch-warnings +++ /dev/null @@ -1,43 +0,0 @@ ---- src/canvas_sdl.h 2003-04-26 14:01:42.000000000 -0400 -+++ src/canvas_sdl.h 2013-05-13 14:28:04.000000000 -0400 -@@ -10,11 +10,11 @@ - protected: - SDL_Surface *surface; -- char *wm_title; -- char *wm_class; -+ const char *wm_title; -+ const char *wm_class; - - // create the window (either SDL or GLX) - virtual int create_window(); - public: -- CanvasSDL(Scene *s, bool full_screen, int mspf, char *wm_title, char *wm_class); -+ CanvasSDL(Scene *s, bool full_screen, int mspf, const char *wm_title, const char *wm_class); - virtual ~CanvasSDL() {} - ---- src/canvas_sdl.cc 2004-02-05 16:58:24.000000000 -0500 -+++ src/canvas_sdl.cc 2013-05-13 14:27:03.000000000 -0400 -@@ -10,5 +10,5 @@ - using namespace std; - --CanvasSDL::CanvasSDL(Scene *s, bool fs, int m, char *t, char *c) -+CanvasSDL::CanvasSDL(Scene *s, bool fs, int m, const char *t, const char *c) - : CanvasBase(s, fs, m), wm_title(t), wm_class(c) - { ---- src/vroot.h 2005-12-08 22:07:30.000000000 -0500 -+++ src/vroot.h 2013-05-13 14:30:56.000000000 -0400 -@@ -82,4 +82,5 @@ - #include - #include -+#include /* For sscanf */ - - static Window -@@ -96,7 +97,6 @@ - Display *dpy = DisplayOfScreen(screen); - Atom __SWM_VROOT = None; -- int i; - Window rootReturn, parentReturn, *children; -- unsigned int numChildren; -+ unsigned int i, numChildren; - - /* first check for a hex or decimal window ID in the environment */ diff --git a/x11/fireflies/pkg-descr b/x11/fireflies/pkg-descr index a91350d18363..44d4753320b5 100644 --- a/x11/fireflies/pkg-descr +++ b/x11/fireflies/pkg-descr @@ -1 +1,5 @@ -fireflies is a extention of xscreensaver. +A bunch of fireflies chase a few baits around the screen, leaving colorful +tails which get blown around by the wind. + +This screensaver is installed as a "hack" for xscreensaver. When built with +SDL support, it can also be run standalone. diff --git a/x11/fireflies/pkg-plist b/x11/fireflies/pkg-plist deleted file mode 100644 index ffd2c228dded..000000000000 --- a/x11/fireflies/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/xscreensaver-hacks/fireflies -share/xscreensaver/config/fireflies.xml