diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile index 1bceb184260..4d09f6edbff 100644 --- a/games/puzzles/Makefile +++ b/games/puzzles/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2012/04/02 10:06:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2012/04/08 20:54:34 landry Exp $ COMMENT = collection of puzzles games DISTNAME = puzzles-r9411 PKGNAME = ${DISTNAME:S/-r/-/} -REVISION = 1 +REVISION = 2 CATEGORIES = games HOMEPAGE = http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ diff --git a/games/puzzles/patches/patch-Makefile b/games/puzzles/patches/patch-Makefile index 784faa6a570..8f21e51de17 100644 --- a/games/puzzles/patches/patch-Makefile +++ b/games/puzzles/patches/patch-Makefile @@ -1,10 +1,11 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2012/03/28 12:53:53 landry Exp $ +$OpenBSD: patch-Makefile,v 1.2 2012/04/08 20:54:34 landry Exp $ - only use gtk-2 through pkg-config - dont use -Werror/-O2 - fix version detection - install binaries under bin as puzzle-$i ---- Makefile.orig Tue Mar 27 02:38:02 2012 -+++ Makefile Wed Mar 28 13:04:36 2012 +- generate desktop files/install icons +--- Makefile.orig Wed Mar 28 02:38:19 2012 ++++ Makefile Sun Apr 8 22:39: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 @@ -30,7 +31,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/03/28 12:53:53 landry Exp $ cat version.def > version2.def.new; \ elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \ echo "-DREVISION=`svnversion .`" >version2.def.new; \ -@@ -686,9 +685,18 @@ version2.def: FORCE +@@ -686,9 +685,19 @@ version2.def: FORCE fi .PHONY: FORCE install: @@ -44,7 +45,8 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/03/28 12:53:53 landry Exp $ - $(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \ - || exit 1; \ + $(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(bindir)/puzzle-$$i ;\ -+ echo "[Desktop Entry]\nVersion=1.0\nName=$$i\nComment=$$i puzzle\nExec=puzzle-$$i\nIcon=puzzle-$$i\nType=Application\nCategories=Game;LogicGame;" > $(DESTDIR)/$(prefix)/share/applications/puzzle-$$i.desktop;\ ++ ui=`echo $$i | perl -n -e 'print ucfirst'` ;\ ++ echo "[Desktop Entry]\nVersion=1.0\nName=$$ui\nComment=$$ui puzzle\nExec=puzzle-$$i\nIcon=puzzle-$$i\nType=Application\nCategories=Game;LogicGame;" > $(DESTDIR)/$(prefix)/share/applications/puzzle-$$i.desktop;\ + for d in 16 32 48; do \ + $(INSTALL_DATA) icons/$$i-$${d}d24.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${d}x$${d}/apps/puzzle-$$i.png ;\ + done \