From d86d9a78a6d2f4095cbddfdf220faea6e3c082ef Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 25 Nov 2022 15:48:39 +0300 Subject: [PATCH] =?UTF-8?q?games/spacezero:=20update=200.86.00=20=E2=86=92?= =?UTF-8?q?=200.86.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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(-) delete mode 100644 games/spacezero/files/patch-include_snow.h delete mode 100644 games/spacezero/files/patch-src_snow.c delete mode 100644 games/spacezero/files/patch-src_spacecomm.c 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;