From nobody Fri Nov 25 15:57:32 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 4NJfdS4Q2sz4j7G3; Fri, 25 Nov 2022 15:57:32 +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 4NJfdS3ykcz46TB; Fri, 25 Nov 2022 15:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669391852; 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=nYzE6QTIIMZfK1wYYnq6PnVYQFXZ0sPURJq98MVv3/I=; b=N54eE3MdCja38+vlyE7MAjT1xfV0C1J9QaVLxn14rhk87RHeJeZ1BVel/TTuXxxjXXAPRr 6qjDE/JXbHYUKDWE4jJH3SPvcQBvigZENcaQ596gR8NqR5EA5prHBhR3n9OQsD8v1QGbVf oDHFGHnsU6mSggYUQxNfDRYXYHosrPDQstS9iOM4kzQIYj50Ro+25G48MaRkf+Bhk12M11 +9+wZ9T3/2bZtdBbgb84VRG+yPYC719V8MYyBoPz8Wboewh08CT/QViFOna03adIaW7L/Y GlqTKRCdQikgFDu5J647RFyJVCpAuqZQJuTmF63MGaVwxF1cyXh80jkBlfj3vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669391852; 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=nYzE6QTIIMZfK1wYYnq6PnVYQFXZ0sPURJq98MVv3/I=; b=nHQdtrcjRyY3mL60sIgsIgumzamn+loKDlVk2Ia6h+FtORMV4b2863UhiG3mvaH5v1GDvd tzI1rQWetBPYCBf8pAP9MlRk9jqyLibhsXGjmZ7fJKDJdfV+nVXsHO9ylCDkh5vkxrSfiW CQWrD2/rb0EfwlodhkJqal4/zWXK1pxh+Hp7lxle8gEMrfe+XcCpjLEM3aqN9qWUbwB2aD T3bSthZHUr7clVpPE3/0opm5GwEgdZp/OwmjrVXdAhNsoQkqkzt1HC26IPX2mXIhqrGwc5 J7qLWDmGZbZT+DWQTJPmoyQ+JisqQUNLu+6ZOy6R3W14Xhmc5/1ghWrcRyurPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669391852; a=rsa-sha256; cv=none; b=CnBkr4Mikv1fctXVcQqpSTvFC++Xx+1jChOQoMocQfTOHA5V/UFhVdM6H5MrPiVfVWzv8p iNS9sjYsWh9ImkiIt0BJGczHwRkwWWazbV1BOSnDica2fonCH1+DD+iy8/F/ZSF9IqRYYA LhAw8eAcHzTRyT0pIGiXVTbwdEsY1kVurbMcnT5SJi2daEIbZD8oB8EUGE7BY5GlFUHjQH z22SSx4bfF/DR6DlCZl6TxIxovQfvDp3L44sCQHOoOkqlF0T9Xjij5fJ3ksjUXwcPOetlE vpl/62VDiwgrIt1QzfIDLCgFC5pFxzkfATBilAT0hOvwkjjJjCkP/6U/lpShjg== 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 4NJfdS34TWzmGM; Fri, 25 Nov 2022 15:57:32 +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 2APFvWKK025414; Fri, 25 Nov 2022 15:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2APFvWCR025413; Fri, 25 Nov 2022 15:57:32 GMT (envelope-from git) Date: Fri, 25 Nov 2022 15:57:32 GMT Message-Id: <202211251557.2APFvWCR025413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: d86d9a78a6d2 - main - =?utf-8?Q?games/spacezero:=20update=200.86.00=20=E2=86=92=200.86.01?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d86d9a78a6d2f4095cbddfdf220faea6e3c082ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=d86d9a78a6d2f4095cbddfdf220faea6e3c082ef commit d86d9a78a6d2f4095cbddfdf220faea6e3c082ef Author: Dmitry Marakasov AuthorDate: 2022-11-25 12:48:39 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-25 15:57:21 +0000 games/spacezero: update 0.86.00 → 0.86.01 - Trim depends which are transitive dependencies of gtk --- games/spacezero/Makefile | 10 +++----- games/spacezero/distinfo | 6 ++--- games/spacezero/files/patch-Makefile | 38 ++++++++++++++--------------- games/spacezero/files/patch-include_snow.h | 11 --------- games/spacezero/files/patch-src_snow.c | 10 -------- games/spacezero/files/patch-src_spacecomm.c | 11 --------- 6 files changed, 25 insertions(+), 61 deletions(-) diff --git a/games/spacezero/Makefile b/games/spacezero/Makefile index c397cf9d61b8..c3755e12d2c6 100644 --- a/games/spacezero/Makefile +++ b/games/spacezero/Makefile @@ -1,6 +1,5 @@ PORTNAME= spacezero -PORTVERSION= 0.86.00 -PORTREVISION= 1 +PORTVERSION= 0.86.01 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION:R}/ @@ -11,12 +10,10 @@ WWW= http://spacezero.sourceforge.net/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 +LIB_DEPENDS= libvorbisfile.so:audio/libvorbis USES= openal:al,alut gnome pkgconfig xorg -USE_GNOME= gtk20 cairo gdkpixbuf2 +USE_GNOME= gtk20 USE_XORG= x11 MAKE_ARGS= DATADIR="${DATADIR}" \ INSTALL_DATA_DIR="${DATADIR}" @@ -24,7 +21,6 @@ ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} -LDFLAGS+= -lX11 LDFLAGS_i386= -Wl,-znotext PORTDOCS= * diff --git a/games/spacezero/distinfo b/games/spacezero/distinfo index 68446b5e07bd..f39f5d3a69d3 100644 --- a/games/spacezero/distinfo +++ b/games/spacezero/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511982829 -SHA256 (spacezero-0.86.00.tar.gz) = 5199ed0b00843092fad5949d27fd0cf612ed54918ea83c21a83bcc9a10a6c665 -SIZE (spacezero-0.86.00.tar.gz) = 2317283 +TIMESTAMP = 1669376333 +SHA256 (spacezero-0.86.01.tar.gz) = 8588a73051e35e35e6d9123b5beb39f3574623c64e8dc4f33b4e4f3003b73296 +SIZE (spacezero-0.86.01.tar.gz) = 2317419 diff --git a/games/spacezero/files/patch-Makefile b/games/spacezero/files/patch-Makefile index 2ac8d7eb3b4c..6fcbd8a048cd 100644 --- a/games/spacezero/files/patch-Makefile +++ b/games/spacezero/files/patch-Makefile @@ -1,34 +1,34 @@ ---- Makefile.orig 2013-12-21 12:57:43 UTC +--- Makefile.orig 2022-11-23 18:14:49 UTC +++ Makefile @@ -1,4 +1,4 @@ --CC=gcc -+CC?=gcc +-CC = /usr/bin/gcc ++CC ?= /usr/bin/gcc + #CC=gcc BINDIR= ./bin - DATADIR= ./dat -@@ -26,8 +26,8 @@ GTKLIBS=`pkg-config --libs gtk+-2.0` +@@ -31,8 +31,8 @@ GTKLIBS=`$(PKG_CONFIG) --libs gtk+-2.0` GTKLIBS12=`gtk-config --cflags` GTKFLAGS12=`gtk-config --libs` --CFLAGS= -Wall -O3 --pedantic -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\" --LDFLAGS= -lm -lpthread $(SOUNDFLAGS) $(GTKLIBS) -+CFLAGS+= -Wall -pedantic -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\" -+LDFLAGS+= -lm -lpthread $(SOUNDFLAGS) $(GTKLIBS) +-CFLAGS= -Wall --pedantic -fno-common -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\" +-LDFLAGS= $(SOUNDFLAGS) $(GTKLIBS) -lX11 -lm -lpthread ++CFLAGS+= -Wall --pedantic -fno-common -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\" ++LDFLAGS+= $(SOUNDFLAGS) $(GTKLIBS) -lX11 -lm -lpthread - # DEB pkg - #CFLAGS += `dpkg-buildflags --get CFLAGS` -@@ -50,7 +50,7 @@ PROGRAM_SRCS=$(SRCPATH)spacezero.c $(SRC + CFLAGS12= -Wall -I./include -DGTK12 -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\" + LDFLAGS12= $(SOUNDFLAGS) $(GTKLIBS12) -lX11 -lm -lpthread +@@ -51,7 +51,7 @@ PROGRAM_SRCS=$(SRCPATH)spacezero.c $(SRCPATH)objects.c all: dirs spacezero spacezero: $(PROGRAM_OBJS) - $(CC) $(PROGRAM_OBJS) $(LDFLAGS) $(CFLAGS) -g -o $(PROGRAM) -+ $(CC) $(PROGRAM_OBJS) $(LDFLAGS) -o $(PROGRAM) ++ $(CC) $(PROGRAM_OBJS) $(LDFLAGS) $(CFLAGS) -o $(PROGRAM) gtk12: $(PROGRAM_SRCS) $(CC) `gtk-config --cflags` $(PROGRAM_SRCS) $(LDFLAGS12) $(CFLAGS12) -g -o $(PROGRAM) `gtk-config --libs` -@@ -84,4 +84,4 @@ mrproper: clean - rm -f src/*~ include/*~ - - .c.o: -- $(CC) $(CFLAGS) $(LDFLAGS) $(GTKFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@ +@@ -101,4 +101,4 @@ mrproper: clean + # add -pg for profile + # $(CC) -pg $(CFLAGS) $(GTKFLAGS) -c $< -o $@ + # add -g for debug +- $(CC) -g $(CFLAGS) $(GTKFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@ diff --git a/games/spacezero/files/patch-include_snow.h b/games/spacezero/files/patch-include_snow.h deleted file mode 100644 index 56723a1180f8..000000000000 --- a/games/spacezero/files/patch-include_snow.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/snow.h.orig 2013-12-18 11:52:33 UTC -+++ include/snow.h -@@ -29,7 +29,7 @@ - #include "objects.h" - - --struct Flake *flakes; -+extern struct Flake *flakes; - - struct Flake{ - float x,y; diff --git a/games/spacezero/files/patch-src_snow.c b/games/spacezero/files/patch-src_snow.c deleted file mode 100644 index a8a418176912..000000000000 --- a/games/spacezero/files/patch-src_snow.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/snow.c.orig 2013-12-18 11:50:44 UTC -+++ src/snow.c -@@ -38,6 +38,7 @@ - - #define NFLAKES 1000 - -+struct Flake *flakes; - - void CreateSnow(int w,int h){ - int i; diff --git a/games/spacezero/files/patch-src_spacecomm.c b/games/spacezero/files/patch-src_spacecomm.c deleted file mode 100644 index e775c188336d..000000000000 --- a/games/spacezero/files/patch-src_spacecomm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/spacecomm.c.orig 2013-12-18 18:53:03 UTC -+++ src/spacecomm.c -@@ -63,7 +63,7 @@ SENDOBJUNMOD0 - #define SENDORDERS 1 - - extern struct HeadObjList listheadobjs; --struct TextMessageList listheadtext; -+extern struct TextMessageList listheadtext; - extern struct CharListHead gameloglist; /* list of all game messages */ - extern struct Window windowgamelog; - extern struct Habitat habitat;