cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove libutf8 dependency:

Browse Source 
tuxpaint is happy with the locale support in base.

- chmod some installed docs so they're readable by !root

- sync WANTLIB while there

ok ajacoutot@
This commit is contained in:
sthen 2011-04-16 17:53:54 +00:00
parent 085e5b24a6
commit cb793b6936
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
games/tuxpaint/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2010/11/26 07:20:12 espie Exp $
# $OpenBSD: Makefile,v 1.19 2011/04/16 17:53:54 sthen Exp $
COMMENT= drawing program for children
DISTNAME= tuxpaint-0.9.21
REVISION= 3
REVISION= 4
CATEGORIES= games graphics
HOMEPAGE= http://www.tuxpaint.org/
@ -21,9 +21,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
WANTLIB += SDL X11 Xau Xdmcp Xrender c cairo expat fontconfig
WANTLIB += freetype gdk_pixbuf-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 m pixman-1 png pthread pthread-stubs xcb
WANTLIB += z gio-2.0 gthread-2.0 xcb-render xcb-render-util
WANTLIB += SDL_image>=2 SDL_mixer>=3 SDL_ttf>=7 rsvg-2>=18
WANTLIB += paper utf8>=1 SDL_Pango fribidi
WANTLIB += z gio-2.0 gthread-2.0 xcb-render SDL_image>=2
WANTLIB += SDL_mixer>=3 SDL_ttf>=7 rsvg-2>=18 paper SDL_Pango
WANTLIB += fribidi GL Xdamage Xext Xfixes Xxf86vm drm xcb-shm
MODULES= devel/gettext
LIB_DEPENDS= devel/sdl-image \
@ -31,14 +31,13 @@ LIB_DEPENDS= devel/sdl-image \
devel/sdl-ttf>=2.0.8 \
x11/gnome/librsvg \
print/libpaper \
misc/libutf8 \
devel/sdl-pango \
devel/fribidi
RUN_DEPENDS= graphics/netpbm \
devel/desktop-file-utils
USE_GMAKE= Yes
USE_GROFF = Yes
USE_GROFF= Yes
MAKE_ENV+= SYSCONFDIR=${SYSCONFDIR} OPTFLAGS="${CFLAGS}"
CFLAGS+= -DHAVE_STRCASESTR
@ -49,4 +48,7 @@ pre-configure:
@perl -pi -e 's,@\$$\(CC\),\$$\(CC\),g' ${WRKSRC}/Makefile
${SUBST_CMD} ${WRKSRC}/src/manpage/tuxpaint.1
post-install:
chmod -R og+rX ${PREFIX}/share/doc/tuxpaint/tuxpaint-dev
.include <bsd.port.mk>

4
games/tuxpaint/patches/patch-Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.5 2009/12/17 17:10:34 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.6 2011/04/16 17:53:54 sthen Exp $
--- Makefile.orig Wed Apr 29 07:18:57 2009
+++ Makefile Thu Dec 17 16:33:11 2009
@@ -94,7 +94,7 @@ windows_PREFIX:=/usr/local
@ -244,7 +244,7 @@ $OpenBSD: patch-Makefile,v 1.5 2009/12/17 17:10:34 ajacoutot Exp $
$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-o tuxpaint $^ \
- $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
+ $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(PAPER_LIB) -lutf8 -lpaper
+ $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(PAPER_LIB) -lpaper
@$(RSRC_CMD)
@$(MIMESET_CMD)

16
games/tuxpaint/patches/patch-src_im_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_im_c,v 1.2 2008/10/16 17:01:36 ajacoutot Exp $
--- src/im.c.orig Thu Oct 16 15:12:38 2008
+++ src/im.c Thu Oct 16 15:13:03 2008
@@ -37,10 +37,10 @@
*/
-#include <stdio.h>
+#include <utf8/stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <wchar.h>
+#include <utf8/wchar.h>
#include "im.h"