On Fri, Dec 16, 2011 at 03:18:52PM +0100, Stefan Sperling wrote:
> On Fri, Dec 16, 2011 at 02:39:50PM +0100, Antoine Jacoutot wrote:
> > You are missing the exec goos :)
>
> Ah. Is this better (see bottom)?
Yup :)
ok for me.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 16 Dec 2011 11:40:08 -0000 1.7
> +++ Makefile 16 Dec 2011 13:26:40 -0000
> @@ -9,7 +9,7 @@ VERSION = 0.7.2
> DISTNAME= stone_soup-${VERSION}-nodeps
> EXTRACT_SUFX= .tar.bz2
> PKGNAME= stone-soup-${VERSION}
> -REVISION= 1
> +REVISION= 2
>
> BROKEN-arm= tilegen.elf loops burning cpu
>
> @@ -30,6 +30,7 @@ MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \
> MODULES = lang/lua
> WANTLIB = c m stdc++ lua sqlite3
>
> +RUN_DEPENDS = devel/desktop-file-utils
> LIB_DEPENDS = databases/sqlite3
>
> # Almost nethack...
> @@ -60,6 +61,14 @@ post-install:
> chmod 755 ${PREFIX}/bin/crawl-ss
> ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
> ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs
> +.if ! ${FLAVOR:Mno_x11}
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications
> + ${INSTALL_DATA} \
> + ${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
> + ${PREFIX}/share/pixmaps/stone-soup.png
> + ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \
> + ${PREFIX}/share/applications
> +.endif
>
> NO_REGRESS=Yes
>
> Index: patches/patch-source_makefile
> ===================================================================
> RCS file: patches/patch-source_makefile
> diff -N patches/patch-source_makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-source_makefile 16 Dec 2011 13:26:40 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +honour CFLAGS
> +--- source/makefile.orig Fri Dec 16 12:05:58 2011
> ++++ source/makefile Fri Dec 16 12:06:50 2011
> +@@ -710,8 +710,8 @@ ifdef REPORT
> + CFOTHERS += -ftime-report
> + endif
> +
> +-CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
> +-CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L)
> $(CFOTHERS_L)
> ++CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
> ++CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L)
> $(CFOTHERS_L) $(CFLAGS)
> + ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
> + YACC_CFLAGS := $(ALL_CFLAGS) -w -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
> +
> Index: patches/patch-source_rltiles_Makefile
> ===================================================================
> RCS file: patches/patch-source_rltiles_Makefile
> diff -N patches/patch-source_rltiles_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-source_rltiles_Makefile 16 Dec 2011 13:26:40 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +honour CFLAGS
> +--- source/rltiles/Makefile.orig Fri Dec 16 12:05:25 2011
> ++++ source/rltiles/Makefile Fri Dec 16 12:05:37 2011
> +@@ -10,7 +10,7 @@ SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null
> + PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null || echo
> "-I../contrib/install/include")
> + PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo
> "../contrib/install/lib/libpng.a ../contrib/install/lib/libz.a")
> +
> +-CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
> ++CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE) $(CFLAGS)
> + LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
> +
> + ifneq (,$(findstring MINGW,$(uname_S)))
> Index: pkg/PFRAG.no-no_x11
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/pkg/PFRAG.no-no_x11,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PFRAG.no-no_x11
> --- pkg/PFRAG.no-no_x11 24 Apr 2011 20:14:06 -0000 1.1.1.1
> +++ pkg/PFRAG.no-no_x11 16 Dec 2011 14:16:51 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2011/04/24 20:14:06 stsp Exp $
> +share/applications/stone-soup.desktop
> share/crawl/dat/tiles/
> share/crawl/dat/tiles/Vera.ttf
> share/crawl/dat/tiles/VeraMono.ttf
> @@ -11,3 +12,7 @@ share/crawl/dat/tiles/stone_soup_icon-32
> share/crawl/dat/tiles/stone_soup_icon-win32.png
> share/crawl/dat/tiles/title.png
> share/crawl/dat/tiles/wall.png
> +share/pixmaps/
> +share/pixmaps/stone-soup.png
> +@exec %D/bin/update-desktop-database
> +@unexec-delete %D/bin/update-desktop-database
--
Antoine
