From 9dbefb4c948d067584cf5c86c7918c5d94347bb6 Mon Sep 17 00:00:00 2001 From: landry Date: Thu, 24 May 2012 08:23:02 +0000 Subject: [PATCH] Update to puzzles r9534, fix WANTLIB and regen PLIST while here. Thx sthen@ for distfile mirroring.. --- games/puzzles/Makefile | 9 ++++----- games/puzzles/distinfo | 10 +++++----- games/puzzles/patches/patch-Makefile | 10 +++++----- games/puzzles/pkg/PLIST | 10 +--------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile index 4d09f6edbff..e4f5a12c29c 100644 --- a/games/puzzles/Makefile +++ b/games/puzzles/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2012/04/08 20:54:34 landry Exp $ +# $OpenBSD: Makefile,v 1.5 2012/05/24 08:23:02 landry Exp $ COMMENT = collection of puzzles games -DISTNAME = puzzles-r9411 +DISTNAME = puzzles-r9534 PKGNAME = ${DISTNAME:S/-r/-/} -REVISION = 2 CATEGORIES = games HOMEPAGE = http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ @@ -24,8 +23,8 @@ RUN_DEPENDS = devel/desktop-file-utils devel/xdg-utils \ x11/gtk+2,-guic MAKE_FLAGS = CC="${CC}" -WANTLIB += atk-1.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += atk-1.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 +WANTLIB += gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama WANTLIB += Xrandr Xrender c cairo expat fontconfig freetype gdk-x11-2.0 WANTLIB += gtk-x11-2.0 m pixman-1 png pthread pthread-stubs diff --git a/games/puzzles/distinfo b/games/puzzles/distinfo index 326af6d74a4..8e801f1eec2 100644 --- a/games/puzzles/distinfo +++ b/games/puzzles/distinfo @@ -1,5 +1,5 @@ -MD5 (puzzles-r9411.tar.gz) = +prj2NGiQvUoX6wcTnAwNg== -RMD160 (puzzles-r9411.tar.gz) = rExtDOa73rRuH1W+Jf5qTR1D/4w= -SHA1 (puzzles-r9411.tar.gz) = iu2hsJo0IdxLUA/NXogOOD9xe1s= -SHA256 (puzzles-r9411.tar.gz) = 6/YhjtsxJQ7cYCLM+Mu9AQOd8f9Pu3H3i2MYVNULYO4= -SIZE (puzzles-r9411.tar.gz) = 3049402 +MD5 (puzzles-r9534.tar.gz) = wHYEtAZSWEZop8chbfECsQ== +RMD160 (puzzles-r9534.tar.gz) = 8dfUmS9ilDTKER1/wusEjw/Wlks= +SHA1 (puzzles-r9534.tar.gz) = tzbRSLImjxoHbMUeytJ+7wYA0ik= +SHA256 (puzzles-r9534.tar.gz) = YsIbWcfU8XfGrP56CWjaVrrrHrQwW48U425RRRi3wuo= +SIZE (puzzles-r9534.tar.gz) = 3051924 diff --git a/games/puzzles/patches/patch-Makefile b/games/puzzles/patches/patch-Makefile index 8f21e51de17..422c927172c 100644 --- a/games/puzzles/patches/patch-Makefile +++ b/games/puzzles/patches/patch-Makefile @@ -1,11 +1,11 @@ -$OpenBSD: patch-Makefile,v 1.2 2012/04/08 20:54:34 landry Exp $ +$OpenBSD: patch-Makefile,v 1.3 2012/05/24 08:23:02 landry Exp $ - only use gtk-2 through pkg-config - dont use -Werror/-O2 - fix version detection - install binaries under bin as puzzle-$i - generate desktop files/install icons ---- Makefile.orig Wed Mar 28 02:38:19 2012 -+++ Makefile Sun Apr 8 22:39:42 2012 +--- Makefile.orig Wed May 23 02:35:49 2012 ++++ Makefile Wed May 23 17:33:42 2012 @@ -11,10 +11,9 @@ CC := $(TOOLPATH)$(CC) # building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0' # if you want to enforce 2.0. The default is to try 2.0 and fall back @@ -16,8 +16,8 @@ $OpenBSD: patch-Makefile,v 1.2 2012/04/08 20:54:34 landry Exp $ -CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g -I./ -Iicons/ `$(GTK_CONFIG) \ - --cflags` $(CFLAGS) +CFLAGS += -Wall -ansi -pedantic -g -I./ -Iicons/ `$(GTK_CONFIG) --cflags` - XLIBS = `$(GTK_CONFIG) --libs` - ULIBS =# + XLIBS = `$(GTK_CONFIG) --libs` -lm + ULIBS = -lm# INSTALL=install @@ -670,9 +669,9 @@ GAMES += twiddle GAMES += unequal diff --git a/games/puzzles/pkg/PLIST b/games/puzzles/pkg/PLIST index 77e2a4858d9..cc3bafb4a2b 100644 --- a/games/puzzles/pkg/PLIST +++ b/games/puzzles/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/03/28 12:53:53 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/05/24 08:23:02 landry Exp $ @bin bin/puzzle-blackbox @bin bin/puzzle-bridges @bin bin/puzzle-cube @@ -69,10 +69,6 @@ share/applications/puzzle-unequal.desktop share/applications/puzzle-untangle.desktop share/doc/puzzles/ share/doc/puzzles/puzzles.txt -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/puzzle-blackbox.png share/icons/hicolor/16x16/apps/puzzle-bridges.png share/icons/hicolor/16x16/apps/puzzle-cube.png @@ -107,8 +103,6 @@ share/icons/hicolor/16x16/apps/puzzle-towers.png share/icons/hicolor/16x16/apps/puzzle-twiddle.png share/icons/hicolor/16x16/apps/puzzle-unequal.png share/icons/hicolor/16x16/apps/puzzle-untangle.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/puzzle-blackbox.png share/icons/hicolor/32x32/apps/puzzle-bridges.png share/icons/hicolor/32x32/apps/puzzle-cube.png @@ -143,8 +137,6 @@ share/icons/hicolor/32x32/apps/puzzle-towers.png share/icons/hicolor/32x32/apps/puzzle-twiddle.png share/icons/hicolor/32x32/apps/puzzle-unequal.png share/icons/hicolor/32x32/apps/puzzle-untangle.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/puzzle-blackbox.png share/icons/hicolor/48x48/apps/puzzle-bridges.png share/icons/hicolor/48x48/apps/puzzle-cube.png